Author: achim
Date: Mon Jul 8 12:17:06 2013
New Revision: 253033
URL: http://svnweb.freebsd.org/changeset/base/253033
Log:
MFC r250963, r251013, r251056: Driver 'aacraid' added to support Adaptec by
PMC RAID controller families Series 6, 7, 8 and upcoming products.
Approved by: emaste (co-mentor)
Added:
stable/8/share/man/man4/aacraid.4
- copied, changed from r250963, head/share/man/man4/aacraid.4
stable/8/sys/dev/aacraid/
- copied from r250963, head/sys/dev/aacraid/
stable/8/sys/modules/aacraid/
- copied from r250963, head/sys/modules/aacraid/
Modified:
stable/8/share/man/man4/Makefile
stable/8/sys/amd64/conf/GENERIC
stable/8/sys/amd64/conf/NOTES
stable/8/sys/conf/files
stable/8/sys/conf/options
stable/8/sys/dev/aacraid/aacraid.c
stable/8/sys/i386/conf/GENERIC
stable/8/sys/i386/conf/NOTES
stable/8/sys/ia64/conf/GENERIC
stable/8/sys/modules/Makefile
stable/8/sys/modules/aacraid/Makefile
stable/8/sys/sys/aac_ioctl.h
Directory Properties:
stable/8/share/man/man4/ (props changed)
stable/8/sys/ (props changed)
stable/8/sys/Makefile (props changed)
stable/8/sys/amd64/ (props changed)
stable/8/sys/amd64/amd64/intr_machdep.c (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/arm/ (props changed)
stable/8/sys/boot/ (props changed)
stable/8/sys/bsm/ (props changed)
stable/8/sys/cam/ (props changed)
stable/8/sys/cddl/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/compat/ (props changed)
stable/8/sys/conf/ (props changed)
stable/8/sys/contrib/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/crypto/ (props changed)
stable/8/sys/ddb/ (props changed)
stable/8/sys/dev/ (props changed)
stable/8/sys/dev/aac/ (props changed)
stable/8/sys/dev/acpi_support/ (props changed)
stable/8/sys/dev/acpica/ (props changed)
stable/8/sys/dev/adb/ (props changed)
stable/8/sys/dev/adlink/ (props changed)
stable/8/sys/dev/advansys/ (props changed)
stable/8/sys/dev/ae/ (props changed)
stable/8/sys/dev/age/ (props changed)
stable/8/sys/dev/agp/ (props changed)
stable/8/sys/dev/aha/ (props changed)
stable/8/sys/dev/ahb/ (props changed)
stable/8/sys/dev/ahci/ (props changed)
stable/8/sys/dev/aic/ (props changed)
stable/8/sys/dev/aic7xxx/ (props changed)
stable/8/sys/dev/alc/ (props changed)
stable/8/sys/dev/ale/ (props changed)
stable/8/sys/dev/amd/ (props changed)
stable/8/sys/dev/amdsbwd/ (props changed)
stable/8/sys/dev/amdtemp/ (props changed)
stable/8/sys/dev/amr/ (props changed)
stable/8/sys/dev/an/ (props changed)
stable/8/sys/dev/arcmsr/ (props changed)
stable/8/sys/dev/asmc/ (props changed)
stable/8/sys/dev/asr/ (props changed)
stable/8/sys/dev/ata/ (props changed)
stable/8/sys/dev/ath/ (props changed)
stable/8/sys/dev/atkbdc/ (props changed)
stable/8/sys/dev/auxio/ (props changed)
stable/8/sys/dev/bce/ (props changed)
stable/8/sys/dev/bfe/ (props changed)
stable/8/sys/dev/bge/ (props changed)
stable/8/sys/dev/bktr/ (props changed)
stable/8/sys/dev/bm/ (props changed)
stable/8/sys/dev/buslogic/ (props changed)
stable/8/sys/dev/bwi/ (props changed)
stable/8/sys/dev/bwn/ (props changed)
stable/8/sys/dev/cardbus/ (props changed)
stable/8/sys/dev/cas/ (props changed)
stable/8/sys/dev/ce/ (props changed)
stable/8/sys/dev/cfe/ (props changed)
stable/8/sys/dev/cfi/ (props changed)
stable/8/sys/dev/ciss/ (props changed)
stable/8/sys/dev/cm/ (props changed)
stable/8/sys/dev/cmx/ (props changed)
stable/8/sys/dev/coretemp/ (props changed)
stable/8/sys/dev/cp/ (props changed)
stable/8/sys/dev/cpuctl/ (props changed)
stable/8/sys/dev/cpufreq/ (props changed)
stable/8/sys/dev/cs/ (props changed)
stable/8/sys/dev/ct/ (props changed)
stable/8/sys/dev/ctau/ (props changed)
stable/8/sys/dev/cx/ (props changed)
stable/8/sys/dev/cxgb/ (props changed)
stable/8/sys/dev/cxgbe/ (props changed)
stable/8/sys/dev/cy/ (props changed)
stable/8/sys/dev/dc/ (props changed)
stable/8/sys/dev/dcons/ (props changed)
stable/8/sys/dev/de/ (props changed)
stable/8/sys/dev/digi/ (props changed)
stable/8/sys/dev/dpms/ (props changed)
stable/8/sys/dev/dpt/ (props changed)
stable/8/sys/dev/drm/ (props changed)
stable/8/sys/dev/e1000/ (props changed)
stable/8/sys/dev/ed/ (props changed)
stable/8/sys/dev/eisa/ (props changed)
stable/8/sys/dev/en/ (props changed)
stable/8/sys/dev/ep/ (props changed)
stable/8/sys/dev/esp/ (props changed)
stable/8/sys/dev/et/ (props changed)
stable/8/sys/dev/ex/ (props changed)
stable/8/sys/dev/exca/ (props changed)
stable/8/sys/dev/fatm/ (props changed)
stable/8/sys/dev/fb/ (props changed)
stable/8/sys/dev/fdc/ (props changed)
stable/8/sys/dev/fe/ (props changed)
stable/8/sys/dev/firewire/ (props changed)
stable/8/sys/dev/flash/ (props changed)
stable/8/sys/dev/fxp/ (props changed)
stable/8/sys/dev/gem/ (props changed)
stable/8/sys/dev/glxsb/ (props changed)
stable/8/sys/dev/hatm/ (props changed)
stable/8/sys/dev/hifn/ (props changed)
stable/8/sys/dev/hme/ (props changed)
stable/8/sys/dev/hpt27xx/ (props changed)
stable/8/sys/dev/hptiop/ (props changed)
stable/8/sys/dev/hptmv/ (props changed)
stable/8/sys/dev/hptrr/ (props changed)
stable/8/sys/dev/hwpmc/ (props changed)
stable/8/sys/dev/ic/ (props changed)
stable/8/sys/dev/ichsmb/ (props changed)
stable/8/sys/dev/ichwd/ (props changed)
stable/8/sys/dev/ida/ (props changed)
stable/8/sys/dev/ie/ (props changed)
stable/8/sys/dev/ieee488/ (props changed)
stable/8/sys/dev/if_ndis/ (props changed)
stable/8/sys/dev/iicbus/ (props changed)
stable/8/sys/dev/iir/ (props changed)
stable/8/sys/dev/io/ (props changed)
stable/8/sys/dev/ipmi/ (props changed)
stable/8/sys/dev/ips/ (props changed)
stable/8/sys/dev/ipw/ (props changed)
stable/8/sys/dev/isci/ (props changed)
stable/8/sys/dev/iscsi/ (props changed)
stable/8/sys/dev/isp/ (props changed)
stable/8/sys/dev/ispfw/ (props changed)
stable/8/sys/dev/iwi/ (props changed)
stable/8/sys/dev/iwn/ (props changed)
stable/8/sys/dev/ixgb/ (props changed)
stable/8/sys/dev/ixgbe/ (props changed)
stable/8/sys/dev/jme/ (props changed)
stable/8/sys/dev/joy/ (props changed)
stable/8/sys/dev/kbd/ (props changed)
stable/8/sys/dev/kbdmux/ (props changed)
stable/8/sys/dev/ksyms/ (props changed)
stable/8/sys/dev/le/ (props changed)
stable/8/sys/dev/led/ (props changed)
stable/8/sys/dev/lge/ (props changed)
stable/8/sys/dev/lindev/ (props changed)
stable/8/sys/dev/lmc/ (props changed)
stable/8/sys/dev/malo/ (props changed)
stable/8/sys/dev/mc146818/ (props changed)
stable/8/sys/dev/mca/ (props changed)
stable/8/sys/dev/mcd/ (props changed)
stable/8/sys/dev/md/ (props changed)
stable/8/sys/dev/mem/ (props changed)
stable/8/sys/dev/mfi/ (props changed)
stable/8/sys/dev/mge/ (props changed)
stable/8/sys/dev/mii/ (props changed)
stable/8/sys/dev/mk48txx/ (props changed)
stable/8/sys/dev/mlx/ (props changed)
stable/8/sys/dev/mly/ (props changed)
stable/8/sys/dev/mmc/ (props changed)
stable/8/sys/dev/mn/ (props changed)
stable/8/sys/dev/mps/ (props changed)
stable/8/sys/dev/mpt/ (props changed)
stable/8/sys/dev/mse/ (props changed)
stable/8/sys/dev/msk/ (props changed)
stable/8/sys/dev/mvs/ (props changed)
stable/8/sys/dev/mwl/ (props changed)
stable/8/sys/dev/mxge/ (props changed)
stable/8/sys/dev/my/ (props changed)
stable/8/sys/dev/ncv/ (props changed)
stable/8/sys/dev/netmap/ (props changed)
stable/8/sys/dev/nfe/ (props changed)
stable/8/sys/dev/nge/ (props changed)
stable/8/sys/dev/nmdm/ (props changed)
stable/8/sys/dev/nsp/ (props changed)
stable/8/sys/dev/null/ (props changed)
stable/8/sys/dev/nve/ (props changed)
stable/8/sys/dev/nvram/ (props changed)
stable/8/sys/dev/nxge/ (props changed)
stable/8/sys/dev/oce/ (props changed)
stable/8/sys/dev/ofw/ (props changed)
stable/8/sys/dev/patm/ (props changed)
stable/8/sys/dev/pbio/ (props changed)
stable/8/sys/dev/pccard/ (props changed)
stable/8/sys/dev/pccbb/ (props changed)
stable/8/sys/dev/pcf/ (props changed)
stable/8/sys/dev/pci/ (props changed)
stable/8/sys/dev/pcn/ (props changed)
stable/8/sys/dev/pdq/ (props changed)
stable/8/sys/dev/powermac_nvram/ (props changed)
stable/8/sys/dev/ppbus/ (props changed)
stable/8/sys/dev/ppc/ (props changed)
stable/8/sys/dev/pst/ (props changed)
stable/8/sys/dev/puc/ (props changed)
stable/8/sys/dev/quicc/ (props changed)
stable/8/sys/dev/ral/ (props changed)
stable/8/sys/dev/random/ (props changed)
stable/8/sys/dev/rc/ (props changed)
stable/8/sys/dev/re/ (props changed)
stable/8/sys/dev/rndtest/ (props changed)
stable/8/sys/dev/rp/ (props changed)
stable/8/sys/dev/safe/ (props changed)
stable/8/sys/dev/sbni/ (props changed)
stable/8/sys/dev/scc/ (props changed)
stable/8/sys/dev/scd/ (props changed)
stable/8/sys/dev/sdhci/ (props changed)
stable/8/sys/dev/sec/ (props changed)
stable/8/sys/dev/sf/ (props changed)
stable/8/sys/dev/sge/ (props changed)
stable/8/sys/dev/si/ (props changed)
stable/8/sys/dev/siba/ (props changed)
stable/8/sys/dev/siis/ (props changed)
stable/8/sys/dev/sio/ (props changed)
stable/8/sys/dev/sis/ (props changed)
stable/8/sys/dev/sk/ (props changed)
stable/8/sys/dev/smbus/ (props changed)
stable/8/sys/dev/smc/ (props changed)
stable/8/sys/dev/sn/ (props changed)
stable/8/sys/dev/snc/ (props changed)
stable/8/sys/dev/snp/ (props changed)
stable/8/sys/dev/sound/ (props changed)
stable/8/sys/dev/sound/chip.h (props changed)
stable/8/sys/dev/sound/clone.c (props changed)
stable/8/sys/dev/sound/clone.h (props changed)
stable/8/sys/dev/sound/driver.c (props changed)
stable/8/sys/dev/sound/isa/ (props changed)
stable/8/sys/dev/sound/macio/ (props changed)
stable/8/sys/dev/sound/midi/ (props changed)
stable/8/sys/dev/sound/pci/ (props changed)
stable/8/sys/dev/sound/pcm/ (props changed)
stable/8/sys/dev/sound/sbus/ (props changed)
stable/8/sys/dev/sound/unit.c (props changed)
stable/8/sys/dev/sound/unit.h (props changed)
stable/8/sys/dev/sound/usb/ (props changed)
stable/8/sys/dev/sound/version.h (props changed)
stable/8/sys/dev/speaker/ (props changed)
stable/8/sys/dev/spibus/ (props changed)
stable/8/sys/dev/ste/ (props changed)
stable/8/sys/dev/stg/ (props changed)
stable/8/sys/dev/stge/ (props changed)
stable/8/sys/dev/streams/ (props changed)
stable/8/sys/dev/sym/ (props changed)
stable/8/sys/dev/syscons/ (props changed)
stable/8/sys/dev/tdfx/ (props changed)
stable/8/sys/dev/ti/ (props changed)
stable/8/sys/dev/tl/ (props changed)
stable/8/sys/dev/tpm/ (props changed)
stable/8/sys/dev/trm/ (props changed)
stable/8/sys/dev/tsec/ (props changed)
stable/8/sys/dev/twa/ (props changed)
stable/8/sys/dev/twe/ (props changed)
stable/8/sys/dev/tws/ (props changed)
stable/8/sys/dev/tx/ (props changed)
stable/8/sys/dev/txp/ (props changed)
stable/8/sys/dev/uart/ (props changed)
stable/8/sys/dev/ubsec/ (props changed)
stable/8/sys/dev/usb/ (props changed)
stable/8/sys/dev/utopia/ (props changed)
stable/8/sys/dev/vge/ (props changed)
stable/8/sys/dev/viawd/ (props changed)
stable/8/sys/dev/virtio/ (props changed)
stable/8/sys/dev/vkbd/ (props changed)
stable/8/sys/dev/vr/ (props changed)
stable/8/sys/dev/vte/ (props changed)
stable/8/sys/dev/vx/ (props changed)
stable/8/sys/dev/watchdog/ (props changed)
stable/8/sys/dev/wb/ (props changed)
stable/8/sys/dev/wbwd/ (props changed)
stable/8/sys/dev/wds/ (props changed)
stable/8/sys/dev/wi/ (props changed)
stable/8/sys/dev/wl/ (props changed)
stable/8/sys/dev/wpi/ (props changed)
stable/8/sys/dev/xe/ (props changed)
stable/8/sys/dev/xen/ (props changed)
stable/8/sys/dev/xl/ (props changed)
stable/8/sys/fs/ (props changed)
stable/8/sys/gdb/ (props changed)
stable/8/sys/geom/ (props changed)
stable/8/sys/gnu/ (props changed)
stable/8/sys/i386/ (props changed)
stable/8/sys/i386/i386/intr_machdep.c (props changed)
stable/8/sys/ia64/ (props changed)
stable/8/sys/isa/ (props changed)
stable/8/sys/kern/ (props changed)
stable/8/sys/kgssapi/ (props changed)
stable/8/sys/libkern/ (props changed)
stable/8/sys/mips/ (props changed)
stable/8/sys/modules/ (props changed)
stable/8/sys/net/ (props changed)
stable/8/sys/net80211/ (props changed)
stable/8/sys/netatalk/ (props changed)
stable/8/sys/netgraph/ (props changed)
stable/8/sys/netinet/ (props changed)
stable/8/sys/netinet6/ (props changed)
stable/8/sys/netipsec/ (props changed)
stable/8/sys/netipx/ (props changed)
stable/8/sys/netnatm/ (props changed)
stable/8/sys/netncp/ (props changed)
stable/8/sys/netsmb/ (props changed)
stable/8/sys/nfs/ (props changed)
stable/8/sys/nfsclient/ (props changed)
stable/8/sys/nfsserver/ (props changed)
stable/8/sys/nlm/ (props changed)
stable/8/sys/opencrypto/ (props changed)
stable/8/sys/pc98/ (props changed)
stable/8/sys/pci/ (props changed)
stable/8/sys/powerpc/ (props changed)
stable/8/sys/rpc/ (props changed)
stable/8/sys/security/ (props changed)
stable/8/sys/sparc64/ (props changed)
stable/8/sys/sun4v/ (props changed)
stable/8/sys/sys/ (props changed)
stable/8/sys/tools/ (props changed)
stable/8/sys/ufs/ (props changed)
stable/8/sys/vm/ (props changed)
stable/8/sys/x86/ (props changed)
stable/8/sys/xdr/ (props changed)
stable/8/sys/xen/ (props changed)
Modified: stable/8/share/man/man4/Makefile
==============================================================================
--- stable/8/share/man/man4/Makefile Mon Jul 8 12:11:54 2013
(r253032)
+++ stable/8/share/man/man4/Makefile Mon Jul 8 12:17:06 2013
(r253033)
@@ -2,6 +2,7 @@
# $FreeBSD$
MAN= aac.4 \
+ aacraid.4 \
acpi.4 \
${_acpi_aiboost.4} \
${_acpi_asus.4} \
Copied and modified: stable/8/share/man/man4/aacraid.4 (from r250963,
head/share/man/man4/aacraid.4)
==============================================================================
--- head/share/man/man4/aacraid.4 Fri May 24 09:22:43 2013
(r250963, copy source)
+++ stable/8/share/man/man4/aacraid.4 Mon Jul 8 12:17:06 2013
(r253033)
@@ -53,10 +53,10 @@ The
driver provides support for the Adaptec by PMC RAID controllers,
including Series 6/7/8 and upcoming families.
.Pp
-The RAID containers are handled via the
+The RAID containers are handled via the
.Nm aacraidp0
bus.
-The physical buses are represented by the
+The physical buses are represented by the
.Nm aacraidp?
devices (beginning with aacraidp1). These devices enable the
SCSI pass-thru interface and allows devices connected
@@ -135,5 +135,4 @@ and are also queued for retrieval by a m
.An Scott Long
.Aq [email protected]
.Sh BUGS
-.Pp
The controller is not actually paused on suspend/resume.
Modified: stable/8/sys/amd64/conf/GENERIC
==============================================================================
--- stable/8/sys/amd64/conf/GENERIC Mon Jul 8 12:11:54 2013
(r253032)
+++ stable/8/sys/amd64/conf/GENERIC Mon Jul 8 12:17:06 2013
(r253033)
@@ -151,6 +151,7 @@ device twa # 3ware 9000 series
PATA/SA
# RAID controllers
device aac # Adaptec FSA RAID
device aacp # SCSI passthrough for aac (requires CAM)
+device aacraid # Adaptec by PMC RAID
device ida # Compaq Smart RAID
device mfi # LSI MegaRAID SAS
device mlx # Mylex DAC960 family
Modified: stable/8/sys/amd64/conf/NOTES
==============================================================================
--- stable/8/sys/amd64/conf/NOTES Mon Jul 8 12:11:54 2013
(r253032)
+++ stable/8/sys/amd64/conf/NOTES Mon Jul 8 12:17:06 2013
(r253033)
@@ -389,6 +389,10 @@ device aac
device aacp # SCSI Passthrough interface (optional, CAM required)
#
+# Adaptec by PMC RAID controllers, Series 6/7/8 and upcoming families
+device aacraid # Container interface, CAM required
+
+#
# Highpoint RocketRAID 27xx.
device hpt27xx
Modified: stable/8/sys/conf/files
==============================================================================
--- stable/8/sys/conf/files Mon Jul 8 12:11:54 2013 (r253032)
+++ stable/8/sys/conf/files Mon Jul 8 12:17:06 2013 (r253033)
@@ -397,6 +397,11 @@ dev/aac/aac_debug.c optional aac
dev/aac/aac_disk.c optional aac
dev/aac/aac_linux.c optional aac compat_linux
dev/aac/aac_pci.c optional aac pci
+dev/aacraid/aacraid.c optional aacraid
+dev/aacraid/aacraid_cam.c optional aacraid scbus
+dev/aacraid/aacraid_debug.c optional aacraid
+dev/aacraid/aacraid_linux.c optional aacraid compat_linux
+dev/aacraid/aacraid_pci.c optional aacraid pci
dev/acpi_support/acpi_wmi.c optional acpi_wmi acpi
dev/acpi_support/acpi_aiboost.c optional acpi_aiboost acpi
dev/acpi_support/acpi_asus.c optional acpi_asus acpi
Modified: stable/8/sys/conf/options
==============================================================================
--- stable/8/sys/conf/options Mon Jul 8 12:11:54 2013 (r253032)
+++ stable/8/sys/conf/options Mon Jul 8 12:17:06 2013 (r253033)
@@ -31,6 +31,7 @@
# opt_<name-of-option-in-lower-case>.h
AAC_DEBUG opt_aac.h
+AACRAID_DEBUG opt_aacraid.h
AHC_ALLOW_MEMIO opt_aic7xxx.h
AHC_TMODE_ENABLE opt_aic7xxx.h
AHC_DUMP_EEPROM opt_aic7xxx.h
Modified: stable/8/sys/dev/aacraid/aacraid.c
==============================================================================
--- head/sys/dev/aacraid/aacraid.c Fri May 24 09:22:43 2013
(r250963)
+++ stable/8/sys/dev/aacraid/aacraid.c Mon Jul 8 12:17:06 2013
(r253033)
@@ -2522,7 +2522,7 @@ aac_ioctl_send_raw_srb(struct aac_softc
srb_sg_address = (u_int64_t)sgp->SgAddress;
} else if (fibsize == (sizeof(struct aac_srb) +
srbcmd->sg_map.SgCount * sizeof(struct aac_sg_entry64))) {
-#ifdef __amd64__
+#ifdef __LP64__
struct aac_sg_entry64 *sgp =
(struct aac_sg_entry64 *)srbcmd->sg_map.SgEntry;
srb_sg_bytecount = sgp->SgByteCount;
@@ -2576,12 +2576,7 @@ aac_ioctl_send_raw_srb(struct aac_softc
cm->cm_flags |= AAC_CMD_DATAOUT;
if (srbcmd->flags & AAC_SRB_FLAGS_DATA_OUT) {
- if ((error = copyin(
-#ifdef __amd64__
- (void *)srb_sg_address,
-#else
- (void *)(u_int32_t)srb_sg_address,
-#endif
+ if ((error = copyin((void *)(uintptr_t)srb_sg_address,
cm->cm_data, cm->cm_datalen)) != 0)
goto out;
/* sync required for bus_dmamem_alloc() alloc. mem.? */
@@ -2624,12 +2619,8 @@ aac_ioctl_send_raw_srb(struct aac_softc
/* copy data */
if (transfer_data && (srbcmd->flags & AAC_SRB_FLAGS_DATA_IN)) {
- if ((error = copyout(cm->cm_data,
-#ifdef __amd64__
- (void *)srb_sg_address,
-#else
- (void *)(u_int32_t)srb_sg_address,
-#endif
+ if ((error = copyout(cm->cm_data,
+ (void *)(uintptr_t)srb_sg_address,
cm->cm_datalen)) != 0)
goto out;
/* sync required for bus_dmamem_alloc() allocated mem.? */
Modified: stable/8/sys/i386/conf/GENERIC
==============================================================================
--- stable/8/sys/i386/conf/GENERIC Mon Jul 8 12:11:54 2013
(r253032)
+++ stable/8/sys/i386/conf/GENERIC Mon Jul 8 12:17:06 2013
(r253033)
@@ -158,6 +158,7 @@ device tws # LSI 3ware 9750
SATA+SAS 6
# RAID controllers
device aac # Adaptec FSA RAID
device aacp # SCSI passthrough for aac (requires CAM)
+device aacraid # Adaptec by PMC RAID
device ida # Compaq Smart RAID
device mfi # LSI MegaRAID SAS
device mlx # Mylex DAC960 family
Modified: stable/8/sys/i386/conf/NOTES
==============================================================================
--- stable/8/sys/i386/conf/NOTES Mon Jul 8 12:11:54 2013
(r253032)
+++ stable/8/sys/i386/conf/NOTES Mon Jul 8 12:17:06 2013
(r253033)
@@ -718,6 +718,10 @@ hint.stg.0.port="11"
device aac
device aacp # SCSI Passthrough interface (optional, CAM required)
+#
+# Adaptec by PMC RAID controllers, Series 6/7/8 and upcoming families
+device aacraid # Container interface, CAM required
+
# The 'asr' driver provides support for current DPT/Adaptec SCSI RAID
# controllers (SmartRAID V and VI and later).
# These controllers require the CAM infrastructure.
Modified: stable/8/sys/ia64/conf/GENERIC
==============================================================================
--- stable/8/sys/ia64/conf/GENERIC Mon Jul 8 12:11:54 2013
(r253032)
+++ stable/8/sys/ia64/conf/GENERIC Mon Jul 8 12:17:06 2013
(r253033)
@@ -110,6 +110,7 @@ device ses # Environmental
Services (a
# RAID controllers
device aac # Adaptec FSA RAID
device aacp # SCSI passthrough for aac (requires CAM)
+device aacraid # Adaptec by PMC RAID
device ida # Compaq Smart RAID
device mlx # Mylex DAC960 family
Modified: stable/8/sys/modules/Makefile
==============================================================================
--- stable/8/sys/modules/Makefile Mon Jul 8 12:11:54 2013
(r253032)
+++ stable/8/sys/modules/Makefile Mon Jul 8 12:17:06 2013
(r253033)
@@ -6,6 +6,7 @@ SUBDIR= \
${_3dfx} \
${_3dfx_linux} \
${_aac} \
+ ${_aacraid} \
accf_data \
accf_dns \
accf_http \
@@ -477,6 +478,7 @@ _zfs= zfs
.endif
.if ${MACHINE} == "i386"
_aac= aac
+_aacraid= aacraid
_acpi= acpi
.if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
_aesni= aesni
@@ -540,6 +542,7 @@ _snc= snc
.if ${MACHINE_ARCH} == "amd64"
_aac= aac
+_aacraid= aacraid
_acpi= acpi
.if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
_aesni= aesni
@@ -636,6 +639,7 @@ _zfs= zfs
.if ${MACHINE_ARCH} == "ia64"
_aac= aac
+_aacraid= aacraid
_aic= aic
_an= an
_arcnet= arcnet
Modified: stable/8/sys/modules/aacraid/Makefile
==============================================================================
--- head/sys/modules/aacraid/Makefile Fri May 24 09:22:43 2013
(r250963)
+++ stable/8/sys/modules/aacraid/Makefile Mon Jul 8 12:17:06 2013
(r253033)
@@ -2,7 +2,7 @@
.PATH: ${.CURDIR}/../../dev/aacraid
-.if ${MACHINE_CPUARCH} == "i386"
+.if ${MACHINE_ARCH} == "i386"
SUBDIR= aacraid_linux
.endif
Modified: stable/8/sys/sys/aac_ioctl.h
==============================================================================
--- stable/8/sys/sys/aac_ioctl.h Mon Jul 8 12:11:54 2013
(r253032)
+++ stable/8/sys/sys/aac_ioctl.h Mon Jul 8 12:17:06 2013
(r253033)
@@ -192,7 +192,10 @@ struct aac_query_disk {
typedef union {
struct {
u_int32_t largeLBA : 1; /* disk support greater 2TB */
- u_int32_t fReserved : 31;
+ u_int32_t IoctlBuf : 1; /* ARCIOCTL call support */
+ u_int32_t AIFSupport: 1; /* AIF support */
+ u_int32_t JBODSupport:1; /* fw + driver support JBOD */
+ u_int32_t fReserved : 28;
} fBits;
u_int32_t fValue;
} featuresState;
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
