Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

4dfddf50 · Linus Torvalds <[email protected]> · 2016-10-07 09:28:53 -07:00

Pull SCSI updates from James Bottomley:
 "This update includes the usual round of major driver updates (hpsa,
  be2iscsi, hisi_sas, zfcp, cxlflash). There's a new incarnation of hpsa
  called smartpqi for which a driver is added, there's some cleanup work
  of the ibm vscsi target and updates to libfc, plus a whole host of
  minor fixes and updates and finally the removal of several ISA drivers
  which seem not to have been used for years"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (173 commits)
  scsi: mvsas: Mark symbols static where possible
  scsi: pm8001: Mark symbols static where possible
  scsi: arcmsr: Simplify user_len checking
  scsi: fcoe: fix off by one in eth2fc_speed()
  scsi: dtc: remove from tree
  scsi: t128: remove from tree
  scsi: pas16: remove from tree
  scsi: u14-34f: remove from tree
  scsi: ultrastor: remove from tree
  scsi: in2000: remove from tree
  scsi: wd7000: remove from tree
  scsi: scsi_dh_alua: Fix memory leak in alua_rtpg()
  scsi: lpfc: Mark symbols static where possible
  scsi: hpsa: correct call to hpsa_do_reset
  scsi: ufs: Get a TM service response from the correct offset
  scsi: ibmvfc: Fix I/O hang when port is not mapped
  scsi: megaraid_sas: clean function declarations in megaraid_sas_base.c up
  scsi: ipr: Remove redundant messages at adapter init time
  scsi: ipr: Don't log unnecessary 9084 error details
  scsi: smartpqi: raid bypass lba calculation fix
  ...

Commit: 4dfddf503670d8def0fddb497e628130fc4522a8
Parents: d4e65476 · 14bf41dc

Merge commit. Changes below are compared with the first parent: d4e65476.

Changes

117 files changed · +12923 −13623

File	Status	Add	Del	Content
Documentation/powerpc/cxlflash.txt	modified	+39	−5	View file
Documentation/scsi/00-INDEX	modified	+0	−2	View file
Documentation/scsi/dtc3x80.txt	deleted	+0	−43	View before deletion
Documentation/scsi/in2000.txt	deleted	+0	−202	View before deletion
Documentation/scsi/scsi-parameters.txt	modified	+0	−18	View file
Documentation/scsi/smartpqi.txt	added	+80	−0	View file
MAINTAINERS	modified	+17	−21	View file
drivers/message/fusion/mptbase.c	modified	+4	−3	View file
drivers/message/fusion/mptfc.c	modified	+5	−2	View file
drivers/s390/scsi/zfcp_dbf.c	modified	+144	−18	View file
drivers/s390/scsi/zfcp_dbf.h	modified	+11	−3	View file
drivers/s390/scsi/zfcp_erp.c	modified	+9	−3	View file
drivers/s390/scsi/zfcp_ext.h	modified	+5	−3	View file
drivers/s390/scsi/zfcp_fsf.c	modified	+17	−5	View file
drivers/s390/scsi/zfcp_fsf.h	modified	+3	−1	View file
drivers/s390/scsi/zfcp_scsi.c	modified	+7	−1	View file
drivers/scsi/Kconfig	modified	+1	−135	View file
drivers/scsi/Makefile	modified	+1	−7	View file
drivers/scsi/NCR5380.c	modified	+4	−11	View file
drivers/scsi/NCR5380.h	modified	+9	−1	View file
drivers/scsi/aacraid/src.c	modified	+1	−1	View file
drivers/scsi/aic94xx/aic94xx_hwi.c	modified	+1	−1	View file
drivers/scsi/arcmsr/arcmsr_hba.c	modified	+10	−2	View file
drivers/scsi/be2iscsi/be.h	modified	+9	−6	View file
drivers/scsi/be2iscsi/be_cmds.c	modified	+756	−340	View file
drivers/scsi/be2iscsi/be_cmds.h	modified	+107	−35	View file
drivers/scsi/be2iscsi/be_iscsi.c	modified	+191	−217	View file
drivers/scsi/be2iscsi/be_iscsi.h	modified	+10	−15	View file
drivers/scsi/be2iscsi/be_main.c	modified	+1268	−1212	View file
drivers/scsi/be2iscsi/be_main.h	modified	+119	−101	View file
drivers/scsi/be2iscsi/be_mgmt.c	modified	+567	−930	View file
drivers/scsi/be2iscsi/be_mgmt.h	modified	+20	−31	View file
drivers/scsi/bfa/bfa_fcs_lport.c	modified	+2	−2	View file
drivers/scsi/bnx2fc/bnx2fc_els.c	modified	+2	−2	View file
drivers/scsi/bnx2fc/bnx2fc_fcoe.c	modified	+6	−6	View file
drivers/scsi/bnx2fc/bnx2fc_hwi.c	modified	+1	−1	View file
drivers/scsi/bnx2fc/bnx2fc_io.c	modified	+1	−1	View file
drivers/scsi/csiostor/csio_scsi.c	modified	+2	−3	View file
drivers/scsi/cxlflash/main.c	modified	+35	−46	View file
drivers/scsi/cxlflash/superpipe.c	modified	+78	−102	View file
drivers/scsi/cxlflash/superpipe.h	modified	+2	−1	View file
drivers/scsi/cxlflash/vlun.c	modified	+2	−11	View file
drivers/scsi/device_handler/scsi_dh_alua.c	modified	+1	−0	View file
drivers/scsi/dtc.c	deleted	+0	−447	View before deletion
drivers/scsi/dtc.h	deleted	+0	−42	View before deletion
drivers/scsi/esas2r/esas2r_init.c	modified	+0	−4	View file
drivers/scsi/esas2r/esas2r_main.c	modified	+1	−1	View file
drivers/scsi/fcoe/fcoe_transport.c	modified	+36	−17	View file
drivers/scsi/hisi_sas/hisi_sas.h	modified	+17	−1	View file
drivers/scsi/hisi_sas/hisi_sas_main.c	modified	+202	−36	View file
drivers/scsi/hisi_sas/hisi_sas_v1_hw.c	modified	+13	−23	View file
drivers/scsi/hisi_sas/hisi_sas_v2_hw.c	modified	+94	−36	View file
drivers/scsi/hosts.c	modified	+8	−4	View file
drivers/scsi/hpsa.c	modified	+112	−27	View file
drivers/scsi/hpsa.h	modified	+0	−1	View file
drivers/scsi/hpsa_cmd.h	modified	+1	−0	View file
drivers/scsi/ibmvscsi/ibmvfc.c	modified	+11	−1	View file
drivers/scsi/ibmvscsi/ibmvfc.h	modified	+1	−0	View file
drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c	modified	+7	−30	View file
drivers/scsi/in2000.c	deleted	+0	−2302	View before deletion
drivers/scsi/in2000.h	deleted	+0	−412	View before deletion
drivers/scsi/ipr.c	modified	+118	−16	View file
drivers/scsi/ipr.h	modified	+6	−2	View file
drivers/scsi/libfc/fc_exch.c	modified	+0	−1	View file
drivers/scsi/libfc/fc_rport.c	modified	+23	−3	View file
drivers/scsi/lpfc/lpfc_ct.c	modified	+41	−41	View file
drivers/scsi/lpfc/lpfc_els.c	modified	+17	−17	View file
drivers/scsi/lpfc/lpfc_mbox.c	modified	+2	−2	View file
drivers/scsi/lpfc/lpfc_sli.c	modified	+2	−2	View file
drivers/scsi/megaraid/megaraid_sas_base.c	modified	+5	−23	View file
drivers/scsi/megaraid/megaraid_sas_fusion.h	modified	+9	−0	View file
drivers/scsi/mpt3sas/mpt3sas_base.c	modified	+107	−152	View file
drivers/scsi/mpt3sas/mpt3sas_base.h	modified	+7	−17	View file
drivers/scsi/mpt3sas/mpt3sas_config.c	modified	+2	−5	View file
drivers/scsi/mpt3sas/mpt3sas_ctl.c	modified	+19	−30	View file
drivers/scsi/mpt3sas/mpt3sas_scsih.c	modified	+79	−90	View file
drivers/scsi/mpt3sas/mpt3sas_transport.c	modified	+8	−20	View file
drivers/scsi/mvsas/mv_64xx.c	modified	+10	−9	View file
drivers/scsi/mvsas/mv_94xx.c	modified	+21	−20	View file
drivers/scsi/mvsas/mv_sas.c	modified	+8	−8	View file
drivers/scsi/pas16.c	deleted	+0	−565	View before deletion
drivers/scsi/pas16.h	deleted	+0	−121	View before deletion
drivers/scsi/pm8001/pm8001_hwi.c	modified	+2	−2	View file
drivers/scsi/pm8001/pm8001_sas.c	modified	+1	−1	View file
drivers/scsi/pmcraid.c	modified	+4	−4	View file
drivers/scsi/qla2xxx/qla_def.h	modified	+0	−10	View file
drivers/scsi/qla2xxx/qla_isr.c	modified	+1	−1	View file
drivers/scsi/qla2xxx/qla_os.c	modified	+9	−9	View file
drivers/scsi/qla4xxx/ql4_nx.c	modified	+1	−1	View file
drivers/scsi/scsi_debug.c	modified	+27	−27	View file
drivers/scsi/scsi_priv.h	modified	+2	−0	View file
drivers/scsi/scsi_scan.c	modified	+0	−2	View file
drivers/scsi/sd.c	modified	+6	−5	View file
drivers/scsi/sd.h	modified	+0	−30	View file
drivers/scsi/sd_dif.c	modified	+5	−5	View file
drivers/scsi/sg.c	modified	+5	−15	View file
drivers/scsi/smartpqi/Kconfig	added	+54	−0	View file
drivers/scsi/smartpqi/Makefile	added	+3	−0	View file
drivers/scsi/smartpqi/smartpqi.h	added	+1136	−0	View file
drivers/scsi/smartpqi/smartpqi_init.c	added	+6303	−0	View file
drivers/scsi/smartpqi/smartpqi_sas_transport.c	added	+350	−0	View file
drivers/scsi/smartpqi/smartpqi_sis.c	added	+404	−0	View file
drivers/scsi/smartpqi/smartpqi_sis.h	added	+34	−0	View file
drivers/scsi/sr.c	modified	+1	−1	View file
drivers/scsi/sym53c8xx_2/sym_glue.c	modified	+1	−1	View file
drivers/scsi/t128.c	deleted	+0	−407	View before deletion
drivers/scsi/t128.h	deleted	+0	−97	View before deletion
drivers/scsi/u14-34f.c	deleted	+0	−1971	View before deletion
drivers/scsi/ufs/tc-dwc-g210.c	modified	+1	−0	View file
drivers/scsi/ufs/ufs.h	modified	+1	−0	View file
drivers/scsi/ufs/ufshcd.c	modified	+3	−3	View file
drivers/scsi/ultrastor.c	deleted	+0	−1210	View before deletion
drivers/scsi/ultrastor.h	deleted	+0	−80	View before deletion
drivers/scsi/virtio_scsi.c	modified	+1	−1	View file
drivers/scsi/wd7000.c	deleted	+0	−1657	View before deletion
include/linux/t10-pi.h	modified	+20	−0	View file
include/uapi/scsi/cxlflash_ioctl.h	modified	+14	−5	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/powerpc/cxlflash.txt

View file

diff --git a/Documentation/powerpc/cxlflash.txt b/Documentation/powerpc/cxlflash.txt
index 4202d1b..6d9a2ed 100644
--- a/Documentation/powerpc/cxlflash.txt
+++ b/Documentation/powerpc/cxlflash.txt
@@ -121,7 +121,7 @@ Block library API
     below.
 
     The block library can be found on GitHub:
-    http://www.github.com/mikehollinger/ibmcapikv
+    http://github.com/open-power/capiflash
 
 
 CXL Flash Driver IOCTLs
@@ -171,11 +171,30 @@ DK_CXLFLASH_ATTACH
           destroyed, the tokens are to be considered stale and subsequent
           usage will result in errors.
 
+	- A valid adapter file descriptor (fd2 >= 0) is only returned on
+	  the initial attach for a context. Subsequent attaches to an
+	  existing context (DK_CXLFLASH_ATTACH_REUSE_CONTEXT flag present)
+	  do not provide the adapter file descriptor as it was previously
+	  made known to the application.
+
         - When a context is no longer needed, the user shall detach from
-          the context via the DK_CXLFLASH_DETACH ioctl.
+          the context via the DK_CXLFLASH_DETACH ioctl. When this ioctl
+	  returns with a valid adapter file descriptor and the return flag
+	  DK_CXLFLASH_APP_CLOSE_ADAP_FD is present, the application _must_
+	  close the adapter file descriptor following a successful detach.
+
+	- When this ioctl returns with a valid fd2 and the return flag
+	  DK_CXLFLASH_APP_CLOSE_ADAP_FD is present, the application _must_
+	  close fd2 in the following circumstances:
+
+		+ Following a successful detach of the last user of the context
+		+ Following a successful recovery on the context's original fd2
+		+ In the child process of a fork(), following a clone ioctl,
+		  on the fd2 associated with the source context
 
-        - A close on fd2 will invalidate the tokens. This operation is not
-          required by the user.
+        - At any time, a close on fd2 will invalidate the tokens. Applications
+	  should exercise caution to only close fd2 when appropriate (outlined
+	  in the previous bullet) to avoid premature loss of I/O.
 
 DK_CXLFLASH_USER_DIRECT
 -----------------------
@@ -254,6 +273,10 @@ DK_CXLFLASH_DETACH
     success, all "tokens" which had been provided to the user from the
     DK_CXLFLASH_ATTACH onward are no longer valid.
 
+    When the DK_CXLFLASH_APP_CLOSE_ADAP_FD flag was returned on a successful
+    attach, the application _must_ close the fd2 associated with the context
+    following the detach of the final user of the context.
+
 DK_CXLFLASH_VLUN_CLONE
 ----------------------
     This ioctl is responsible for cloning a previously created
@@ -261,7 +284,7 @@ DK_CXLFLASH_VLUN_CLONE
     support maintaining user space access to storage after a process
     forks. Upon success, the child process (which invoked the ioctl)
     will have access to the same LUNs via the same resource handle(s)
-    and fd2 as the parent, but under a different context.
+    as the parent, but under a different context.
 
     Context sharing across processes is not supported with CXL and
     therefore each fork must be met with establishing a new context
@@ -275,6 +298,12 @@ DK_CXLFLASH_VLUN_CLONE
     translation tables are copied from the parent context to the child's
     and then synced with the AFU.
 
+    When the DK_CXLFLASH_APP_CLOSE_ADAP_FD flag was returned on a successful
+    attach, the application _must_ close the fd2 associated with the source
+    context (still resident/accessible in the parent process) following the
+    clone. This is to avoid a stale entry in the file descriptor table of the
+    child process.
+
 DK_CXLFLASH_VERIFY
 ------------------
     This ioctl is used to detect various changes such as the capacity of
@@ -309,6 +338,11 @@ DK_CXLFLASH_RECOVER_AFU
     at which time the context/resources they held will be freed as part of
     the release fop.
 
+    When the DK_CXLFLASH_APP_CLOSE_ADAP_FD flag was returned on a successful
+    attach, the application _must_ unmap and close the fd2 associated with the
+    original context following this ioctl returning success and indicating that
+    the context was recovered (DK_CXLFLASH_RECOVER_AFU_CONTEXT_RESET).
+
 DK_CXLFLASH_MANAGE_LUN
 ----------------------
     This ioctl is used to switch a LUN from a mode where it is available

Documentation/scsi/00-INDEX

View file

diff --git a/Documentation/scsi/00-INDEX b/Documentation/scsi/00-INDEX
index c4b978a..bb4a76f 100644
--- a/Documentation/scsi/00-INDEX
+++ b/Documentation/scsi/00-INDEX
@@ -64,8 +64,6 @@ hpsa.txt
 	- HP Smart Array Controller SCSI driver.
 hptiop.txt
 	- HIGHPOINT ROCKETRAID 3xxx RAID DRIVER
-in2000.txt
-	- info on in2000 driver
 libsas.txt
 	- Serial Attached SCSI management layer.
 link_power_management_policy.txt

Documentation/scsi/dtc3x80.txt

View before deletion

diff --git a/Documentation/scsi/dtc3x80.txt b/Documentation/scsi/dtc3x80.txt
deleted file mode 100644
index 1d7af9f..0000000
--- a/Documentation/scsi/dtc3x80.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-README file for the Linux DTC3180/3280 scsi driver.
-by Ray Van Tassle ([email protected])  March 1996
-Based on the generic & core NCR5380 code by Drew Eckhard
-
-SCSI device driver for the DTC 3180/3280.
-Data Technology Corp---a division of Qume.
-
-The 3280 has a standard floppy interface.
-
-The 3180 does not.  Otherwise, they are identical.
-
-The DTC3x80 does not support DMA but it does have Pseudo-DMA which is
-supported by the driver.
-
-Its DTC406 scsi chip is supposedly compatible with the NCR 53C400.
-It is memory mapped, uses an IRQ, but no dma or io-port.  There is
-internal DMA, between SCSI bus and an on-chip 128-byte buffer.  Double
-buffering is done automagically by the chip.  Data is transferred
-between the on-chip buffer and CPU/RAM via memory moves.
-
-The driver detects the possible memory addresses (jumper selectable):
-	CC00, DC00, C800, and D800
-The possible IRQ's (jumper selectable) are:
-	IRQ 10, 11, 12, 15
-Parity is supported by the chip, but not by this driver.
-Information can be obtained from /proc/scsi/dtc3c80/N.
-
-Note on interrupts:
-
-The documentation says that it can be set to interrupt whenever the
-on-chip buffer needs CPU attention.  I couldn't get this to work.  So
-the driver polls for data-ready in the pseudo-DMA transfer routine.
-The interrupt support routines in the NCR3280.c core modules handle
-scsi disconnect/reconnect, and this (mostly) works.  However.....  I
-have tested it with 4 totally different hard drives (both SCSI-1 and
-SCSI-2), and one CDROM drive.  Interrupts works great for all but one
-specific hard drive.  For this one, the driver will eventually hang in
-the transfer state.  I have tested with: "dd bs=4k count=2k
-of=/dev/null if=/dev/sdb".  It reads ok for a while, then hangs.
-After beating my head against this for a couple of weeks, getting
-nowhere, I give up.  So.....This driver does NOT use interrupts, even
-if you have the card jumpered to an IRQ.  Probably nobody will ever
-care.

Documentation/scsi/in2000.txt

View before deletion

diff --git a/Documentation/scsi/in2000.txt b/Documentation/scsi/in2000.txt
deleted file mode 100644
index c3e2a90..0000000
--- a/Documentation/scsi/in2000.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-UPDATE NEWS: version 1.33 - 26 Aug 98
-
-   Interrupt management in this driver has become, over
-   time, increasingly odd and difficult to explain - this
-   has been mostly due to my own mental inadequacies. In
-   recent kernels, it has failed to function at all when
-   compiled for SMP. I've fixed that problem, and after
-   taking a fresh look at interrupts in general, greatly
-   reduced the number of places where they're fiddled
-   with. Done some heavy testing and it looks very good.
-   The driver now makes use of the __initfunc() and
-   __initdata macros to save about 4k of kernel memory.
-   Once again, the same code works for both 2.0.xx and
-   2.1.xx kernels.
-
-UPDATE NEWS: version 1.32 - 28 Mar 98
-
-   Removed the check for legal IN2000 hardware versions:
-   It appears that the driver works fine with serial
-   EPROMs (the 8-pin chip that defines hardware rev) as
-   old as 2.1, so we'll assume that all cards are OK.
-
-UPDATE NEWS: version 1.31 - 6 Jul 97
-
-   Fixed a bug that caused incorrect SCSI status bytes to be
-   returned from commands sent to LUNs greater than 0. This
-   means that CDROM changers work now! Fixed a bug in the
-   handling of command-line arguments when loaded as a module.
-   Also put all the header data in in2000.h where it belongs.
-   There are no longer any differences between this driver in
-   the 2.1.xx source tree and the 2.0.xx tree, as of 2.0.31
-   and 2.1.45 (or is it .46?) - this makes things much easier
-   for me...
-
-UPDATE NEWS: version 1.30 - 14 Oct 96
-
-   Fixed a bug in the code that sets the transfer direction
-   bit (DESTID_DPD in the WD_DESTINATION_ID register). There
-   are quite a few SCSI commands that do a write-to-device;
-   now we deal with all of them correctly. Thanks to Joerg
-   Dorchain for catching this one.
-
-UPDATE NEWS: version 1.29 - 24 Sep 96
-
-   The memory-mapped hardware on the card is now accessed via
-   the 'readb()' and 'readl()' macros - required by the new
-   memory management scheme in the 2.1.x kernel series.
-   As suggested by Andries Brouwer, 'bios_param()' no longer
-   forces an artificial 1023 track limit on drives. Also
-   removed some kludge-code left over from struggles with
-   older (buggy) compilers.
-
-UPDATE NEWS: version 1.28 - 07 May 96
-
-   Tightened up the "interrupts enabled/disabled" discipline
-   in 'in2000_queuecommand()' and maybe 1 or 2 other places.
-   I _think_ it may have been a little too lax, causing an
-   occasional crash during full moon. A fully functional
-   /proc interface is now in place - if you want to play
-   with it, start by doing 'cat /proc/scsi/in2000/0'. You
-   can also use it to change a few run-time parameters on
-   the fly, but it's mostly for debugging. The curious
-   should take a good look at 'in2000_proc_info()' in the
-   in2000.c file to get an understanding of what it's all
-   about; I figure that people who are really into it will
-   want to add features suited to their own needs...
-   Also, sync is now DISABLED by default.
-
-UPDATE NEWS: version 1.27 - 10 Apr 96
-
-   Fixed a well-hidden bug in the adaptive-disconnect code
-   that would show up every now and then during extreme
-   heavy loads involving 2 or more simultaneously active
-   devices. Thanks to Joe Mack for keeping my nose to the
-   grindstone on this one.
-
-UPDATE NEWS: version 1.26 - 07 Mar 96
-
-   1.25 had a nasty bug that bit people with swap partitions
-   and tape drives. Also, in my attempt to guess my way
-   through Intel assembly language, I made an error in the
-   inline code for IO writes. Made a few other changes and
-   repairs - this version (fingers crossed) should work well.
-
-UPDATE NEWS: version 1.25 - 05 Mar 96
-
-   Kernel 1.3.70 interrupt mods added; old kernels still OK.
-   Big help from Bill Earnest and David Willmore on speed
-   testing and optimizing: I think there's a real improvement
-   in this area.
-   New! User-friendly command-line interface for LILO and
-   module loading - the old method is gone, so you'll need
-   to read the comments for 'setup_strings' near the top
-   of in2000.c. For people with CDROM's or other devices
-   that have a tough time with sync negotiation, you can
-   now selectively disable sync on individual devices -
-   search for the 'nosync' keyword in the command-line
-   comments. Some of you disable the BIOS on the card, which
-   caused the auto-detect function to fail; there is now a
-   command-line option to force detection of a ROM-less card.
-
-UPDATE NEWS: version 1.24a - 24 Feb 96
-
-   There was a bug in the synchronous transfer code. Only
-   a few people downloaded before I caught it - could have
-   been worse.
-
-UPDATE NEWS: version 1.24 - 23 Feb 96
-
-   Lots of good changes. Advice from Bill Earnest resulted
-   in much better detection of cards, more efficient usage
-   of the fifo, and (hopefully) faster data transfers. The
-   jury is still out on speed - I hope it's improved some.
-   One nifty new feature is a cool way of doing disconnect/
-   reselect. The driver defaults to what I'm calling
-   'adaptive disconnect' - meaning that each command is
-   evaluated individually as to whether or not it should be
-   run with the option to disconnect/reselect (if the device
-   chooses), or as a "SCSI-bus-hog". When several devices
-   are operating simultaneously, disconnects are usually an
-   advantage. In a single device system, or if only 1 device
-   is being accessed, transfers usually go faster if disconnects
-   are not allowed.
-
-
-
-The default arguments (you get these when you don't give an 'in2000'
-command-line argument, or you give a blank argument) will cause
-the driver to do adaptive disconnect, synchronous transfers, and a
-minimum of debug messages. If you want to fool with the options,
-search for 'setup_strings' near the top of the in2000.c file and
-check the 'hostdata->args' section in in2000.h - but be warned! Not
-everything is working yet (some things will never work, probably).
-I believe that disabling disconnects (DIS_NEVER) will allow you
-to choose a LEVEL2 value higher than 'L2_BASIC', but I haven't
-spent a lot of time testing this. You might try 'ENABLE_CLUSTERING'
-to see what happens: my tests showed little difference either way.
-There's also a define called 'DEFAULT_SX_PER'; this sets the data
-transfer speed for the asynchronous mode. I've put it at 500 ns
-despite the fact that the card could handle settings of 376 or
-252, because higher speeds may be a problem with poor quality
-cables or improper termination; 500 ns is a compromise. You can
-choose your own default through the command-line with the
-'period' keyword.
-
-
-------------------------------------------------
-***********  DIP switch settings  **************
-------------------------------------------------
-
-   sw1-1 sw1-2    BIOS address (hex)
-   -----------------------------------------
-    off   off     C8000 - CBFF0
-    on    off     D8000 - DBFF0
-    off   on      D0000 - D3FF0
-    on    on      BIOS disabled
-
-   sw1-3 sw1-4    IO port address (hex)
-   ------------------------------------
-    off   off     220 - 22F
-    on    off     200 - 20F
-    off   on      110 - 11F
-    on    on      100 - 10F
-
-   sw1-5 sw1-6 sw1-7    Interrupt
-   ------------------------------
-    off   off   off     15
-    off   on    off     14
-    off   off   on      11
-    off   on    on      10
-    on    -     -       disabled
-
-   sw1-8 function depends on BIOS version. In earlier versions this
-   controlled synchronous data transfer support for MSDOS:
-      off = disabled
-      on  = enabled
-   In later ROMs (starting with 01.3 in April 1994) sw1-8 controls
-   the "greater than 2 disk drive" feature that first appeared in
-   MSDOS 5.0 (ignored by Linux):
-      off = 2 drives maximum
-      on  = 7 drives maximum
-
-   sw1-9    Floppy controller
-   --------------------------
-    off     disabled
-    on      enabled
-
-------------------------------------------------
-
-   I should mention that Drew Eckhardt's 'Generic NCR5380' sources
-   were my main inspiration, with lots of reference to the IN2000
-   driver currently distributed in the kernel source. I also owe
-   much to a driver written by Hamish Macdonald for Linux-m68k(!).
-   And to Eric Wright for being an ALPHA guinea pig. And to Bill
-   Earnest for 2 tons of great input and information. And to David
-   Willmore for extensive 'bonnie' testing. And to Joe Mack for
-   continual testing and feedback.
-
-
-            John Shifflett    [email protected]
-

Documentation/scsi/scsi-parameters.txt

View file

diff --git a/Documentation/scsi/scsi-parameters.txt b/Documentation/scsi/scsi-parameters.txt
index d5ae6ce..8e66daf 100644
--- a/Documentation/scsi/scsi-parameters.txt
+++ b/Documentation/scsi/scsi-parameters.txt
@@ -34,9 +34,6 @@ parameters may be changed at runtime by the command
 			See drivers/scsi/BusLogic.c, comment before function
 			BusLogic_ParseDriverOptions().
 
-	dtc3181e=	[HW,SCSI]
-			See Documentation/scsi/g_NCR5380.txt.
-
 	eata=		[HW,SCSI]
 
 	fdomain=	[HW,SCSI]
@@ -47,9 +44,6 @@ parameters may be changed at runtime by the command
 
 	gvp11=		[HW,SCSI]
 
-	in2000=		[HW,SCSI]
-			See header of drivers/scsi/in2000.c.
-
 	ips=		[HW,SCSI] Adaptec / IBM ServeRAID controller
 			See header of drivers/scsi/ips.c.
 
@@ -83,9 +77,6 @@ parameters may be changed at runtime by the command
 			Format: <buffer_size>,<write_threshold>
 			See also Documentation/scsi/st.txt.
 
-	pas16=		[HW,SCSI]
-			See header of drivers/scsi/pas16.c.
-
 	scsi_debug_*=	[SCSI]
 			See drivers/scsi/scsi_debug.c.
 
@@ -119,18 +110,9 @@ parameters may be changed at runtime by the command
 	sym53c416=	[HW,SCSI]
 			See header of drivers/scsi/sym53c416.c.
 
-	t128=		[HW,SCSI]
-			See header of drivers/scsi/t128.c.
-
 	tmscsim=	[HW,SCSI]
 			See comment before function dc390_setup() in
 			drivers/scsi/tmscsim.c.
 
-	u14-34f=	[HW,SCSI] UltraStor 14F/34F SCSI host adapter
-			See header of drivers/scsi/u14-34f.c.
-
 	wd33c93=	[HW,SCSI]
 			See header of drivers/scsi/wd33c93.c.
-
-	wd7000=		[HW,SCSI]
-			See header of drivers/scsi/wd7000.c.

Documentation/scsi/smartpqi.txt

View file

diff --git a/Documentation/scsi/smartpqi.txt b/Documentation/scsi/smartpqi.txt
new file mode 100644
index 0000000..ab377d9
--- /dev/null
+++ b/Documentation/scsi/smartpqi.txt
@@ -0,0 +1,80 @@
+
+SMARTPQI - Microsemi Smart PQI Driver
+-----------------------------------------
+
+This file describes the smartpqi SCSI driver for Microsemi
+(http://www.microsemi.com) PQI controllers. The smartpqi driver
+is the next generation SCSI driver for Microsemi Corp. The smartpqi
+driver is the first SCSI driver to implement the PQI queuing model.
+
+The smartpqi driver will replace the aacraid driver for Adaptec Series 9
+controllers. Customers running an older kernel (Pre-4.9) using an Adaptec
+Series 9 controller will have to configure the smartpqi driver or their
+volumes will not be added to the OS.
+
+For Microsemi smartpqi controller support, enable the smartpqi driver
+when configuring the kernel.
+
+For more information on the PQI Queuing Interface, please see:
+http://www.t10.org/drafts.htm
+http://www.t10.org/members/w_pqi2.htm
+
+Supported devices:
+------------------
+<Controller names to be added as they become publically available.>
+
+smartpqi specific entries in /sys
+-----------------------------
+
+  smartpqi host attributes:
+  -------------------------
+  /sys/class/scsi_host/host*/rescan
+  /sys/class/scsi_host/host*/version
+
+  The host rescan attribute is a write only attribute. Writing to this
+  attribute will trigger the driver to scan for new, changed, or removed
+  devices and notify the SCSI mid-layer of any changes detected.
+
+  The version attribute is read-only and will return the driver version
+  and the controller firmware version.
+  For example:
+              driver: 0.9.13-370
+              firmware: 0.01-522
+
+  smartpqi sas device attributes
+  ------------------------------
+  HBA devices are added to the SAS transport layer. These attributes are
+  automatically added by the SAS transport layer.
+
+  /sys/class/sas_device/end_device-X:X/sas_address
+  /sys/class/sas_device/end_device-X:X/enclosure_identifier
+  /sys/class/sas_device/end_device-X:X/scsi_target_id
+
+smartpqi specific ioctls:
+-------------------------
+
+  For compatibility with applications written for the cciss protocol.
+
+  CCISS_DEREGDISK
+  CCISS_REGNEWDISK
+  CCISS_REGNEWD
+
+  The above three ioctls all do exactly the same thing, which is to cause the driver
+  to rescan for new devices.  This does exactly the same thing as writing to the
+  smartpqi specific host "rescan" attribute.
+
+  CCISS_GETPCIINFO
+
+	Returns PCI domain, bus, device and function and "board ID" (PCI subsystem ID).
+
+  CCISS_GETDRIVVER
+
+	Returns driver version in three bytes encoded as:
+	(DRIVER_MAJOR << 28) | (DRIVER_MINOR << 24) | (DRIVER_RELEASE << 16) | DRIVER_REVISION;
+
+  CCISS_PASSTHRU
+
+	Allows "BMIC" and "CISS" commands to be passed through to the Smart Storage Array.
+	These are used extensively by the SSA Array Configuration Utility, SNMP storage
+	agents, etc.
+

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index 58c5205..b9a0d48 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7973,6 +7973,18 @@ W:	http://www.melexis.com
 S:	Supported
 F:	drivers/iio/temperature/mlx90614.c
 
+MICROSEMI SMART ARRAY SMARTPQI DRIVER (smartpqi)
+M:	Don Brace <[email protected]>
+L:	[email protected]
+L:	[email protected]
+S:	Supported
+F:	drivers/scsi/smartpqi/smartpqi*.[ch]
+F:	drivers/scsi/smartpqi/Kconfig
+F:	drivers/scsi/smartpqi/Makefile
+F:	include/linux/cciss*.h
+F:	include/uapi/linux/cciss*.h
+F:	Documentation/scsi/smartpqi.txt
+
 MN88472 MEDIA DRIVER
 M:	Antti Palosaari <[email protected]>
 L:	[email protected]
@@ -8185,20 +8197,16 @@ M:	Michael Schmitz <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	Documentation/scsi/g_NCR5380.txt
-F:	Documentation/scsi/dtc3x80.txt
 F:	drivers/scsi/NCR5380.*
 F:	drivers/scsi/arm/cumana_1.c
 F:	drivers/scsi/arm/oak.c
 F:	drivers/scsi/atari_scsi.*
 F:	drivers/scsi/dmx3191d.c
-F:	drivers/scsi/dtc.*
 F:	drivers/scsi/g_NCR5380.*
 F:	drivers/scsi/g_NCR5380_mmio.c
 F:	drivers/scsi/mac_scsi.*
-F:	drivers/scsi/pas16.*
 F:	drivers/scsi/sun3_scsi.*
 F:	drivers/scsi/sun3_scsi_vme.c
-F:	drivers/scsi/t128.*
 
 NCR DUAL 700 SCSI DRIVER (MICROCHANNEL)
 M:	"James E.J. Bottomley" <[email protected]>
@@ -10740,12 +10748,12 @@ S:	Maintained
 F:	drivers/misc/phantom.c
 F:	include/uapi/linux/phantom.h
 
-SERVER ENGINES 10Gbps iSCSI - BladeEngine 2 DRIVER
-M:	Jayamohan Kallickal <[email protected]>
-M:	Ketan Mukadam <[email protected]>
-M:	John Soni Jose <[email protected]>
+Emulex 10Gbps iSCSI - OneConnect DRIVER
+M:	Subbu Seetharaman <[email protected]>
+M:	Ketan Mukadam <[email protected]>
+M:	Jitendra Bhivare <[email protected]>
 L:	[email protected]
-W:	http://www.avagotech.com
+W:	http://www.broadcom.com
 S:	Supported
 F:	drivers/scsi/be2iscsi/
 
@@ -12143,12 +12151,6 @@ S:	Maintained
 F:	drivers/tc/
 F:	include/linux/tc.h
 
-U14-34F SCSI DRIVER
-M:	Dario Ballabio <[email protected]>
-L:	[email protected]
-S:	Maintained
-F:	drivers/scsi/u14-34f.c
-
 UBI FILE SYSTEM (UBIFS)
 M:	Richard Weinberger <[email protected]>
 M:	Artem Bityutskiy <[email protected]>
@@ -12876,12 +12878,6 @@ F:	drivers/watchdog/
 F:	include/linux/watchdog.h
 F:	include/uapi/linux/watchdog.h
 
-WD7000 SCSI DRIVER
-M:	Miroslav Zagorac <[email protected]>
-L:	[email protected]
-S:	Maintained
-F:	drivers/scsi/wd7000.c
-
 WIIMOTE HID DRIVER
 M:	David Herrmann <[email protected]>
 L:	[email protected]

drivers/message/fusion/mptbase.c

View file

diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index 5537f8d..89c7ed1 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -1865,8 +1865,8 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
 
 	snprintf(ioc->reset_work_q_name, MPT_KOBJ_NAME_LEN,
 		 "mpt_poll_%d", ioc->id);
-	ioc->reset_work_q =
-		create_singlethread_workqueue(ioc->reset_work_q_name);
+	ioc->reset_work_q = alloc_workqueue(ioc->reset_work_q_name,

This diff is incomplete. Download the complete patch.