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.

5 files changed, 20 insertions, 17 deletions

diff --git a/sys/mips/conf/MALTA b/sys/mips/conf/MALTA
index 89ebac5..3a827a2 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 627ca35..82114e12 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 c67d278..6d435d4 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 5ffcde0..a6a6197 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 6035c32..2003ff1 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)