svn commit: r265388 - in stable/10: share/man/man4 sys/amd64/conf sys/conf sys/dev/mpr sys/i386/conf sys/ia64/conf sys/mips/conf sys/modules sys/modules/mpr sys/sparc64/conf

Mon May 5 20:35:38 UTC 2014

Author: ken
Date: Mon May  5 20:35:35 2014
New Revision: 265388
URL: http://svnweb.freebsd.org/changeset/base/265388

Log:
  MFC the mpr(4) driver for LSI's 12Gb SAS cards.
  
  This includes r265236, r265237, r265241 and r265261:
  
    ------------------------------------------------------------------------
    r265236 | ken | 2014-05-02 14:25:09 -0600 (Fri, 02 May 2014) | 51 lines
  
    Bring in the mpr(4) driver for LSI's MPT3 12Gb SAS controllers.
  
    This is derived from the mps(4) driver, but it supports only the 12Gb
    IT and IR hardware including the SAS 3004, SAS 3008 and SAS 3108.
  
    Some notes about this driver:
     o The 12Gb hardware can do "FastPath" I/O, and that capability is included in
       this driver.
  
     o WarpDrive functionality has been removed, since it isn't supported in
       the 12Gb driver interface.
  
     o The Scatter/Gather list handling code is significantly different between
       the 6Gb and 12Gb hardware.  The 12Gb boards support IEEE Scatter/Gather
       lists.
  
    Thanks to LSI for developing and testing this driver for FreeBSD.
  
    share/man/man4/mpr.4:
    	mpr(4) man page.
  
    sys/dev/mpr/*:
    	mpr(4) driver files.
  
    sys/modules/Makefile,
    sys/modules/mpr/Makefile:
    	Add a module Makefile for the mpr(4) driver.
  
    sys/conf/files:
    	Add the mpr(4) driver.
  
    sys/amd64/conf/GENERIC,
    sys/i386/conf/GENERIC,
    sys/mips/conf/OCTEON1,
    sys/sparc64/conf/GENERIC:
    	Add the mpr(4) driver to all config files that currently
    	have the mps(4) driver.
  
    sys/ia64/conf/GENERIC:
    	Add the mps(4) and mpr(4) drivers to the ia64 GENERIC
    	config file.
  
    sys/i386/conf/XEN:
    	Exclude the mpr module from building here.
  
    Submitted by:	Steve McConnell <Stephen.McConnell at lsi.com>
    Tested by:	Chris Reeves <chrisr at spectralogic.com>
    Sponsored by:	LSI, Spectra Logic
    Relnotes:	LSI 12Gb SAS driver mpr(4) added
  
    ------------------------------------------------------------------------
    ------------------------------------------------------------------------
    r265237 | ken | 2014-05-02 14:36:20 -0600 (Fri, 02 May 2014) | 8 lines
  
    Add the mpr(4) man page to the man4 Makefile.
  
    This should have been included in r265236.
  
    Submitted by:	Steve McConnell <Stephen.McConnell at lsi.com>
    MFC after:	3 days
    Sponsored by:	LSI, Spectra Logic
  
    ------------------------------------------------------------------------
    ------------------------------------------------------------------------
    r265241 | brueffer | 2014-05-02 15:14:28 -0600 (Fri, 02 May 2014) | 2 lines
  
    Use our standard SYNOPSIS wording; perform some cleanup while here.
  
    ------------------------------------------------------------------------
    ------------------------------------------------------------------------
    r265261 | brueffer | 2014-05-03 05:15:28 -0600 (Sat, 03 May 2014) | 2 lines
  
    Add a missing colon.
  
    ------------------------------------------------------------------------
  
  Submitted by:	Steve McConnell <Stephen.McConnell at lsi.com>
  Tested by:	Chris Reeves <chrisr at spectralogic.com>
  Sponsored by:	LSI, Spectra Logic
  Relnotes:	LSI 12Gb SAS driver mpr(4) added

Added:
  stable/10/share/man/man4/mpr.4
     - copied, changed from r265236, head/share/man/man4/mpr.4
  stable/10/sys/dev/mpr/
     - copied from r265236, head/sys/dev/mpr/
  stable/10/sys/modules/mpr/
     - copied from r265236, head/sys/modules/mpr/
Modified:
  stable/10/share/man/man4/Makefile
  stable/10/sys/amd64/conf/GENERIC
  stable/10/sys/conf/files
  stable/10/sys/i386/conf/GENERIC
  stable/10/sys/i386/conf/XEN
  stable/10/sys/ia64/conf/GENERIC
  stable/10/sys/mips/conf/OCTEON1
  stable/10/sys/modules/Makefile
  stable/10/sys/sparc64/conf/GENERIC
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/share/man/man4/Makefile
==============================================================================

--- stable/10/share/man/man4/Makefile	Mon May  5 20:13:25 2014	(r265387)
+++ stable/10/share/man/man4/Makefile	Mon May  5 20:35:35 2014	(r265388)
@@ -259,6 +259,7 @@ MAN=	aac.4 \
 	mod_cc.4 \
 	mos.4 \
 	mouse.4 \
+	mpr.4 \
 	mps.4 \
 	mpt.4 \
 	msk.4 \

Copied and modified: stable/10/share/man/man4/mpr.4 (from r265236, head/share/man/man4/mpr.4)
==============================================================================
--- head/share/man/man4/mpr.4	Fri May  2 20:25:09 2014	(r265236, copy source)
+++ stable/10/share/man/man4/mpr.4	Mon May  5 20:35:35 2014	(r265388)
@@ -36,7 +36,7 @@
 .\" $Id$
 .\" $FreeBSD$
 .\"
-.Dd Apr 28, 2014
+.Dd May 2, 2014
 .Dt MPR 4
 .Os
 .Sh NAME
@@ -51,7 +51,8 @@ kernel configuration file:
 .Cd "device mpr"
 .Ed
 .Pp
-Or, to load the driver as a module at boot, place the following line in
+Alternatively, to load the driver as a
+module at boot time, place the following line in
 .Xr loader.conf 5 :
 .Bd -literal -offset indent
 mpr_load="YES"
@@ -65,7 +66,7 @@ controllers.
 .Sh HARDWARE
 The following controllers are supported by the
 .Nm
-driver
+driver:
 .Pp
 .Bl -bullet -compact
 .It
@@ -156,7 +157,8 @@ control for all adapters by setting the 
 hw.mpr.exclude_ids=Y
 .Ed
 .Pp
-where Y is the target ID of the device.  If more than one device is to be
+where Y is the target ID of the device.
+If more than one device is to be
 excluded, target ID's are separated by commas.
 .Pp
 Devices can be excluded from
@@ -167,7 +169,8 @@ control for a specific adapter by settin
 dev.mpr.X.exclude_ids=Y
 .Ed
 .Pp
-where X is the adapter number and Y is the target ID of the device.  If more
+where X is the adapter number and Y is the target ID of the device.
+If more
 than one device is to be excluded, target ID's are separated by commas.
 .Sh DEBUGGING
 To enable debugging prints from the
@@ -200,8 +203,8 @@ The following bits have the described ef
 .Xr cd 4 ,
 .Xr ch 4 ,
 .Xr da 4 ,
-.Xr mpt 4 ,
 .Xr mps 4 ,
+.Xr mpt 4 ,
 .Xr pci 4 ,
 .Xr sa 4 ,
 .Xr scsi 4 ,

Modified: stable/10/sys/amd64/conf/GENERIC
==============================================================================
--- stable/10/sys/amd64/conf/GENERIC	Mon May  5 20:13:25 2014	(r265387)
+++ stable/10/sys/amd64/conf/GENERIC	Mon May  5 20:35:35 2014	(r265388)
@@ -111,6 +111,7 @@ device		isp		# Qlogic family
 #device		ispfw		# Firmware for QLogic HBAs- normally a module
 device		mpt		# LSI-Logic MPT-Fusion
 device		mps		# LSI-Logic MPT-Fusion 2
+device		mpr		# LSI-Logic MPT-Fusion 3
 #device		ncr		# NCR/Symbios Logic
 device		sym		# NCR/Symbios Logic (newer chipsets + those of `ncr')
 device		trm		# Tekram DC395U/UW/F DC315U adapters

Modified: stable/10/sys/conf/files
==============================================================================
--- stable/10/sys/conf/files	Mon May  5 20:13:25 2014	(r265387)
+++ stable/10/sys/conf/files	Mon May  5 20:35:35 2014	(r265388)
@@ -1841,6 +1841,17 @@ dev/mmc/mmcbr_if.m		standard
 dev/mmc/mmcbus_if.m		standard
 dev/mmc/mmcsd.c			optional mmcsd
 dev/mn/if_mn.c			optional mn pci
+dev/mpr/mpr.c			optional mpr
+dev/mpr/mpr_config.c		optional mpr
+# XXX Work around clang warning, until maintainer approves fix.
+dev/mpr/mpr_mapping.c		optional mpr \
+	compile-with "${NORMAL_C} ${NO_WSOMETIMES_UNINITIALIZED}"
+dev/mpr/mpr_pci.c		optional mpr pci
+dev/mpr/mpr_sas.c		optional mpr \
+	compile-with "${NORMAL_C} ${NO_WUNNEEDED_INTERNAL_DECL}"
+dev/mpr/mpr_sas_lsi.c		optional mpr
+dev/mpr/mpr_table.c		optional mpr
+dev/mpr/mpr_user.c		optional mpr
 dev/mps/mps.c			optional mps
 dev/mps/mps_config.c		optional mps
 # XXX Work around clang warning, until maintainer approves fix.

Modified: stable/10/sys/i386/conf/GENERIC
==============================================================================
--- stable/10/sys/i386/conf/GENERIC	Mon May  5 20:13:25 2014	(r265387)
+++ stable/10/sys/i386/conf/GENERIC	Mon May  5 20:35:35 2014	(r265388)
@@ -113,6 +113,7 @@ device		isp		# Qlogic family
 #device		ispfw		# Firmware for QLogic HBAs- normally a module
 device		mpt		# LSI-Logic MPT-Fusion
 device		mps		# LSI-Logic MPT-Fusion 2
+device		mpr		# LSI-Logic MPT-Fusion 3
 #device		ncr		# NCR/Symbios Logic
 device		sym		# NCR/Symbios Logic (newer chipsets + those of `ncr')
 device		trm		# Tekram DC395U/UW/F DC315U adapters

Modified: stable/10/sys/i386/conf/XEN
==============================================================================
--- stable/10/sys/i386/conf/XEN	Mon May  5 20:13:25 2014	(r265387)
+++ stable/10/sys/i386/conf/XEN	Mon May  5 20:35:35 2014	(r265388)
@@ -7,7 +7,7 @@ cpu		I686_CPU
 ident		XEN
 
 makeoptions	DEBUG=-gdwarf-2		# Build kernel with gdb(1) debug symbols
-makeoptions	WITHOUT_MODULES="aha ahb amd ctl cxgb dpt drm drm2 hptnr hptmv ida malo mps mwl nve rdma sound sym trm xfs"
+makeoptions	WITHOUT_MODULES="aha ahb amd ctl cxgb dpt drm drm2 hptnr hptmv ida malo mpr mps mwl nve rdma sound sym trm xfs"
 
 options 	SCHED_ULE		# ULE scheduler
 options 	PREEMPTION		# Enable kernel thread preemption

Modified: stable/10/sys/ia64/conf/GENERIC
==============================================================================
--- stable/10/sys/ia64/conf/GENERIC	Mon May  5 20:13:25 2014	(r265387)
+++ stable/10/sys/ia64/conf/GENERIC	Mon May  5 20:35:35 2014	(r265388)
@@ -86,6 +86,8 @@ device		ahd		# AHA39320/29320 and AIC79x
 device		hptiop		# Highpoint RocketRaid 3xxx series
 device		isp		# Qlogic family
 device		mpt		# LSI-Logic MPT-Fusion
+device		mps		# LSI-Logic MPT-Fusion 2
+device		mpr		# LSI-Logic MPT-Fusion 3
 device		sym		# NCR/Symbios Logic
 
 # RAID controllers interfaced to the SCSI subsystem

Modified: stable/10/sys/mips/conf/OCTEON1
==============================================================================
--- stable/10/sys/mips/conf/OCTEON1	Mon May  5 20:13:25 2014	(r265387)
+++ stable/10/sys/mips/conf/OCTEON1	Mon May  5 20:35:35 2014	(r265388)
@@ -129,6 +129,7 @@ device		isp		# Qlogic family
 #device		ispfw		# Firmware for QLogic HBAs- normally a module
 device		mpt		# LSI-Logic MPT-Fusion
 device		mps		# LSI-Logic MPT-Fusion 2
+device		mpr		# LSI-Logic MPT-Fusion 3
 #device		ncr		# NCR/Symbios Logic
 device		trm		# Tekram DC395U/UW/F DC315U adapters
 

Modified: stable/10/sys/modules/Makefile
==============================================================================
--- stable/10/sys/modules/Makefile	Mon May  5 20:13:25 2014	(r265387)
+++ stable/10/sys/modules/Makefile	Mon May  5 20:35:35 2014	(r265388)
@@ -216,6 +216,7 @@ SUBDIR=	\
 	${_mly} \
 	mmc \
 	mmcsd \
+	mpr \
 	mps \
 	mpt \
 	mqueue \

Modified: stable/10/sys/sparc64/conf/GENERIC
==============================================================================
--- stable/10/sys/sparc64/conf/GENERIC	Mon May  5 20:13:25 2014	(r265387)
+++ stable/10/sys/sparc64/conf/GENERIC	Mon May  5 20:35:35 2014	(r265388)
@@ -101,6 +101,7 @@ device		isp		# Qlogic family
 device		ispfw		# Firmware module for Qlogic host adapters
 device		mpt		# LSI-Logic MPT-Fusion
 device		mps		# LSI-Logic MPT-Fusion 2
+device		mpr		# LSI-Logic MPT-Fusion 3
 device		sym		# NCR/Symbios/LSI Logic 53C8XX/53C1010/53C1510D
 
 # ATA/SCSI peripherals
