From owner-svn-src-stable@FreeBSD.ORG Sun Oct 3 23:43:24 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 41B3E106566B;
Sun, 3 Oct 2010 23:43:24 +0000 (UTC)
(envelope-from kato@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 2FBA88FC17;
Sun, 3 Oct 2010 23:43:24 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o93NhOhQ093879;
Sun, 3 Oct 2010 23:43:24 GMT (envelope-from kato@svn.freebsd.org)
Received: (from kato@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id o93NhOlX093876;
Sun, 3 Oct 2010 23:43:24 GMT (envelope-from kato@svn.freebsd.org)
Message-Id: <201010032343.o93NhOlX093876@svn.freebsd.org>
From: KATO Takenori <kato@FreeBSD.org>
Date: Sun, 3 Oct 2010 23:43:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r213393 - stable/6/sys/pc98/pc98
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 03 Oct 2010 23:43:24 -0000
Author: kato
Date: Sun Oct 3 23:43:23 2010
New Revision: 213393
URL: http://svn.freebsd.org/changeset/base/213393
Log:
MF revision 184327 except for the default algorithm.
The improved IDE HDD geometry adjustment is merged but default
algorithm is not changed in this branch. This commit allows 6-stable
user to test new algorithm before complete upgrading to 7 or later.
Modified:
stable/6/sys/pc98/pc98/pc98_machdep.c
stable/6/sys/pc98/pc98/pc98_machdep.h
Modified: stable/6/sys/pc98/pc98/pc98_machdep.c
==============================================================================
--- stable/6/sys/pc98/pc98/pc98_machdep.c Sun Oct 3 23:40:54 2010 (r213392)
+++ stable/6/sys/pc98/pc98/pc98_machdep.c Sun Oct 3 23:43:23 2010 (r213393)
@@ -36,15 +36,23 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <cam/cam.h>
-#include <cam/cam_ccb.h>
#include <sys/bio.h>
#include <sys/bus.h>
#include <sys/conf.h>
+#include <sys/kernel.h>
+#include <sys/sysctl.h>
+#include <cam/cam.h>
+#include <cam/cam_ccb.h>
#include <geom/geom_disk.h>
#include <machine/md_var.h>
#include <pc98/pc98/pc98_machdep.h>
+static int ad_geom_method = AD_GEOM_ADJUST_COMPATCYL16;
+
+TUNABLE_INT("machdep.ad_geom_method", &ad_geom_method);
+SYSCTL_INT(_machdep, OID_AUTO, ad_geom_method, CTLFLAG_RW, &ad_geom_method, 0,
+ "IDE disk geometry conversion method");
+
/*
* Initialize DMA controller
*/
@@ -198,12 +206,62 @@ scsi_da_bios_params(struct ccb_calc_geom
}
/*
- * Get the geometry of the ATA HDD from the BIOS work area.
- *
- * XXX for now, we hack it
+ * Adjust the geometry of the IDE HDD.
*/
-void
-pc98_ad_firmware_geom_adjust(device_t dev, struct disk *disk)
+
+/* IDE BIOS compatible mode. */
+static void
+pc98_ad_geom_adjust_idebios(struct disk *disk)
+{
+
+ if (disk->d_mediasize < MEDIASIZE_4_3G) {
+ disk->d_fwsectors = 17;
+ disk->d_fwheads = 8;
+ } else if (disk->d_mediasize < MEDIASIZE_29_5G) {
+ disk->d_fwsectors = 63;
+ if (disk->d_fwheads != 15) /* Allow 15H63S. */
+ disk->d_fwheads = 16;
+ } else if (disk->d_mediasize < MEDIASIZE_31_5G) {
+ disk->d_fwsectors = 63;
+ disk->d_fwheads = 16;
+ } else if (disk->d_mediasize < MEDIASIZE_127G) {
+ disk->d_fwsectors = 255;
+ disk->d_fwheads = 16;
+ } else {
+ /* XXX */
+ disk->d_fwsectors = 255;
+ disk->d_fwheads = 255;
+ }
+}
+
+/* SCSI BIOS compatible mode. */
+static void
+pc98_ad_geom_adjust_scsibios(struct disk *disk)
+{
+
+ if (disk->d_mediasize < MEDIASIZE_8G) {
+ disk->d_fwsectors = 32;
+ disk->d_fwheads = 8;
+ } else if (disk->d_mediasize < MEDIASIZE_32G) {
+ disk->d_fwsectors = 128;
+ disk->d_fwheads = 8;
+ } else if (disk->d_mediasize < MEDIASIZE_60G) {
+ /* Compatible with IFC-USP 1.2. */
+ disk->d_fwsectors = 128;
+ disk->d_fwheads = 15;
+ } else if (disk->d_mediasize < MEDIASIZE_120G) {
+ disk->d_fwsectors = 255;
+ disk->d_fwheads = 15;
+ } else {
+ /* XXX */
+ disk->d_fwsectors = 255;
+ disk->d_fwheads = 255;
+ }
+}
+
+/* Compatible with the revision 1.28. */
+static void
+pc98_ad_geom_adjust_cyl16bit(struct disk *disk)
{
off_t totsec = disk->d_mediasize / disk->d_sectorsize;
off_t cyl = totsec / disk->d_fwsectors / disk->d_fwheads;
@@ -229,3 +287,35 @@ pc98_ad_firmware_geom_adjust(device_t de
}
}
}
+
+void
+pc98_ad_firmware_geom_adjust(device_t dev, struct disk *disk)
+{
+ u_int oldsectors, oldheads;
+
+ oldsectors = disk->d_fwsectors;
+ oldheads = disk->d_fwheads;
+
+ switch (ad_geom_method) {
+ case AD_GEOM_ADJUST_COMPATIDE:
+ pc98_ad_geom_adjust_idebios(disk);
+ break;
+ case AD_GEOM_ADJUST_COMPATSCSI:
+ pc98_ad_geom_adjust_scsibios(disk);
+ break;
+ case AD_GEOM_ADJUST_COMPATCYL16:
+ pc98_ad_geom_adjust_cyl16bit(disk);
+ break;
+ default:
+ /* Do nothing. */
+ break;
+ }
+
+ if (bootverbose &&
+ (oldsectors != disk->d_fwsectors || oldheads != disk->d_fwheads))
+ device_printf(dev,
+ "geometry adjusted from [%dH/%dS] to [%dH/%dS]\n",
+ oldheads, oldsectors,
+ disk->d_fwheads, disk->d_fwsectors);
+
+}
Modified: stable/6/sys/pc98/pc98/pc98_machdep.h
==============================================================================
--- stable/6/sys/pc98/pc98/pc98_machdep.h Sun Oct 3 23:40:54 2010 (r213392)
+++ stable/6/sys/pc98/pc98/pc98_machdep.h Sun Oct 3 23:43:23 2010 (r213393)
@@ -85,6 +85,21 @@ extern unsigned char pc98_system_paramet
#define EPSON_PC486_SR 0x38
#define EPSON_PC486_HA 0x3b
+/* IDE HDD geometry conversion. */
+#define AD_GEOM_ADJUST_NONE 0 /* Do nothing. */
+#define AD_GEOM_ADJUST_COMPATIDE 1 /* PC-98 IDE BIOS. */
+#define AD_GEOM_ADJUST_COMPATSCSI 2 /* PC-98 SCSI. */
+#define AD_GEOM_ADJUST_COMPATCYL16 100 /* Compat Rev. 1.28. */
+
+#define MEDIASIZE_4_3G (4351LL * 1024LL * 1024LL) /* 4351M */
+#define MEDIASIZE_8G (8192LL * 1024LL * 1024LL) /* 8192M */
+#define MEDIASIZE_29_5G (30239LL * 1024LL * 1024LL) /* 30239M */
+#define MEDIASIZE_31_5G (32255LL * 1024 * 1024) /* 32255M */
+#define MEDIASIZE_32G (32768LL * 1024LL * 1024LL) /* 32768M */
+#define MEDIASIZE_60G (61440LL * 1024LL * 1024LL) /* 61440M */
+#define MEDIASIZE_120G (122400LL * 1024LL * 1024LL) /* 122400M */
+#define MEDIASIZE_127G (130558LL * 1024LL * 1024LL) /* 130558M */
+
#endif /* _KERNEL */
#endif /* __PC98_PC98_PC98_MACHDEP_H__ */