Author: mav
Date: Sun Apr 24 08:58:58 2011
New Revision: 220982
URL: http://svn.freebsd.org/changeset/base/220982
Log:
Switch the GENERIC kernels for all architectures to the new CAM-based ATA
stack. It means that all legacy ATA drivers are disabled and replaced by
respective CAM drivers. If you are using ATA device names in /etc/fstab or
other places, make sure to update them respectively (adX -> adaY,
acdX -> cdY, afdX -> daY, astX -> saY, where 'Y's are the sequential
numbers for each type in order of detection, unless configured otherwise
with tunables, see cam(4)).
ataraid(4) functionality is now supported by the RAID GEOM class.
To use it you can load geom_raid kernel module and use graid(8) tool
for management. Instead of /dev/arX device names, use /dev/raid/rX.
Modified:
head/UPDATING
head/sys/amd64/conf/GENERIC
head/sys/arm/conf/AVILA
head/sys/arm/conf/CAMBRIA
head/sys/arm/conf/CRB
head/sys/arm/conf/DB-78XXX
head/sys/arm/conf/DB-88F5XXX
head/sys/arm/conf/DB-88F6XXX
head/sys/arm/conf/EP80219
head/sys/arm/conf/IQ31244
head/sys/arm/conf/TS7800
head/sys/conf/NOTES
head/sys/i386/conf/GENERIC
head/sys/i386/conf/XBOX
head/sys/ia64/conf/GENERIC
head/sys/mips/conf/MALTA
head/sys/mips/conf/MALTA64
head/sys/mips/conf/OCTEON1
head/sys/mips/conf/std.SWARM
head/sys/mips/malta/std.malta
head/sys/pc98/conf/GENERIC
head/sys/powerpc/conf/GENERIC
head/sys/powerpc/conf/GENERIC64
head/sys/powerpc/conf/MPC85XX
head/sys/sparc64/conf/GENERIC
head/sys/sun4v/conf/GENERIC
Modified: head/UPDATING
==============================================================================
--- head/UPDATING Sun Apr 24 01:11:28 2011 (r220981)
+++ head/UPDATING Sun Apr 24 08:58:58 2011 (r220982)
@@ -22,6 +22,34 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9.
machines to maximize performance. (To disable malloc debugging, run
ln -s aj /etc/malloc.conf.)
+20110424:
+ The GENERIC kernels for all architectures now default to the new
+ CAM-based ATA stack. It means that all legacy ATA drivers were
+ removed and replaced by respective CAM drivers. If you are using
+ ATA device names in /etc/fstab or other places, make sure to update
+ them respectively (adX -> adaY, acdX -> cdY, afdX -> daY, astX -> saY,
+ where 'Y's are the sequential numbers for each type in order of
+ detection, unless configured otherwise with tunables, see cam(4)).
+
+ ataraid(4) functionality is now supported by the RAID GEOM class.
+ To use it you can load geom_raid kernel module and use graid(8) tool
+ for management. Instead of /dev/arX device names, use /dev/raid/rX.
+
+ No kernel config options or code have been removed, so if a problem
+ arises, please report it and optionally revert to the old ATA stack.
+ In order to do it you can remove from the kernel config:
+ options ATA_CAM
+ device ahci
+ device mvs
+ device siis
+ , and instead add back:
+ device atadisk # ATA disk drives
+ device ataraid # ATA RAID drives
+ device atapicd # ATAPI CDROM drives
+ device atapifd # ATAPI floppy drives
+ device atapist # ATAPI tape drives
+ options ATA_STATIC_ID # Static device numbering
+
20110423:
The default NFS server has been changed to the new server, which
was referred to as the experimental server. If you need to switch
Modified: head/sys/amd64/conf/GENERIC
==============================================================================
--- head/sys/amd64/conf/GENERIC Sun Apr 24 01:11:28 2011 (r220981)
+++ head/sys/amd64/conf/GENERIC Sun Apr 24 08:58:58 2011 (r220982)
@@ -89,14 +89,12 @@ device pci
# Floppy drives
device fdc
-# ATA and ATAPI devices
-device ata
-device atadisk # ATA disk drives
-device ataraid # ATA RAID drives
-device atapicd # ATAPI CDROM drives
-device atapifd # ATAPI floppy drives
-device atapist # ATAPI tape drives
-options ATA_STATIC_ID # Static device numbering
+# ATA controllers
+device ahci # AHCI-compatible SATA controllers
+device ata # Legacy ATA/SATA controllers
+options ATA_CAM # Handle legacy controllers with CAM
+device mvs # Marvell 88SX50XX/88SX60XX/88SX70XX/SoC SATA
+device siis # SiliconImage SiI3124/SiI3132/SiI3531 SATA
# SCSI Controllers
device ahc # AHA2940 and onboard AIC7xxx devices
@@ -120,13 +118,13 @@ device adw # Advansys wide SCSI
adapte
device aic # Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
device bt # Buslogic/Mylex MultiMaster SCSI adapters
-# SCSI peripherals
-device scbus # SCSI bus (required for SCSI)
+# ATA/SCSI peripherals
+device scbus # SCSI bus (required for ATA/SCSI)
device ch # SCSI media changers
device da # Direct Access (disks)
device sa # Sequential Access (tape etc)
device cd # CD
-device pass # Passthrough device (direct SCSI access)
+device pass # Passthrough device (direct ATA/SCSI access)
device ses # SCSI Environmental Services (and SAF-TE)
# RAID controllers interfaced to the SCSI subsystem
Modified: head/sys/arm/conf/AVILA
==============================================================================
--- head/sys/arm/conf/AVILA Sun Apr 24 01:11:28 2011 (r220981)
+++ head/sys/arm/conf/AVILA Sun Apr 24 08:58:58 2011 (r220982)
@@ -92,8 +92,8 @@ device gpioled
device avila_gpio # GPIO pins on J8
device ata
-device atadisk # ATA disk drives
device avila_ata # Gateworks CF/IDE support
+options ATA_CAM
device npe # Network Processing Engine
device npe_fw
@@ -149,8 +149,9 @@ device usb
device ohci
device ehci
device umass
-device scbus # SCSI bus (required for SCSI)
+device scbus # SCSI bus (required for ATA/SCSI)
device da # Direct Access (disks)
+device pass # Passthrough device (direct ATA/SCSI access)
#device ural
#device zyd
Modified: head/sys/arm/conf/CAMBRIA
==============================================================================
--- head/sys/arm/conf/CAMBRIA Sun Apr 24 01:11:28 2011 (r220981)
+++ head/sys/arm/conf/CAMBRIA Sun Apr 24 08:58:58 2011 (r220982)
@@ -95,8 +95,8 @@ device gpioled
device cambria_gpio # GPIO pins on J11
device ata
-device atadisk # ATA disk drives
device avila_ata # Gateworks CF/IDE support
+options ATA_CAM
device npe # Network Processing Engine
device npe_fw
@@ -154,8 +154,9 @@ options USB_EHCI_BIG_ENDIAN_DESC # hand
#options USB_DEBUG
device ehci
device umass
-device scbus # SCSI bus (required for SCSI)
+device scbus # SCSI bus (required for ATA/SCSI)
device da # Direct Access (disks)
+device pass # Passthrough device (direct ATA/SCSI access)
#device ural
#device zyd
Modified: head/sys/arm/conf/CRB
==============================================================================
--- head/sys/arm/conf/CRB Sun Apr 24 01:11:28 2011 (r220981)
+++ head/sys/arm/conf/CRB Sun Apr 24 08:58:58 2011 (r220982)
@@ -73,12 +73,12 @@ device uart
device pci
device ata
-device atadisk # ATA disk drives
-device ataraid # ATA RAID drives
-device atapicd # ATAPI CDROM drives
-device atapifd # ATAPI floppy drives
-device atapist # ATAPI tape drives
-options ATA_STATIC_ID # Static device numbering
+options ATA_CAM
+
+device scbus # SCSI bus (required for ATA/SCSI)
+device cd # CD
+device da # Direct Access (disks)
+device pass # Passthrough device (direct ATA/SCSI access)
device "7seg"
Modified: head/sys/arm/conf/DB-78XXX
==============================================================================
--- head/sys/arm/conf/DB-78XXX Sun Apr 24 01:11:28 2011 (r220981)
+++ head/sys/arm/conf/DB-78XXX Sun Apr 24 08:58:58 2011 (r220982)
@@ -81,8 +81,7 @@ device iicbus
device ds133x
# SATA
-device ata
-device atadisk
+device mvs
# Flattened Device Tree
options FDT
Modified: head/sys/arm/conf/DB-88F5XXX
==============================================================================
--- head/sys/arm/conf/DB-88F5XXX Sun Apr 24 01:11:28 2011
(r220981)
+++ head/sys/arm/conf/DB-88F5XXX Sun Apr 24 08:58:58 2011
(r220982)
@@ -83,8 +83,7 @@ device pass
device da
# SATA
-device ata
-device atadisk
+device mvs
# Flattened Device Tree
options FDT
Modified: head/sys/arm/conf/DB-88F6XXX
==============================================================================
--- head/sys/arm/conf/DB-88F6XXX Sun Apr 24 01:11:28 2011
(r220981)
+++ head/sys/arm/conf/DB-88F6XXX Sun Apr 24 08:58:58 2011
(r220982)
@@ -80,8 +80,7 @@ device iic
device iicbus
# SATA
-device ata
-device atadisk
+device mvs
# Flattened Device Tree
options FDT
Modified: head/sys/arm/conf/EP80219
==============================================================================
--- head/sys/arm/conf/EP80219 Sun Apr 24 01:11:28 2011 (r220981)
+++ head/sys/arm/conf/EP80219 Sun Apr 24 08:58:58 2011 (r220982)
@@ -73,12 +73,12 @@ device uart
device pci
device ata
-device atadisk # ATA disk drives
-device ataraid # ATA RAID drives
-device atapicd # ATAPI CDROM drives
-device atapifd # ATAPI floppy drives
-device atapist # ATAPI tape drives
-options ATA_STATIC_ID # Static device numbering
+options ATA_CAM
+
+device scbus # SCSI bus (required for ATA/SCSI)
+device cd # CD
+device da # Direct Access (disks)
+device pass # Passthrough device (direct ATA/SCSI access)
# SCSI Controllers
@@ -111,4 +111,4 @@ options INCLUDE_CONFIG_FILE # Inclu
options VERBOSE_INIT_ARM
device bpf
-#options ROOTDEVNAME=\"ufs:ad4s1a\"
+#options ROOTDEVNAME=\"ufs:ada0s1a\"
Modified: head/sys/arm/conf/IQ31244
==============================================================================
--- head/sys/arm/conf/IQ31244 Sun Apr 24 01:11:28 2011 (r220981)
+++ head/sys/arm/conf/IQ31244 Sun Apr 24 08:58:58 2011 (r220982)
@@ -72,12 +72,12 @@ device uart
device pci
device ata
-device atadisk # ATA disk drives
-device ataraid # ATA RAID drives
-device atapicd # ATAPI CDROM drives
-device atapifd # ATAPI floppy drives
-device atapist # ATAPI tape drives
-options ATA_STATIC_ID # Static device numbering
+options ATA_CAM
+
+device scbus # SCSI bus (required for ATA/SCSI)
+device cd # CD
+device da # Direct Access (disks)
+device pass # Passthrough device (direct ATA/SCSI access)
# SCSI Controllers
Modified: head/sys/arm/conf/TS7800
==============================================================================
--- head/sys/arm/conf/TS7800 Sun Apr 24 01:11:28 2011 (r220981)
+++ head/sys/arm/conf/TS7800 Sun Apr 24 08:58:58 2011 (r220982)
@@ -71,7 +71,7 @@ device da
# SATA
device ata
-device atadisk
+options ATA_CAM
# Flattened Device Tree
options FDT
Modified: head/sys/conf/NOTES
==============================================================================
--- head/sys/conf/NOTES Sun Apr 24 01:11:28 2011 (r220981)
+++ head/sys/conf/NOTES Sun Apr 24 08:58:58 2011 (r220982)
@@ -1754,9 +1754,9 @@ hint.ata.1.irq="15"
# atapifd, atapist, atapicam) and all user-level APIs.
# cam(4) drivers and APIs will be connected instead.
-options ATA_STATIC_ID
+#options ATA_STATIC_ID
#options ATA_REQUEST_TIMEOUT=10
-#options ATA_CAM
+options ATA_CAM
#
# Standard floppy disk controllers and floppy tapes, supports
Modified: head/sys/i386/conf/GENERIC
==============================================================================
--- head/sys/i386/conf/GENERIC Sun Apr 24 01:11:28 2011 (r220981)
+++ head/sys/i386/conf/GENERIC Sun Apr 24 08:58:58 2011 (r220982)
@@ -91,14 +91,12 @@ device pci
# Floppy drives
device fdc
-# ATA and ATAPI devices
-device ata
-device atadisk # ATA disk drives
-device ataraid # ATA RAID drives
-device atapicd # ATAPI CDROM drives
-device atapifd # ATAPI floppy drives
-device atapist # ATAPI tape drives
-options ATA_STATIC_ID # Static device numbering
+# ATA controllers
+device ahci # AHCI-compatible SATA controllers
+device ata # Legacy ATA/SATA controllers
+options ATA_CAM # Handle legacy controllers with CAM
+device mvs # Marvell 88SX50XX/88SX60XX/88SX70XX/SoC SATA
+device siis # SiliconImage SiI3124/SiI3132/SiI3531 SATA
# SCSI Controllers
device ahb # EISA AHA1742 family
@@ -127,13 +125,13 @@ device ncv # NCR 53C500
device nsp # Workbit Ninja SCSI-3
device stg # TMC 18C30/18C50
-# SCSI peripherals
-device scbus # SCSI bus (required for SCSI)
+# ATA/SCSI peripherals
+device scbus # SCSI bus (required for ATA/SCSI)
device ch # SCSI media changers
device da # Direct Access (disks)
device sa # Sequential Access (tape etc)
device cd # CD
-device pass # Passthrough device (direct SCSI access)
+device pass # Passthrough device (direct ATA/SCSI access)
device ses # SCSI Environmental Services (and SAF-TE)
# RAID controllers interfaced to the SCSI subsystem
Modified: head/sys/i386/conf/XBOX
==============================================================================
--- head/sys/i386/conf/XBOX Sun Apr 24 01:11:28 2011 (r220981)
+++ head/sys/i386/conf/XBOX Sun Apr 24 08:58:58 2011 (r220982)
@@ -16,7 +16,7 @@ device sc # syscons
device fb
# no support yet for root device name fetching
-options ROOTDEVNAME=\"ufs:ad0s1a\"
+options ROOTDEVNAME=\"ufs:ada0s1a\"
#options ROOTDEVNAME=\"cd9660:acd0\"
options SCHED_4BSD # 4BSD scheduler
@@ -51,13 +51,13 @@ device pci
# ATA and ATAPI devices
device ata
-device atadisk # ATA disk drives
-device atapicd # ATAPI CDROM drives
-options ATA_STATIC_ID # Static device numbering
+options ATA_CAM
-# SCSI peripherals
-device scbus # SCSI bus (required for SCSI)
+# ATA/SCSI peripherals
+device scbus # SCSI bus (required for ATA/SCSI)
+device cd # CD
device da # Direct Access (disks)
+device pass # Passthrough device (direct ATA/SCSI access)
# Pseudo devices.
device loop # Network loopback
Modified: head/sys/ia64/conf/GENERIC
==============================================================================
--- head/sys/ia64/conf/GENERIC Sun Apr 24 01:11:28 2011 (r220981)
+++ head/sys/ia64/conf/GENERIC Sun Apr 24 08:58:58 2011 (r220982)
@@ -73,16 +73,15 @@ options MALLOC_DEBUG_MAXZONES=8 # Separ
device firewire # FireWire bus code
device miibus # MII bus support (Ethernet)
device pci # PCI bus support
-device scbus # SCSI bus (required for SCSI)
+device scbus # SCSI bus (required for ATA/SCSI)
device usb # USB Bus (required for USB)
-# ATA and ATAPI devices
-device ata # ATA controller
-device atadisk # ATA disk drives
-device atapicd # ATAPI CDROM drives
-device atapifd # ATAPI floppy drives
-device atapist # ATAPI tape drives
-device ataraid # ATA RAID drives
+# ATA controllers
+device ahci # AHCI-compatible SATA controllers
+device ata # Legacy ATA/SATA controllers
+options ATA_CAM # Handle legacy controllers with CAM
+device mvs # Marvell 88SX50XX/88SX60XX/88SX70XX/SoC SATA
+device siis # SiliconImage SiI3124/SiI3132/SiI3531 SATA
# SCSI Controllers
device ahc # AHA2940 and AIC7xxx devices
@@ -101,11 +100,11 @@ device ips # IBM (Adaptec)
ServeRAID
device mly # Mylex AcceleRAID/eXtremeRAID
device twa # 3ware 9000 series PATA/SATA RAID
-# SCSI peripherals
+# ATA/SCSI peripherals
device cd # CD-ROM, DVD-ROM etc.
device ch # Media changer
device da # Direct Access (ie disk)
-device pass # Passthrough (direct SCSI access)
+device pass # Passthrough (direct ATA/SCSI access)
device sa # Sequential Access (ie tape)
device ses # Environmental Services (and SAF-TE)
Modified: head/sys/mips/conf/MALTA
==============================================================================
--- head/sys/mips/conf/MALTA Sun Apr 24 01:11:28 2011 (r220981)
+++ head/sys/mips/conf/MALTA Sun Apr 24 08:58:58 2011 (r220982)
@@ -53,7 +53,7 @@ options FFS #Berkeley Fast
Filesystem
options SOFTUPDATES #Enable FFS soft updates support
options UFS_ACL #Support for access control lists
options UFS_DIRHASH #Improve performance on big directories
-options ROOTDEVNAME=\"ufs:ad0s1a\"
+options ROOTDEVNAME=\"ufs:ada0s1a\"
# Debugging for use in -current
Modified: head/sys/mips/conf/MALTA64
==============================================================================
--- head/sys/mips/conf/MALTA64 Sun Apr 24 01:11:28 2011 (r220981)
+++ head/sys/mips/conf/MALTA64 Sun Apr 24 08:58:58 2011 (r220982)
@@ -53,7 +53,7 @@ options FFS #Berkeley Fast
Filesystem
options SOFTUPDATES #Enable FFS soft updates support
options UFS_ACL #Support for access control lists
options UFS_DIRHASH #Improve performance on big directories
-options ROOTDEVNAME=\"ufs:ad0s1a\"
+options ROOTDEVNAME=\"ufs:ada0s1a\"
# Debugging for use in -current
Modified: head/sys/mips/conf/OCTEON1
==============================================================================
--- head/sys/mips/conf/OCTEON1 Sun Apr 24 01:11:28 2011 (r220981)
+++ head/sys/mips/conf/OCTEON1 Sun Apr 24 08:58:58 2011 (r220982)
@@ -95,14 +95,12 @@ options SMP # Symmetric
MultiProcesso
# Bus support.
device pci
-# ATA and ATAPI devices
-device ata
-device atadisk # ATA disk drives
-device ataraid # ATA RAID drives
-device atapicd # ATAPI CDROM drives
-device atapifd # ATAPI floppy drives
-device atapist # ATAPI tape drives
-options ATA_STATIC_ID # Static device numbering
+# ATA controllers
+device ahci # AHCI-compatible SATA controllers
+device ata # Legacy ATA/SATA controllers
+options ATA_CAM # Handle legacy controllers with CAM
+device mvs # Marvell 88SX50XX/88SX60XX/88SX70XX/SoC SATA
+device siis # SiliconImage SiI3124/SiI3132/SiI3531 SATA
# On-board Compact Flash driver.
device cf
@@ -129,13 +127,13 @@ device adw # Advansys wide SCSI
adapte
device aic # Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
device bt # Buslogic/Mylex MultiMaster SCSI adapters
-# SCSI peripherals
-device scbus # SCSI bus (required for SCSI)
+# ATA/SCSI peripherals
+device scbus # SCSI bus (required for ATA/SCSI)
device ch # SCSI media changers
device da # Direct Access (disks)
device sa # Sequential Access (tape etc)
device cd # CD
-device pass # Passthrough device (direct SCSI access)
+device pass # Passthrough device (direct ATA/SCSI access)
device ses # SCSI Environmental Services (and SAF-TE)
# RAID controllers interfaced to the SCSI subsystem
Modified: head/sys/mips/conf/std.SWARM
==============================================================================
--- head/sys/mips/conf/std.SWARM Sun Apr 24 01:11:28 2011
(r220981)
+++ head/sys/mips/conf/std.SWARM Sun Apr 24 08:58:58 2011
(r220982)
@@ -52,9 +52,9 @@ device ehci
device umass
device scbus
+device cd
device da
+device pass
device ata
-device atadisk
-device atapicd
-options ATA_STATIC_ID
+options ATA_CAM
Modified: head/sys/mips/malta/std.malta
==============================================================================
--- head/sys/mips/malta/std.malta Sun Apr 24 01:11:28 2011
(r220981)
+++ head/sys/mips/malta/std.malta Sun Apr 24 08:58:58 2011
(r220982)
@@ -5,4 +5,9 @@ cpu CPU_MIPS4KC
#options ISA_MIPS32
device pci
device ata
-device atadisk
+options ATA_CAM
+
+device scbus # SCSI bus (required for ATA/SCSI)
+device cd # CD
+device da # Direct Access (disks)
+device pass # Passthrough device (direct ATA/SCSI access)
Modified: head/sys/pc98/conf/GENERIC
==============================================================================
--- head/sys/pc98/conf/GENERIC Sun Apr 24 01:11:28 2011 (r220981)
+++ head/sys/pc98/conf/GENERIC Sun Apr 24 08:58:58 2011 (r220982)
@@ -87,13 +87,12 @@ device pci
# Floppy drives
device fdc
-# ATA and ATAPI devices
-device ata
-device atadisk # ATA disk drives
-device atapicd # ATAPI CDROM drives
-device atapifd # ATAPI floppy drives
-device atapist # ATAPI tape drives
-options ATA_STATIC_ID # Static device numbering
+# ATA controllers
+device ahci # AHCI-compatible SATA controllers
+device ata # Legacy ATA/SATA controllers
+options ATA_CAM # Handle legacy controllers with CAM
+device mvs # Marvell 88SX50XX/88SX60XX/88SX70XX/SoC SATA
+device siis # SiliconImage SiI3124/SiI3132/SiI3531 SATA
# SCSI Controllers
device adv # Advansys SCSI adapters
@@ -110,13 +109,13 @@ device ncv # NCR 53C500
device nsp # Workbit Ninja SCSI-3
device stg # TMC 18C30/18C50
-# SCSI peripherals
-device scbus # SCSI bus (required for SCSI)
+# ATA/SCSI peripherals
+device scbus # SCSI bus (required for ATA/SCSI)
device ch # SCSI media changers
device da # Direct Access (disks)
device sa # Sequential Access (tape etc)
device cd # CD
-device pass # Passthrough device (direct SCSI access)
+device pass # Passthrough device (direct ATA/SCSI access)
device ses # SCSI Environmental Services (and SAF-TE)
# keyboard driver
Modified: head/sys/powerpc/conf/GENERIC
==============================================================================
--- head/sys/powerpc/conf/GENERIC Sun Apr 24 01:11:28 2011
(r220981)
+++ head/sys/powerpc/conf/GENERIC Sun Apr 24 08:58:58 2011
(r220982)
@@ -86,12 +86,12 @@ device cpufreq
device pci
device agp
-# ATA and ATAPI devices
-device ata
-device atadisk # ATA disk drives
-device atapicd # ATAPI CDROM drives
-#device atapifd # ATAPI floppy drives
-#device atapist # ATAPI tape drives
+# ATA controllers
+device ahci # AHCI-compatible SATA controllers
+device ata # Legacy ATA/SATA controllers
+options ATA_CAM # Handle legacy controllers with CAM
+device mvs # Marvell 88SX50XX/88SX60XX/88SX70XX/SoC SATA
+device siis # SiliconImage SiI3124/SiI3132/SiI3531 SATA
# SCSI Controllers
device ahc # AHA2940 and onboard AIC7xxx devices
@@ -103,12 +103,12 @@ device ispfw # Firmware module for
Qlo
device mpt # LSI-Logic MPT-Fusion
device sym # NCR/Symbios/LSI Logic 53C8XX/53C1010/53C1510D
-# SCSI peripherals
-device scbus # SCSI bus (required for SCSI)
+# ATA/SCSI peripherals
+device scbus # SCSI bus (required for ATA/SCSI)
device da # Direct Access (disks)
device sa # Sequential Access (tape etc)
device cd # CD
-device pass # Passthrough device (direct SCSI access)
+device pass # Passthrough device (direct ATA/SCSI access)
# syscons is the default console driver, resembling an SCO console
device sc
Modified: head/sys/powerpc/conf/GENERIC64
==============================================================================
--- head/sys/powerpc/conf/GENERIC64 Sun Apr 24 01:11:28 2011
(r220981)
+++ head/sys/powerpc/conf/GENERIC64 Sun Apr 24 08:58:58 2011
(r220982)
@@ -86,12 +86,12 @@ device cpufreq
device pci
device agp
-# ATA and ATAPI devices
-device ata
-device atadisk # ATA disk drives
-device atapicd # ATAPI CDROM drives
-#device atapifd # ATAPI floppy drives
-#device atapist # ATAPI tape drives
+# ATA controllers
+device ahci # AHCI-compatible SATA controllers
+device ata # Legacy ATA/SATA controllers
+options ATA_CAM # Handle legacy controllers with CAM
+device mvs # Marvell 88SX50XX/88SX60XX/88SX70XX/SoC SATA
+device siis # SiliconImage SiI3124/SiI3132/SiI3531 SATA
# SCSI Controllers
device ahc # AHA2940 and onboard AIC7xxx devices
@@ -103,12 +103,12 @@ device ispfw # Firmware module for
Qlo
device mpt # LSI-Logic MPT-Fusion
device sym # NCR/Symbios/LSI Logic 53C8XX/53C1010/53C1510D
-# SCSI peripherals
-device scbus # SCSI bus (required for SCSI)
+# ATA/SCSI peripherals
+device scbus # SCSI bus (required for ATA/SCSI)
device da # Direct Access (disks)
device sa # Sequential Access (tape etc)
device cd # CD
-device pass # Passthrough device (direct SCSI access)
+device pass # Passthrough device (direct ATA/SCSI access)
# syscons is the default console driver, resembling an SCO console
device sc
Modified: head/sys/powerpc/conf/MPC85XX
==============================================================================
--- head/sys/powerpc/conf/MPC85XX Sun Apr 24 01:11:28 2011
(r220981)
+++ head/sys/powerpc/conf/MPC85XX Sun Apr 24 08:58:58 2011
(r220982)
@@ -56,7 +56,7 @@ options WITNESS
options WITNESS_SKIPSPIN
device ata
-device atadisk
+options ATA_CAM
device bpf
device cfi
device crypto
@@ -72,6 +72,7 @@ device iicbus
device loop
device md
device miibus
+device pass
device pci
device pty
device quicc
Modified: head/sys/sparc64/conf/GENERIC
==============================================================================
--- head/sys/sparc64/conf/GENERIC Sun Apr 24 01:11:28 2011
(r220981)
+++ head/sys/sparc64/conf/GENERIC Sun Apr 24 08:58:58 2011
(r220982)
@@ -88,15 +88,12 @@ device fhc
# Floppy drives
#device fdc
-# ATA and ATAPI devices
-device ata
-device atadisk # ATA disk drives
-device atapicd # ATAPI CDROM drives
-#device atapifd # ATAPI floppy drives
-#device atapist # ATAPI tape drives
-# Do NOT enable ATA_STATIC_ID -- cmd646 controller will be !ata2!,
-# and you will not mount an ATA /.
-#options ATA_STATIC_ID # Static device numbering
+# ATA controllers
+device ahci # AHCI-compatible SATA controllers
+device ata # Legacy ATA/SATA controllers
+options ATA_CAM # Handle legacy controllers with CAM
+device mvs # Marvell 88SX50XX/88SX60XX/88SX70XX/SoC SATA
+device siis # SiliconImage SiI3124/SiI3132/SiI3531 SATA
# SCSI Controllers
device ahc # AHA2940 and onboard AIC7xxx devices
@@ -109,13 +106,13 @@ device mpt # LSI-Logic MPT-Fusion
device sym # NCR/Symbios/LSI Logic 53C8XX/53C1010/53C1510D
device esp # NCR53c9x (FEPS/FAS366)
-# SCSI peripherals
-device scbus # SCSI bus (required for SCSI)
+# ATA/SCSI peripherals
+device scbus # SCSI bus (required for ATA/SCSI)
device ch # SCSI media changers
device da # Direct Access (disks)
device sa # Sequential Access (tape etc)
device cd # CD
-device pass # Passthrough device (direct SCSI access)
+device pass # Passthrough device (direct ATA/SCSI access)
device ses # SCSI Environmental Services (and SAF-TE)
# RAID controllers
Modified: head/sys/sun4v/conf/GENERIC
==============================================================================
--- head/sys/sun4v/conf/GENERIC Sun Apr 24 01:11:28 2011 (r220981)
+++ head/sys/sun4v/conf/GENERIC Sun Apr 24 08:58:58 2011 (r220982)
@@ -95,13 +95,7 @@ device pci
# ATA and ATAPI devices
device ata
-#device atadisk # ATA disk drives
-device atapicd # ATAPI CDROM drives
-#device atapifd # ATAPI floppy drives
-#device atapist # ATAPI tape drives
-# Do NOT enable ATA_STATIC_ID -- cmd646 controller will be !ata2!,
-# and you will not mount an ATA /.
-#options ATA_STATIC_ID # Static device numbering
+options ATA_CAM
# SCSI Controllers
#device ahc # AHA2940 and onboard AIC7xxx devices
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
