From 97b53e3634fe8bff3d64f370373e0d94c68a1010 Mon Sep 17 00:00:00 2001 From: Alexander Motin Date: Sun, 24 Apr 2011 08:58:58 +0000 Subject: [PATCH] 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. --- UPDATING | 28 ++++++++++++++++++++++++++++ sys/amd64/conf/GENERIC | 20 +++++++++----------- sys/arm/conf/AVILA | 5 +++-- sys/arm/conf/CAMBRIA | 5 +++-- sys/arm/conf/CRB | 12 ++++++------ sys/arm/conf/DB-78XXX | 3 +-- sys/arm/conf/DB-88F5XXX | 3 +-- sys/arm/conf/DB-88F6XXX | 3 +-- sys/arm/conf/EP80219 | 14 +++++++------- sys/arm/conf/IQ31244 | 12 ++++++------ sys/arm/conf/TS7800 | 2 +- sys/conf/NOTES | 4 ++-- sys/i386/conf/GENERIC | 20 +++++++++----------- sys/i386/conf/XBOX | 12 ++++++------ sys/ia64/conf/GENERIC | 19 +++++++++---------- sys/mips/conf/MALTA | 2 +- sys/mips/conf/MALTA64 | 2 +- sys/mips/conf/OCTEON1 | 20 +++++++++----------- sys/mips/conf/std.SWARM | 6 +++--- sys/mips/malta/std.malta | 7 ++++++- sys/pc98/conf/GENERIC | 19 +++++++++---------- sys/powerpc/conf/GENERIC | 18 +++++++++--------- sys/powerpc/conf/GENERIC64 | 18 +++++++++--------- sys/powerpc/conf/MPC85XX | 3 ++- sys/sparc64/conf/GENERIC | 21 +++++++++------------ sys/sun4v/conf/GENERIC | 8 +------- 26 files changed, 151 insertions(+), 135 deletions(-) diff --git a/UPDATING b/UPDATING index c57d8fc68aa8..67f9cf22e1c9 100644 --- a/UPDATING +++ b/UPDATING @@ -22,6 +22,34 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9.x IS SLOW: 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 diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index c78a479de415..6769c79e06c7 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -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 adapters 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 diff --git a/sys/arm/conf/AVILA b/sys/arm/conf/AVILA index 3de3addac596..0140eb0f57a7 100644 --- a/sys/arm/conf/AVILA +++ b/sys/arm/conf/AVILA @@ -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 diff --git a/sys/arm/conf/CAMBRIA b/sys/arm/conf/CAMBRIA index 5dacf26988a5..dd829c69d82e 100644 --- a/sys/arm/conf/CAMBRIA +++ b/sys/arm/conf/CAMBRIA @@ -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 # handle big-endian byte order #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 diff --git a/sys/arm/conf/CRB b/sys/arm/conf/CRB index 2afd080aebca..eebdcbd432b0 100644 --- a/sys/arm/conf/CRB +++ b/sys/arm/conf/CRB @@ -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" diff --git a/sys/arm/conf/DB-78XXX b/sys/arm/conf/DB-78XXX index f5bafd17d3f6..7b58adaa9370 100644 --- a/sys/arm/conf/DB-78XXX +++ b/sys/arm/conf/DB-78XXX @@ -81,8 +81,7 @@ device iicbus device ds133x # SATA -device ata -device atadisk +device mvs # Flattened Device Tree options FDT diff --git a/sys/arm/conf/DB-88F5XXX b/sys/arm/conf/DB-88F5XXX index 12073abaf1e7..655d4a736afa 100644 --- a/sys/arm/conf/DB-88F5XXX +++ b/sys/arm/conf/DB-88F5XXX @@ -83,8 +83,7 @@ device pass device da # SATA -device ata -device atadisk +device mvs # Flattened Device Tree options FDT diff --git a/sys/arm/conf/DB-88F6XXX b/sys/arm/conf/DB-88F6XXX index d9abfea0fc00..ff9f28940bfb 100644 --- a/sys/arm/conf/DB-88F6XXX +++ b/sys/arm/conf/DB-88F6XXX @@ -80,8 +80,7 @@ device iic device iicbus # SATA -device ata -device atadisk +device mvs # Flattened Device Tree options FDT diff --git a/sys/arm/conf/EP80219 b/sys/arm/conf/EP80219 index 3c2c1aa9903f..c47f79e8b7a2 100644 --- a/sys/arm/conf/EP80219 +++ b/sys/arm/conf/EP80219 @@ -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 # Include this file in kernel options VERBOSE_INIT_ARM device bpf -#options ROOTDEVNAME=\"ufs:ad4s1a\" +#options ROOTDEVNAME=\"ufs:ada0s1a\" diff --git a/sys/arm/conf/IQ31244 b/sys/arm/conf/IQ31244 index 8b794975431f..dd90e4bca08d 100644 --- a/sys/arm/conf/IQ31244 +++ b/sys/arm/conf/IQ31244 @@ -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 diff --git a/sys/arm/conf/TS7800 b/sys/arm/conf/TS7800 index f62296aedd3b..c72661af0014 100644 --- a/sys/arm/conf/TS7800 +++ b/sys/arm/conf/TS7800 @@ -71,7 +71,7 @@ device da # SATA device ata -device atadisk +options ATA_CAM # Flattened Device Tree options FDT diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 6557a04fe272..610d33668974 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -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 diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 5dad17426e3a..75281aea9ee4 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -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 diff --git a/sys/i386/conf/XBOX b/sys/i386/conf/XBOX index 822926016257..0b507c5ff258 100644 --- a/sys/i386/conf/XBOX +++ b/sys/i386/conf/XBOX @@ -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 diff --git a/sys/ia64/conf/GENERIC b/sys/ia64/conf/GENERIC index 6c3c6a7ac89c..9efa94d5d15d 100644 --- a/sys/ia64/conf/GENERIC +++ b/sys/ia64/conf/GENERIC @@ -73,16 +73,15 @@ options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones 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) diff --git a/sys/mips/conf/MALTA b/sys/mips/conf/MALTA index 89ebac5e715d..3a827a2b3ad0 100644 --- a/sys/mips/conf/MALTA +++ b/sys/mips/conf/MALTA @@ -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 diff --git a/sys/mips/conf/MALTA64 b/sys/mips/conf/MALTA64 index 627ca35b85f3..82114e123ac3 100644 --- a/sys/mips/conf/MALTA64 +++ b/sys/mips/conf/MALTA64 @@ -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 diff --git a/sys/mips/conf/OCTEON1 b/sys/mips/conf/OCTEON1 index c67d278d44a6..6d435d4c95a4 100644 --- a/sys/mips/conf/OCTEON1 +++ b/sys/mips/conf/OCTEON1 @@ -95,14 +95,12 @@ options SMP # Symmetric MultiProcessor Kernel # 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 adapters 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 diff --git a/sys/mips/conf/std.SWARM b/sys/mips/conf/std.SWARM index 5ffcde07ef33..a6a619781079 100644 --- a/sys/mips/conf/std.SWARM +++ b/sys/mips/conf/std.SWARM @@ -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 diff --git a/sys/mips/malta/std.malta b/sys/mips/malta/std.malta index 6035c3294d89..2003ff1e08b5 100644 --- a/sys/mips/malta/std.malta +++ b/sys/mips/malta/std.malta @@ -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) diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC index 915d73f84545..afe5173cde6c 100644 --- a/sys/pc98/conf/GENERIC +++ b/sys/pc98/conf/GENERIC @@ -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 diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC index 2d1a0ca10be7..4a3695c005c1 100644 --- a/sys/powerpc/conf/GENERIC +++ b/sys/powerpc/conf/GENERIC @@ -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 Qlogic host adapters 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 diff --git a/sys/powerpc/conf/GENERIC64 b/sys/powerpc/conf/GENERIC64 index b423702c41f7..0de575824e9b 100644 --- a/sys/powerpc/conf/GENERIC64 +++ b/sys/powerpc/conf/GENERIC64 @@ -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 Qlogic host adapters 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 diff --git a/sys/powerpc/conf/MPC85XX b/sys/powerpc/conf/MPC85XX index 41b462130bc4..13decf702689 100644 --- a/sys/powerpc/conf/MPC85XX +++ b/sys/powerpc/conf/MPC85XX @@ -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 diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC index a2bb85c4f4f6..d6bd4b6469c8 100644 --- a/sys/sparc64/conf/GENERIC +++ b/sys/sparc64/conf/GENERIC @@ -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 diff --git a/sys/sun4v/conf/GENERIC b/sys/sun4v/conf/GENERIC index 8a482df6afcb..7740473c0667 100644 --- a/sys/sun4v/conf/GENERIC +++ b/sys/sun4v/conf/GENERIC @@ -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