Date: Fri, 5 Jul 2013 09:36:10 +0000 (UTC) From: Achim Leubner <achim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r252778 - in stable/9: share/man/man4 sys/amd64/conf sys/conf sys/dev/aacraid sys/i386/conf sys/ia64/conf sys/modules sys/modules/aacraid Message-ID: <201307050936.r659aAZM071318@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: achim Date: Fri Jul 5 09:36:09 2013 New Revision: 252778 URL: http://svnweb.freebsd.org/changeset/base/252778 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/9/share/man/man4/aacraid.4 - copied, changed from r250963, head/share/man/man4/aacraid.4 stable/9/sys/dev/aacraid/ - copied from r250963, head/sys/dev/aacraid/ stable/9/sys/modules/aacraid/ - copied from r250963, head/sys/modules/aacraid/ Modified: stable/9/share/man/man4/Makefile stable/9/sys/amd64/conf/GENERIC stable/9/sys/amd64/conf/NOTES stable/9/sys/conf/files stable/9/sys/conf/options stable/9/sys/dev/aacraid/aacraid.c stable/9/sys/i386/conf/GENERIC stable/9/sys/i386/conf/NOTES stable/9/sys/ia64/conf/GENERIC stable/9/sys/modules/Makefile Directory Properties: stable/9/share/man/man4/ (props changed) stable/9/sys/ (props changed) stable/9/sys/amd64/include/xen/ (props changed) stable/9/sys/boot/ (props changed) stable/9/sys/boot/i386/efi/ (props changed) stable/9/sys/boot/ia64/efi/ (props changed) stable/9/sys/boot/ia64/ski/ (props changed) stable/9/sys/boot/powerpc/boot1.chrp/ (props changed) stable/9/sys/boot/powerpc/ofw/ (props changed) stable/9/sys/cddl/contrib/opensolaris/ (props changed) stable/9/sys/conf/ (props changed) stable/9/sys/contrib/dev/acpica/ (props changed) stable/9/sys/contrib/octeon-sdk/ (props changed) stable/9/sys/contrib/pf/ (props changed) stable/9/sys/contrib/x86emu/ (props changed) stable/9/sys/dev/ (props changed) stable/9/sys/dev/e1000/ (props changed) stable/9/sys/dev/isp/ (props changed) stable/9/sys/dev/ixgbe/ (props changed) stable/9/sys/dev/puc/ (props changed) stable/9/sys/fs/ (props changed) stable/9/sys/fs/ntfs/ (props changed) stable/9/sys/modules/ (props changed) stable/9/sys/net/ (props changed) stable/9/sys/sys/ (props changed) Modified: stable/9/share/man/man4/Makefile ============================================================================== --- stable/9/share/man/man4/Makefile Fri Jul 5 08:17:48 2013 (r252777) +++ stable/9/share/man/man4/Makefile Fri Jul 5 09:36:09 2013 (r252778) @@ -2,6 +2,7 @@ # $FreeBSD$ MAN= aac.4 \ + aacraid.4 \ acpi.4 \ ${_acpi_asus.4} \ ${_acpi_dock.4} \ Copied and modified: stable/9/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/9/share/man/man4/aacraid.4 Fri Jul 5 09:36:09 2013 (r252778) @@ -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 scottl@FreeBSD.org .Sh BUGS -.Pp The controller is not actually paused on suspend/resume. Modified: stable/9/sys/amd64/conf/GENERIC ============================================================================== --- stable/9/sys/amd64/conf/GENERIC Fri Jul 5 08:17:48 2013 (r252777) +++ stable/9/sys/amd64/conf/GENERIC Fri Jul 5 09:36:09 2013 (r252778) @@ -145,6 +145,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/9/sys/amd64/conf/NOTES ============================================================================== --- stable/9/sys/amd64/conf/NOTES Fri Jul 5 08:17:48 2013 (r252777) +++ stable/9/sys/amd64/conf/NOTES Fri Jul 5 09:36:09 2013 (r252778) @@ -407,6 +407,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/9/sys/conf/files ============================================================================== --- stable/9/sys/conf/files Fri Jul 5 08:17:48 2013 (r252777) +++ stable/9/sys/conf/files Fri Jul 5 09:36:09 2013 (r252778) @@ -440,6 +440,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_asus.c optional acpi_asus acpi dev/acpi_support/acpi_fujitsu.c optional acpi_fujitsu acpi Modified: stable/9/sys/conf/options ============================================================================== --- stable/9/sys/conf/options Fri Jul 5 08:17:48 2013 (r252777) +++ stable/9/sys/conf/options Fri Jul 5 09:36:09 2013 (r252778) @@ -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/9/sys/dev/aacraid/aacraid.c ============================================================================== --- head/sys/dev/aacraid/aacraid.c Fri May 24 09:22:43 2013 (r250963) +++ stable/9/sys/dev/aacraid/aacraid.c Fri Jul 5 09:36:09 2013 (r252778) @@ -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/9/sys/i386/conf/GENERIC ============================================================================== --- stable/9/sys/i386/conf/GENERIC Fri Jul 5 08:17:48 2013 (r252777) +++ stable/9/sys/i386/conf/GENERIC Fri Jul 5 09:36:09 2013 (r252778) @@ -151,6 +151,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/9/sys/i386/conf/NOTES ============================================================================== --- stable/9/sys/i386/conf/NOTES Fri Jul 5 08:17:48 2013 (r252777) +++ stable/9/sys/i386/conf/NOTES Fri Jul 5 09:36:09 2013 (r252778) @@ -719,6 +719,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/9/sys/ia64/conf/GENERIC ============================================================================== --- stable/9/sys/ia64/conf/GENERIC Fri Jul 5 08:17:48 2013 (r252777) +++ stable/9/sys/ia64/conf/GENERIC Fri Jul 5 09:36:09 2013 (r252778) @@ -105,6 +105,7 @@ device ctl # CAM Target Layer # 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/9/sys/modules/Makefile ============================================================================== --- stable/9/sys/modules/Makefile Fri Jul 5 08:17:48 2013 (r252777) +++ stable/9/sys/modules/Makefile Fri Jul 5 09:36:09 2013 (r252778) @@ -9,6 +9,7 @@ SUBDIR= \ ${_3dfx} \ ${_3dfx_linux} \ ${_aac} \ + ${_aacraid} \ accf_data \ accf_dns \ accf_http \ @@ -532,6 +533,7 @@ _zfs= zfs .endif .if ${MACHINE} == "i386" _aac= aac +_aacraid= aacraid _acpi= acpi .if ${MK_CRYPT} != "no" || defined(ALL_MODULES) _aesni= aesni @@ -613,6 +615,7 @@ _snc= snc .if ${MACHINE_CPUARCH} == "amd64" _aac= aac +_aacraid= aacraid _aout= aout _acpi= acpi .if ${MK_CRYPT} != "no" || defined(ALL_MODULES) @@ -736,6 +739,7 @@ _zfs= zfs .if ${MACHINE_CPUARCH} == "ia64" _aac= aac +_aacraid= aacraid _aic= aic _an= an _arcnet= arcnet
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307050936.r659aAZM071318>