Index: UPDATING =================================================================== --- UPDATING (revision 220837) +++ UPDATING (working copy) @@ -22,6 +22,34 @@ 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 + 20110418: The GNU Objective-C runtime library (libobjc), and other Objective-C related components have been removed from the base system. If you Index: sys/arm/conf/DB-88F6XXX =================================================================== --- sys/arm/conf/DB-88F6XXX (revision 220837) +++ sys/arm/conf/DB-88F6XXX (working copy) @@ -80,8 +80,7 @@ device iicbus # SATA -device ata -device atadisk +device mvs # Flattened Device Tree options FDT Index: sys/arm/conf/DB-78XXX =================================================================== --- sys/arm/conf/DB-78XXX (revision 220837) +++ sys/arm/conf/DB-78XXX (working copy) @@ -81,8 +81,7 @@ device ds133x # SATA -device ata -device atadisk +device mvs # Flattened Device Tree options FDT Index: sys/arm/conf/TS7800 =================================================================== --- sys/arm/conf/TS7800 (revision 220837) +++ sys/arm/conf/TS7800 (working copy) @@ -71,7 +71,7 @@ # SATA device ata -device atadisk +options ATA_CAM # Flattened Device Tree options FDT Index: sys/arm/conf/CRB =================================================================== --- sys/arm/conf/CRB (revision 220837) +++ sys/arm/conf/CRB (working copy) @@ -73,13 +73,13 @@ 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 SCSI) +device cd # CD +device da # Direct Access (disks) +device pass # Passthrough device (direct SCSI access) + device "7seg" # SCSI Controllers Index: sys/arm/conf/IQ31244 =================================================================== --- sys/arm/conf/IQ31244 (revision 220837) +++ sys/arm/conf/IQ31244 (working copy) @@ -72,13 +72,13 @@ 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 SCSI) +device cd # CD +device da # Direct Access (disks) +device pass # Passthrough device (direct SCSI access) + # SCSI Controllers device pty Index: sys/arm/conf/DB-88F5XXX =================================================================== --- sys/arm/conf/DB-88F5XXX (revision 220837) +++ sys/arm/conf/DB-88F5XXX (working copy) @@ -83,8 +83,7 @@ device da # SATA -device ata -device atadisk +device mvs # Flattened Device Tree options FDT Index: sys/arm/conf/AVILA =================================================================== --- sys/arm/conf/AVILA (revision 220837) +++ sys/arm/conf/AVILA (working copy) @@ -92,8 +92,8 @@ 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 @@ -151,6 +151,7 @@ device umass device scbus # SCSI bus (required for SCSI) device da # Direct Access (disks) +device pass # Passthrough device (direct SCSI access) #device ural #device zyd Index: sys/arm/conf/CAMBRIA =================================================================== --- sys/arm/conf/CAMBRIA (revision 220837) +++ sys/arm/conf/CAMBRIA (working copy) @@ -95,8 +95,8 @@ 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 @@ -156,6 +156,7 @@ device umass device scbus # SCSI bus (required for SCSI) device da # Direct Access (disks) +device pass # Passthrough device (direct SCSI access) #device ural #device zyd Index: sys/arm/conf/EP80219 =================================================================== --- sys/arm/conf/EP80219 (revision 220837) +++ sys/arm/conf/EP80219 (working copy) @@ -73,13 +73,13 @@ 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 SCSI) +device cd # CD +device da # Direct Access (disks) +device pass # Passthrough device (direct SCSI access) + # SCSI Controllers device pty @@ -111,4 +111,4 @@ options VERBOSE_INIT_ARM device bpf -#options ROOTDEVNAME=\"ufs:ad4s1a\" +#options ROOTDEVNAME=\"ufs:ada0s1a\" Index: sys/powerpc/conf/GENERIC64 =================================================================== --- sys/powerpc/conf/GENERIC64 (revision 220837) +++ sys/powerpc/conf/GENERIC64 (working copy) @@ -88,10 +88,10 @@ # 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_CAM +device ahci +device mvs +device siis # SCSI Controllers device ahc # AHA2940 and onboard AIC7xxx devices Index: sys/powerpc/conf/GENERIC =================================================================== --- sys/powerpc/conf/GENERIC (revision 220837) +++ sys/powerpc/conf/GENERIC (working copy) @@ -88,10 +88,10 @@ # 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_CAM +device ahci +device mvs +device siis # SCSI Controllers device ahc # AHA2940 and onboard AIC7xxx devices Index: sys/powerpc/conf/MPC85XX =================================================================== --- sys/powerpc/conf/MPC85XX (revision 220837) +++ sys/powerpc/conf/MPC85XX (working copy) @@ -56,7 +56,7 @@ options WITNESS_SKIPSPIN device ata -device atadisk +options ATA_CAM device bpf device cfi device crypto @@ -72,6 +72,7 @@ device loop device md device miibus +device pass device pci device pty device quicc Index: sys/sparc64/conf/GENERIC =================================================================== --- sys/sparc64/conf/GENERIC (revision 220837) +++ sys/sparc64/conf/GENERIC (working copy) @@ -90,13 +90,10 @@ # 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 +device ahci +device mvs +device siis # SCSI Controllers device ahc # AHA2940 and onboard AIC7xxx devices Index: sys/conf/NOTES =================================================================== --- sys/conf/NOTES (revision 220837) +++ sys/conf/NOTES (working copy) @@ -1754,9 +1754,9 @@ # 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 Index: sys/ia64/conf/GENERIC =================================================================== --- sys/ia64/conf/GENERIC (revision 220837) +++ sys/ia64/conf/GENERIC (working copy) @@ -78,11 +78,10 @@ # 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 +options ATA_CAM +device ahci +device mvs +device siis # SCSI Controllers device ahc # AHA2940 and AIC7xxx devices Index: sys/mips/conf/MALTA =================================================================== --- sys/mips/conf/MALTA (revision 220837) +++ sys/mips/conf/MALTA (working copy) @@ -53,7 +53,7 @@ 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 Index: sys/mips/conf/std.SWARM =================================================================== --- sys/mips/conf/std.SWARM (revision 220837) +++ sys/mips/conf/std.SWARM (working copy) @@ -52,9 +52,9 @@ device umass device scbus +device cd device da +device pass device ata -device atadisk -device atapicd -options ATA_STATIC_ID +options ATA_CAM Index: sys/mips/conf/MALTA64 =================================================================== --- sys/mips/conf/MALTA64 (revision 220837) +++ sys/mips/conf/MALTA64 (working copy) @@ -53,7 +53,7 @@ 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 Index: sys/mips/conf/OCTEON1 =================================================================== --- sys/mips/conf/OCTEON1 (revision 220837) +++ sys/mips/conf/OCTEON1 (working copy) @@ -97,12 +97,10 @@ # 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 +options ATA_CAM +device ahci +device mvs +device siis # On-board Compact Flash driver. device cf Index: sys/mips/malta/std.malta =================================================================== --- sys/mips/malta/std.malta (revision 220837) +++ sys/mips/malta/std.malta (working copy) @@ -5,4 +5,9 @@ #options ISA_MIPS32 device pci device ata -device atadisk +options ATA_CAM + +device scbus # SCSI bus (required for SCSI) +device cd # CD +device da # Direct Access (disks) +device pass # Passthrough device (direct SCSI access) Index: sys/sun4v/conf/GENERIC =================================================================== --- sys/sun4v/conf/GENERIC (revision 220837) +++ sys/sun4v/conf/GENERIC (working copy) @@ -95,13 +95,7 @@ # 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 Index: sys/pc98/conf/GENERIC =================================================================== --- sys/pc98/conf/GENERIC (revision 220837) +++ sys/pc98/conf/GENERIC (working copy) @@ -89,11 +89,10 @@ # 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 +options ATA_CAM +device ahci +device mvs +device siis # SCSI Controllers device adv # Advansys SCSI adapters Index: sys/i386/conf/XBOX =================================================================== --- sys/i386/conf/XBOX (revision 220837) +++ sys/i386/conf/XBOX (working copy) @@ -16,7 +16,7 @@ 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 @@ # 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) +device cd # CD device da # Direct Access (disks) +device pass # Passthrough device (direct SCSI access) # Pseudo devices. device loop # Network loopback Index: sys/i386/conf/GENERIC =================================================================== --- sys/i386/conf/GENERIC (revision 220837) +++ sys/i386/conf/GENERIC (working copy) @@ -93,12 +93,10 @@ # 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 +options ATA_CAM +device ahci +device mvs +device siis # SCSI Controllers device ahb # EISA AHA1742 family Index: sys/amd64/conf/GENERIC =================================================================== --- sys/amd64/conf/GENERIC (revision 220837) +++ sys/amd64/conf/GENERIC (working copy) @@ -91,12 +91,10 @@ # 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 +options ATA_CAM +device ahci +device mvs +device siis # SCSI Controllers device ahc # AHA2940 and onboard AIC7xxx devices