Author: benno
Date: Fri Jul 17 23:30:43 2015
New Revision: 285662
URL: https://svnweb.freebsd.org/changeset/base/285662

Log:
  Merge driver for PMC Sierra's range of SAS/SATA HBAs.
  
  Submitted by: Achim Leubner <achim.leub...@pmcs.com>
  Reviewed by:  scottl

Added:
  head/sys/dev/pms/
     - copied from r285661, projects/pms/sys/dev/pms/
  head/sys/modules/pms/
     - copied from r285661, projects/pms/sys/modules/pms/
Modified:
  head/sys/amd64/conf/GENERIC
  head/sys/amd64/conf/NOTES
  head/sys/conf/files
  head/sys/i386/conf/GENERIC
  head/sys/i386/conf/NOTES
  head/sys/modules/Makefile
Directory Properties:
  head/   (props changed)

Modified: head/sys/amd64/conf/GENERIC
==============================================================================
--- head/sys/amd64/conf/GENERIC Fri Jul 17 22:26:45 2015        (r285661)
+++ head/sys/amd64/conf/GENERIC Fri Jul 17 23:30:43 2015        (r285662)
@@ -170,6 +170,7 @@ device              ida                     # Compaq Smart 
RAID
 device         mfi                     # LSI MegaRAID SAS
 device         mlx                     # Mylex DAC960 family
 device         mrsas                   # LSI/Avago MegaRAID SAS/SATA, 6Gb/s 
and 12Gb/s
+device         pmspcv                  # PMC-Sierra SAS/SATA Controller driver
 #XXX pointer/int warnings
 #device                pst                     # Promise Supertrak SX6000
 device         twe                     # 3ware ATA RAID

Modified: head/sys/amd64/conf/NOTES
==============================================================================
--- head/sys/amd64/conf/NOTES   Fri Jul 17 22:26:45 2015        (r285661)
+++ head/sys/amd64/conf/NOTES   Fri Jul 17 23:30:43 2015        (r285662)
@@ -486,6 +486,10 @@ device         nvme    # base NVMe drive
 device         nvd     # expose NVMe namespaces as disks, depends on nvme
 
 #
+# PMC-Sierra SAS/SATA controller
+device         pmspcv
+
+#
 # SafeNet crypto driver: can be moved to the MI NOTES as soon as
 # it's tested on a big-endian machine
 #

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files Fri Jul 17 22:26:45 2015        (r285661)
+++ head/sys/conf/files Fri Jul 17 23:30:43 2015        (r285662)
@@ -2069,6 +2069,102 @@ dev/pdq/if_fea.c                optional fea eisa
 dev/pdq/if_fpa.c               optional fpa pci
 dev/pdq/pdq.c                  optional nowerror fea eisa | fpa pci
 dev/pdq/pdq_ifsubr.c           optional nowerror fea eisa | fpa pci
+dev/pms/freebsd/driver/ini/src/agtiapi.c               optional pmspcv \
+       compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
+dev/pms/RefTisa/sallsdk/spc/sadisc.c                   optional pmspcv \
+       compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
+dev/pms/RefTisa/sallsdk/spc/mpi.c                      optional pmspcv \
+       compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
+dev/pms/RefTisa/sallsdk/spc/saframe.c                  optional pmspcv \
+       compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
+dev/pms/RefTisa/sallsdk/spc/sahw.c                     optional pmspcv \
+       compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
+dev/pms/RefTisa/sallsdk/spc/sainit.c                   optional pmspcv \
+       compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
+dev/pms/RefTisa/sallsdk/spc/saint.c                    optional pmspcv \
+       compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
+dev/pms/RefTisa/sallsdk/spc/sampicmd.c                 optional pmspcv \
+       compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
+dev/pms/RefTisa/sallsdk/spc/sampirsp.c                 optional pmspcv \
+       compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
+dev/pms/RefTisa/sallsdk/spc/saphy.c                    optional pmspcv \
+       compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
+dev/pms/RefTisa/sallsdk/spc/saport.c                   optional pmspcv \
+       compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
+dev/pms/RefTisa/sallsdk/spc/sasata.c                   optional pmspcv \
+       compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
+dev/pms/RefTisa/sallsdk/spc/sasmp.c                    optional pmspcv \
+       compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
+dev/pms/RefTisa/sallsdk/spc/sassp.c                    optional pmspcv \
+       compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
+dev/pms/RefTisa/sallsdk/spc/satimer.c                  optional pmspcv \
+       compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
+dev/pms/RefTisa/sallsdk/spc/sautil.c                   optional pmspcv \
+       compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
+dev/pms/RefTisa/sallsdk/spc/saioctlcmd.c               optional pmspcv \
+       compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
+dev/pms/RefTisa/sallsdk/spc/mpidebug.c                 optional pmspcv \
+       compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
+dev/pms/RefTisa/discovery/dm/dminit.c                  optional pmspcv \
+       compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
+dev/pms/RefTisa/discovery/dm/dmsmp.c                   optional pmspcv \
+       compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
+dev/pms/RefTisa/discovery/dm/dmdisc.c                  optional pmspcv \
+       compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
+dev/pms/RefTisa/discovery/dm/dmport.c                  optional pmspcv \
+       compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
+dev/pms/RefTisa/discovery/dm/dmtimer.c                 optional pmspcv \
+       compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
+dev/pms/RefTisa/discovery/dm/dmmisc.c                  optional pmspcv \
+       compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
+dev/pms/RefTisa/sat/src/sminit.c                       optional pmspcv \
+       compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
+dev/pms/RefTisa/sat/src/smmisc.c                       optional pmspcv \
+       compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
+dev/pms/RefTisa/sat/src/smsat.c                                optional pmspcv 
\
+       compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
+dev/pms/RefTisa/sat/src/smsatcb.c                      optional pmspcv \
+       compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
+dev/pms/RefTisa/sat/src/smsathw.c                      optional pmspcv \
+       compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
+dev/pms/RefTisa/sat/src/smtimer.c                      optional pmspcv \
+       compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
+dev/pms/RefTisa/tisa/sassata/common/tdinit.c           optional pmspcv \
+       compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
+dev/pms/RefTisa/tisa/sassata/common/tdmisc.c           optional pmspcv \
+       compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
+dev/pms/RefTisa/tisa/sassata/common/tdesgl.c           optional pmspcv \
+       compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
+dev/pms/RefTisa/tisa/sassata/common/tdport.c           optional pmspcv \
+       compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
+dev/pms/RefTisa/tisa/sassata/common/tdint.c            optional pmspcv \
+       compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
+dev/pms/RefTisa/tisa/sassata/common/tdioctl.c          optional pmspcv \
+       compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
+dev/pms/RefTisa/tisa/sassata/common/tdhw.c             optional pmspcv \
+       compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
+dev/pms/RefTisa/tisa/sassata/common/ossacmnapi.c       optional pmspcv \
+       compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
+dev/pms/RefTisa/tisa/sassata/common/tddmcmnapi.c       optional pmspcv \
+       compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
+dev/pms/RefTisa/tisa/sassata/common/tdsmcmnapi.c       optional pmspcv \
+       compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
+dev/pms/RefTisa/tisa/sassata/common/tdtimers.c         optional pmspcv \
+       compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
+dev/pms/RefTisa/tisa/sassata/sas/ini/itdio.c           optional pmspcv \
+       compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
+dev/pms/RefTisa/tisa/sassata/sas/ini/itdcb.c           optional pmspcv \
+       compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
+dev/pms/RefTisa/tisa/sassata/sas/ini/itdinit.c         optional pmspcv \
+       compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
+dev/pms/RefTisa/tisa/sassata/sas/ini/itddisc.c         optional pmspcv \
+       compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
+dev/pms/RefTisa/tisa/sassata/sata/host/sat.c           optional pmspcv \
+       compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
+dev/pms/RefTisa/tisa/sassata/sata/host/ossasat.c       optional pmspcv \
+       compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
+dev/pms/RefTisa/tisa/sassata/sata/host/sathw.c         optional pmspcv \
+       compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/ppbus/if_plip.c            optional plip
 dev/ppbus/immio.c              optional vpo
 dev/ppbus/lpbb.c               optional lpbb

Modified: head/sys/i386/conf/GENERIC
==============================================================================
--- head/sys/i386/conf/GENERIC  Fri Jul 17 22:26:45 2015        (r285661)
+++ head/sys/i386/conf/GENERIC  Fri Jul 17 23:30:43 2015        (r285662)
@@ -175,6 +175,7 @@ device              ida                     # Compaq Smart 
RAID
 device         mfi                     # LSI MegaRAID SAS
 device         mlx                     # Mylex DAC960 family
 device         mrsas                   # LSI/Avago MegaRAID SAS/SATA, 6Gb/s 
and 12Gb/s
+device         pmspcv                  # PMC-Sierra SAS/SATA Controller driver
 device         pst                     # Promise Supertrak SX6000
 device         twe                     # 3ware ATA RAID
 

Modified: head/sys/i386/conf/NOTES
==============================================================================
--- head/sys/i386/conf/NOTES    Fri Jul 17 22:26:45 2015        (r285661)
+++ head/sys/i386/conf/NOTES    Fri Jul 17 23:30:43 2015        (r285662)
@@ -791,6 +791,9 @@ device         nvme    # base NVMe drive
 device         nvd     # expose NVMe namespaces as disks, depends on nvme
 
 #
+# PMC-Sierra SAS/SATA controller
+device         pmspcv
+#
 # SafeNet crypto driver: can be moved to the MI NOTES as soon as
 # it's tested on a big-endian machine
 #

Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile   Fri Jul 17 22:26:45 2015        (r285661)
+++ head/sys/modules/Makefile   Fri Jul 17 23:30:43 2015        (r285662)
@@ -276,6 +276,7 @@ SUBDIR=     \
        ${_pfsync} \
        plip \
        ${_pmc} \
+       ${_pms} \
        ppbus \
        ppc \
        ppi \
@@ -620,6 +621,7 @@ _ixlv=              ixlv
 _linux64=      linux64
 _linux_common= linux_common
 _ntb=          ntb
+_pms=          pms
 _qlxge=                qlxge
 _qlxgb=                qlxgb
 _qlxgbe=       qlxgbe
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to