Date: Sun, 27 Nov 2011 15:43:40 +0000 (UTC) From: Marius Strobl <marius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r228022 - in head/sys: cam conf sparc64/include sparc64/sparc64 Message-ID: <201111271543.pARFhek4045499@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marius Date: Sun Nov 27 15:43:40 2011 New Revision: 228022 URL: http://svn.freebsd.org/changeset/base/228022 Log: For sparc64 also adjust the geometry of da(4) driven disks to not overflow the 16-bit cylinders field of the VTOC8 disk label (at around 502GB). The geometry chosen for disks above that limit allows to use disks up to 2TB, which is the limit of the extended VTOC8 format. The geometry used for disks smaller than the 16-bit cylinders limit stays the same as used by cam_calc_geometry(9) for extended translation. Thanks to Hans-Joerg Sirtl for providing hardware for testing this change. MFC after: 3 days Added: head/sys/sparc64/sparc64/cam_machdep.c (contents, props changed) Modified: head/sys/cam/cam_xpt.c head/sys/conf/files.sparc64 head/sys/sparc64/include/md_var.h Modified: head/sys/cam/cam_xpt.c ============================================================================== --- head/sys/cam/cam_xpt.c Sun Nov 27 13:53:36 2011 (r228021) +++ head/sys/cam/cam_xpt.c Sun Nov 27 15:43:40 2011 (r228022) @@ -66,7 +66,10 @@ __FBSDID("$FreeBSD$"); #include <cam/scsi/scsi_all.h> #include <cam/scsi/scsi_message.h> #include <cam/scsi/scsi_pass.h> + +#include <machine/md_var.h> /* geometry translation */ #include <machine/stdarg.h> /* for xpt_print below */ + #include "opt_cam.h" /* @@ -2456,7 +2459,7 @@ xpt_action_default(union ccb *start_ccb) start_ccb->ccb_h.status = CAM_REQ_CMP; break; } -#ifdef PC98 +#if defined(PC98) || defined(__sparc64__) /* * In a PC-98 system, geometry translation depens on * the "real" device geometry obtained from mode page 4. @@ -2465,6 +2468,9 @@ xpt_action_default(union ccb *start_ccb) * stored in host memory. If the translation is available * in host memory, use it. If not, rely on the default * translation the device driver performs. + * For sparc64, we may need adjust the geometry of large + * disks in order to fit the limitations of the 16-bit + * fields of the VTOC8 disk label. */ if (scsi_da_bios_params(&start_ccb->ccg) != 0) { start_ccb->ccb_h.status = CAM_REQ_CMP; Modified: head/sys/conf/files.sparc64 ============================================================================== --- head/sys/conf/files.sparc64 Sun Nov 27 13:53:36 2011 (r228021) +++ head/sys/conf/files.sparc64 Sun Nov 27 15:43:40 2011 (r228022) @@ -90,6 +90,7 @@ sparc64/sparc64/ata_machdep.c optional a sparc64/sparc64/autoconf.c standard sparc64/sparc64/bus_machdep.c standard sparc64/sparc64/cache.c standard +sparc64/sparc64/cam_machdep.c optional scbus sparc64/sparc64/cheetah.c standard sparc64/sparc64/clock.c standard sparc64/sparc64/counter.c standard Modified: head/sys/sparc64/include/md_var.h ============================================================================== --- head/sys/sparc64/include/md_var.h Sun Nov 27 13:53:36 2011 (r228021) +++ head/sys/sparc64/include/md_var.h Sun Nov 27 15:43:40 2011 (r228022) @@ -65,10 +65,11 @@ extern cpu_block_copy_t *cpu_block_copy; extern cpu_block_zero_t *cpu_block_zero; /* - * Given that the Sun disk label only uses 16-bit fields for cylinders, - * heads and sectors we might need to adjust the geometry of large IDE - * disks. + * Given that the VTOC8 disk label only uses 16-bit fields for cylinders, + * heads and sectors we might need to adjust the geometry of large disks. */ +struct ccb_calc_geometry; +int scsi_da_bios_params(struct ccb_calc_geometry *ccg); struct disk; void sparc64_ata_disk_firmware_geom_adjust(struct disk *disk); #define ata_disk_firmware_geom_adjust(disk) \ Added: head/sys/sparc64/sparc64/cam_machdep.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/sparc64/sparc64/cam_machdep.c Sun Nov 27 15:43:40 2011 (r228022) @@ -0,0 +1,74 @@ +/*- + * Copyright (c) 2011 Marius Strobl <marius@FreeBSD.org> + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + +#include <sys/param.h> +#include <sys/systm.h> + +#include <cam/cam.h> +#include <cam/cam_ccb.h> + +#include <machine/md_var.h> + +int +scsi_da_bios_params(struct ccb_calc_geometry *ccg) +{ + uint32_t secs_per_cylinder, size_mb; + + /* + * The VTOC8 disk label only uses 16-bit fields for cylinders, heads + * and sectors so the geometry of large disks has to be adjusted. + * We generally use the sizing used by cam_calc_geometry(9), except + * when it would overflow the cylinders, in which case we use 255 + * heads and sectors. This allows disks up to the 2TB limit of the + * extended VTOC8. + * XXX this doesn't match the sizing used by OpenSolaris, as that + * would exceed the 8-bit ccg->heads and ccg->secs_per_track. + */ + if (ccg->block_size == 0) + return (0); + size_mb = (1024L * 1024L) / ccg->block_size; + if (size_mb == 0) + return (0); + size_mb = ccg->volume_size / size_mb; + if (ccg->volume_size > (uint64_t)65535 * 255 * 63) { + ccg->heads = 255; + ccg->secs_per_track = 255; + } else if (size_mb > 1024) { + ccg->heads = 255; + ccg->secs_per_track = 63; + } else { + ccg->heads = 64; + ccg->secs_per_track = 32; + } + secs_per_cylinder = ccg->heads * ccg->secs_per_track; + if (secs_per_cylinder == 0) + return (0); + ccg->cylinders = ccg->volume_size / secs_per_cylinder; + return (1); +}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201111271543.pARFhek4045499>