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.

9 files changed, 29 insertions, 30 deletions

diff --git a/sys/arm/conf/AVILA b/sys/arm/conf/AVILA
index 3de3add..0140eb0 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 5dacf26..dd829c6 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 2afd080..eebdcbd 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 f5bafd1..7b58ada 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 12073ab..655d4a7 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 d9abfea..ff9f289 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 3c2c1aa..c47f79e 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 8b79497..dd90e4b 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 f62296a..c72661a 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