summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2008-04-19 01:18:40 +0000
committerDamien Miller <djm@cvs.openbsd.org>2008-04-19 01:18:40 +0000
commitfee43a053805f4933951b7d78241781f8ae7a500 (patch)
tree9c7e85cdf0c074faf367a778ccd6b99668b10d3f /sys/arch
parent6cb93110cadadebeb39944e273766149084876d8 (diff)
add a driver flag to force the negotiation of SATA 1 transfers
(1.5Gb/s). Useful where faster speeds are unstable; ok dlg@
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/amd64/conf/GENERIC7
-rw-r--r--sys/arch/i386/conf/GENERIC7
-rw-r--r--sys/arch/sparc64/conf/GENERIC7
3 files changed, 12 insertions, 9 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 24226e274aa..81bbfd0c23b 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.224 2008/04/07 01:35:20 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.225 2008/04/19 01:18:39 djm Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -284,9 +284,10 @@ lpt* at puc?
ahc* at pci? # Adaptec 2940 SCSI controllers
scsibus* at ahc?
jmb* at pci? # JMicron JMB36x controllers
-ahci* at jmb?
+ahci* at jmb? flags 0x0000 # flags 0x0001 to force SATA 1 (1.5Gb/s)
pciide* at jmb?
-ahci* at pci? # AHCI SATA controllers
+ahci* at pci? flags 0x0000 # AHCI SATA controllers
+ # flags 0x0001 to force SATA 1 (1.5Gb/s)
scsibus* at ahci?
sili* at pci? # Silicon Image 3124/3132/3531 SATA
scsibus* at sili?
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 5ae5560dba2..3fdfd7d6b2e 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.611 2008/04/07 01:35:20 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.612 2008/04/19 01:18:39 djm Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -386,9 +386,10 @@ ahc* at eisa? # Adaptec 274x, aic7770 SCSI controllers
ahc* at pci? # Adaptec 2940/3940/78?? SCSI controllers
scsibus* at ahc?
jmb* at pci? # JMicron JMB36x controllers
-ahci* at jmb?
+ahci* at jmb? flags 0x0000 # flags 0x0001 to force SATA 1 (1.5Gb/s)
pciide* at jmb?
-ahci* at pci? # AHCI SATA controllers
+ahci* at pci? flags 0x0000 # AHCI SATA controllers
+ # flags 0x0001 to force SATA 1 (1.5Gb/s)
scsibus* at ahci?
sili* at pci? # Silicon Image 3124/3132/3531 SATA controllers
scsibus* at sili?
diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC
index 2d524b0f802..a42c78324d6 100644
--- a/sys/arch/sparc64/conf/GENERIC
+++ b/sys/arch/sparc64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.199 2008/04/02 22:32:43 kettenis Exp $
+# $OpenBSD: GENERIC,v 1.200 2008/04/19 01:18:39 djm Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -96,9 +96,10 @@ scsibus* at mpi?
arc* at pci? # Areca RAID Controllers
scsibus* at arc?
jmb* at pci? # JMicron JMB36x controllers
-ahci* at jmb?
+ahci* at jmb? flags 0x0000 # flags 0x0001 to force SATA 1 (1.5Gb/s)
pciide* at jmb?
-ahci* at pci? # AHCI SATA controllers
+ahci* at pci? flags 0x0000 # AHCI SATA controllers
+ # flags 0x0001 to force SATA 1 (1.5Gb/s)
scsibus* at ahci?
sili* at pci? # Silicon Image 3124/3132/3531 SATA controllers
scsibus* at sili?