Commit 670ffccb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull SCSI updates from James Bottomley:
 "This is mostly updates of the usual suspects: lpfc, qla2xxx, hisi_sas,
  megaraid_sas, pm80xx, mpt3sas, be2iscsi, hpsa. and a host of minor
  updates.

  There's no major behaviour change or additions to the core in all of
  this, so the potential for regressions should be small (biggest
  potential being in the scsi error handler changes)"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (203 commits)
  scsi: lpfc: Fix hard lock up NMI in els timeout handling.
  scsi: mpt3sas: remove a stray KERN_INFO
  scsi: mpt3sas: cleanup _scsih_pcie_enumeration_event()
  scsi: aacraid: use timespec64 instead of timeval
  scsi: scsi_transport_fc: add 64GBIT and 128GBIT port speed definitions
  scsi: qla2xxx: Suppress a kernel complaint in qla_init_base_qpair()
  scsi: mpt3sas: fix dma_addr_t casts
  scsi: be2iscsi: Use kasprintf
  scsi: storvsc: Avoid excessive host scan on controller change
  scsi: lpfc: fix kzalloc-simple.cocci warnings
  scsi: mpt3sas: Update mpt3sas driver version.
  scsi: mpt3sas: Fix sparse warnings
  scsi: mpt3sas: Fix nvme drives checking for tlr.
  scsi: mpt3sas: NVMe drive support for BTDHMAPPING ioctl command and log info
  scsi: mpt3sas: Add-Task-management-debug-info-for-NVMe-drives.
  scsi: mpt3sas: scan and add nvme device after controller reset
  scsi: mpt3sas: Set NVMe device queue depth as 128
  scsi: mpt3sas: Handle NVMe PCIe device related events generated from firmware.
  scsi: mpt3sas: API's to remove nvme drive from sml
  scsi: mpt3sas: API 's to support NVMe drive addition to SML
  ...
parents 47f521ba 341b2aa8

Documentation/driver-api/scsi.rst

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ SCSI commands can be transported over just about any kind of bus, and 
are the default protocol for storage devices attached to USB, SATA, SAS,

Fibre Channel, FireWire, and ATAPI devices. SCSI packets are also

commonly exchanged over Infiniband,

`I20 <http://i2o.shadowconnect.com/faq.php>`__, TCP/IP

`I2O <http://i2o.shadowconnect.com/faq.php>`__, TCP/IP

(`iSCSI <https://en.wikipedia.org/wiki/ISCSI>`__), even `Parallel

ports <http://cyberelk.net/tim/parport/parscsi.html>`__.

Documentation/scsi/scsi-parameters.txt

+8 −5
Original line number Diff line number Diff line
@@ -50,10 +50,11 @@ parameters may be changed at runtime by the command 
	mac5380=	[HW,SCSI]

			See drivers/scsi/mac_scsi.c.



	max_luns=	[SCSI] Maximum number of LUNs to probe.

	scsi_mod.max_luns=

			[SCSI] Maximum number of LUNs to probe.

			Should be between 1 and 2^32-1.



	max_report_luns=

	scsi_mod.max_report_luns=

			[SCSI] Maximum number of LUNs received.

			Should be between 1 and 16384.
@@ -80,15 +81,17 @@ parameters may be changed at runtime by the command 
	scsi_debug_*=	[SCSI]

			See drivers/scsi/scsi_debug.c.



	scsi_default_dev_flags=

	scsi_mod.default_dev_flags=

			[SCSI] SCSI default device flags

			Format: <integer>



	scsi_dev_flags=	[SCSI] Black/white list entry for vendor and model

	scsi_mod.dev_flags=

			[SCSI] Black/white list entry for vendor and model

			Format: <vendor>:<model>:<flags>

			(flags are integer value)



	scsi_logging_level=	[SCSI] a bit mask of logging levels

	scsi_mod.scsi_logging_level=

			[SCSI] a bit mask of logging levels

			See drivers/scsi/scsi_logging.h for bits.  Also

			settable via sysctl at dev.scsi.logging_level

			(/proc/sys/dev/scsi/logging_level).

Documentation/scsi/smartpqi.txt

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ http://www.t10.org/members/w_pqi2.htm 


Supported devices:

------------------

<Controller names to be added as they become publically available.>

<Controller names to be added as they become publicly available.>



smartpqi specific entries in /sys

-----------------------------

drivers/scsi/.gitignore

+1 −0
Original line number Diff line number Diff line 
53c700_d.h

scsi_devinfo_tbl.c

drivers/scsi/Makefile

+8 −0
Original line number Diff line number Diff line
@@ -192,6 +192,14 @@ clean-files := 53c700_d.h 53c700_u.h 


$(obj)/53c700.o $(MODVERDIR)/$(obj)/53c700.ver: $(obj)/53c700_d.h



$(obj)/scsi_sysfs.o: $(obj)/scsi_devinfo_tbl.c



quiet_cmd_bflags = GEN     $@

	cmd_bflags = sed -n 's/.*BLIST_\([A-Z0-9_]*\) *.*/BLIST_FLAG_NAME(\1),/p' $< > $@



$(obj)/scsi_devinfo_tbl.c: include/scsi/scsi_devinfo.h

	$(call if_changed,bflags)



# If you want to play with the firmware, uncomment

# GENERATE_FIRMWARE := 1

CRA Git | Maintained and supported by SUSTech CRA and CCSE