After much delay and anticipation, welcome RAIDFrame into the FreeBSD

world.  This should be considered highly experimental.

Approved-by:	re

4 files changed, 72 insertions, 0 deletions

diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 02e1d9f1080a..ea14607371c8 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -979,6 +979,12 @@ device		ccd		#Concatenated disk driver
 device		vinum		#Vinum concat/mirror/raid driver
 options 	VINUMDEBUG	#enable Vinum debugging hooks
 
+# RAIDframe device.  RAID_AUTOCONFIG allows RAIDframe to search all of the
+# disk devices in the system looking for components that it recognizes (already
+# configured once before) and auto-configured them into arrays.
+device		raidframe
+options		RAID_AUTOCONFIG
+
 # Kernel side iconv library
 options 	LIBICONV
 
diff --git a/sys/conf/files b/sys/conf/files
index c003bc3c66af..d2a82107c66e 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -547,6 +547,66 @@ dev/puc/puc.c		optional puc
 dev/puc/puc_pci.c	optional puc pci
 dev/puc/puc_pccard.c	optional puc pccard
 dev/puc/pucdata.c	optional puc pci
+dev/raidframe/rf_acctrace.c		optional raidframe
+dev/raidframe/rf_alloclist.c		optional raidframe
+dev/raidframe/rf_aselect.c		optional raidframe
+dev/raidframe/rf_callback.c		optional raidframe
+dev/raidframe/rf_chaindecluster.c	optional raidframe
+dev/raidframe/rf_copyback.c		optional raidframe
+dev/raidframe/rf_cvscan.c		optional raidframe
+dev/raidframe/rf_dagdegrd.c		optional raidframe
+dev/raidframe/rf_dagdegwr.c		optional raidframe
+dev/raidframe/rf_dagffrd.c		optional raidframe
+dev/raidframe/rf_dagffwr.c		optional raidframe
+dev/raidframe/rf_dagfuncs.c		optional raidframe
+dev/raidframe/rf_dagutils.c		optional raidframe
+dev/raidframe/rf_debugMem.c		optional raidframe
+dev/raidframe/rf_debugprint.c		optional raidframe
+dev/raidframe/rf_decluster.c		optional raidframe
+dev/raidframe/rf_declusterPQ.c		optional raidframe
+dev/raidframe/rf_diskqueue.c		optional raidframe
+dev/raidframe/rf_disks.c		optional raidframe
+dev/raidframe/rf_driver.c		optional raidframe
+dev/raidframe/rf_engine.c		optional raidframe
+dev/raidframe/rf_evenodd.c		optional raidframe
+dev/raidframe/rf_evenodd_dagfuncs.c	optional raidframe
+dev/raidframe/rf_evenodd_dags.c		optional raidframe
+dev/raidframe/rf_fifo.c			optional raidframe
+dev/raidframe/rf_freebsdkintf.c		optional raidframe
+dev/raidframe/rf_interdecluster.c	optional raidframe
+dev/raidframe/rf_invertq.c		optional raidframe
+dev/raidframe/rf_layout.c		optional raidframe
+dev/raidframe/rf_map.c			optional raidframe
+dev/raidframe/rf_mcpair.c		optional raidframe
+dev/raidframe/rf_memchunk.c		optional raidframe
+dev/raidframe/rf_nwayxor.c		optional raidframe
+dev/raidframe/rf_options.c		optional raidframe
+dev/raidframe/rf_paritylog.c		optional raidframe
+dev/raidframe/rf_paritylogDiskMgr.c	optional raidframe
+dev/raidframe/rf_paritylogging.c	optional raidframe
+dev/raidframe/rf_parityloggingdags.c	optional raidframe
+dev/raidframe/rf_parityscan.c		optional raidframe
+dev/raidframe/rf_pq.c			optional raidframe
+dev/raidframe/rf_pqdeg.c		optional raidframe
+dev/raidframe/rf_pqdegdags.c		optional raidframe
+dev/raidframe/rf_psstatus.c		optional raidframe
+dev/raidframe/rf_raid0.c		optional raidframe
+dev/raidframe/rf_raid1.c		optional raidframe
+dev/raidframe/rf_raid4.c		optional raidframe
+dev/raidframe/rf_raid5.c		optional raidframe
+dev/raidframe/rf_raid5_rotatedspare.c	optional raidframe
+dev/raidframe/rf_reconbuffer.c		optional raidframe
+dev/raidframe/rf_reconmap.c		optional raidframe
+dev/raidframe/rf_reconstruct.c		optional raidframe
+dev/raidframe/rf_reconutil.c		optional raidframe
+dev/raidframe/rf_revent.c		optional raidframe
+dev/raidframe/rf_shutdown.c		optional raidframe
+dev/raidframe/rf_sstf.c			optional raidframe
+dev/raidframe/rf_states.c		optional raidframe
+dev/raidframe/rf_stripelocks.c		optional raidframe
+dev/raidframe/rf_strutils.c		optional raidframe
+dev/raidframe/rf_threadstuff.c		optional raidframe
+dev/raidframe/rf_utils.c		optional raidframe
 dev/random/harvest.c	standard
 dev/random/randomdev.c	optional random
 dev/random/yarrow.c	optional random
diff --git a/sys/conf/majors b/sys/conf/majors
index 1703c684ebb5..a83fa3d019c8 100644
--- a/sys/conf/majors
+++ b/sys/conf/majors
@@ -193,6 +193,8 @@ chrdev	name		comments
 175	ips		IBM/Adaptec ServeRAID (control device)
 176	ipsd		IBM/Adaptec ServeRAID (disk device)
 177	openfirm	OpenFirmware control device <tmm>
+178	raidctl		RAIDframe (control device)
+179	raid		RAIDframe (disk device)
 200	??		entries from 200-252 are reserved for local use
 252	??		entries from 200-252 are reserved for local use
 254	internal	Used internally by the kernel
diff --git a/sys/conf/options b/sys/conf/options
index 031184935fb2..9305b2ab1bfd 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -549,6 +549,10 @@ ROOTDEVNAME		opt_rootdevname.h
 FDC_DEBUG		opt_fdc.h
 PCFCLOCK_VERBOSE	opt_pcfclock.h
 PCFCLOCK_MAX_RETRIES	opt_pcfclock.h
+
+# RAIDframe options
+RAID_AUTOCONFIG		opt_raid.h
+RAID_DEBUG		opt_raid.h
 TDFX_LINUX opt_tdfx.h
 
 KTR			opt_global.h