Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28bc6fb9 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 driver suspects: arcmsr,
  scsi_debug, mpt3sas, lpfc, cxlflash, qla2xxx, aacraid, megaraid_sas,
  hisi_sas.

  We also have a rework of the libsas hotplug handling to make it more
  robust, a slew of 32 bit time conversions and fixes, and a host of the
  usual minor updates and style changes. The biggest potential for
  regressions is the libsas hotplug changes, but so far they seem stable
  under testing"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (313 commits)
  scsi: qla2xxx: Fix logo flag for qlt_free_session_done()
  scsi: arcmsr: avoid do_gettimeofday
  scsi: core: Add VENDOR_SPECIFIC sense code definitions
  scsi: qedi: Drop cqe response during connection recovery
  scsi: fas216: fix sense buffer initialization
  scsi: ibmvfc: Remove unneeded semicolons
  scsi: hisi_sas: fix a bug in hisi_sas_dev_gone()
  scsi: hisi_sas: directly attached disk LED feature for v2 hw
  scsi: hisi_sas: devicetree: bindings: add LED feature for v2 hw
  scsi: megaraid_sas: NVMe passthrough command support
  scsi: megaraid: use ktime_get_real for firmware time
  scsi: fnic: use 64-bit timestamps
  scsi: qedf: Fix error return code in __qedf_probe()
  scsi: devinfo: fix format of the device list
  scsi: qla2xxx: Update driver version to 10.00.00.05-k
  scsi: qla2xxx: Add XCB counters to debugfs
  scsi: qla2xxx: Fix queue ID for async abort with Multiqueue
  scsi: qla2xxx: Fix warning for code intentation in __qla24xx_handle_gpdb_event()
  scsi: qla2xxx: Fix warning during port_name debug print
  scsi: qla2xxx: Fix warning in qla2x00_async_iocb_timeout()
  ...
parents 0be600a5 a2390348

Documentation/devicetree/bindings/scsi/hisilicon-sas.txt

+4 −1
Original line number Diff line number Diff line
@@ -8,7 +8,10 @@ Main node required properties: 
	(b) "hisilicon,hip06-sas-v2" for v2 hw in hip06 chipset

	(c) "hisilicon,hip07-sas-v2" for v2 hw in hip07 chipset

  - sas-addr : array of 8 bytes for host SAS address

  - reg : Address and length of the SAS register

  - reg : Contains two regions. The first is the address and length of the SAS

          register. The second is the address and length of CPLD register for

          SGPIO control. The second is optional, and should be set only when

          we use a CPLD for directly attached disk LED control.

  - hisilicon,sas-syscon: phandle of syscon used for sas control

  - ctrl-reset-reg : offset to controller reset register in ctrl reg

  - ctrl-reset-sts-reg : offset to controller reset status register in ctrl reg

Documentation/driver-api/scsi.rst

+9 −1
Original line number Diff line number Diff line
@@ -224,6 +224,14 @@ mid to lowlevel SCSI driver interface 
.. kernel-doc:: drivers/scsi/hosts.c

   :export:



drivers/scsi/scsi_common.c

~~~~~~~~~~~~~~~~~~~~~~~~~~



general support functions



.. kernel-doc:: drivers/scsi/scsi_common.c

   :export:



Transport classes

-----------------
@@ -332,5 +340,5 @@ todo 
~~~~



Parallel (fast/wide/ultra) SCSI, USB, SATA, SAS, Fibre Channel,

FireWire, ATAPI devices, Infiniband, I20, iSCSI, Parallel ports,

FireWire, ATAPI devices, Infiniband, I2O, iSCSI, Parallel ports,

netlink...

drivers/message/fusion/mptbase.c

+30 −29
Original line number Diff line number Diff line
@@ -1129,6 +1129,7 @@ static void 
mpt_add_chain(void *pAddr, u8 next, u16 length, dma_addr_t dma_addr)

{

	SGEChain32_t *pChain = (SGEChain32_t *) pAddr;



	pChain->Length = cpu_to_le16(length);

	pChain->Flags = MPI_SGE_FLAGS_CHAIN_ELEMENT;

	pChain->NextChainOffset = next;
@@ -7697,7 +7698,7 @@ mpt_display_event_info(MPT_ADAPTER *ioc, EventNotificationReply_t *pEventReply) 
		break;

	}

	if (ds)

		strncpy(evStr, ds, EVENT_DESCR_STR_SZ);

		strlcpy(evStr, ds, EVENT_DESCR_STR_SZ);





	devtprintk(ioc, printk(MYIOC_s_DEBUG_FMT

drivers/message/fusion/mptctl.c

+7 −18
Original line number Diff line number Diff line
@@ -2481,24 +2481,13 @@ mptctl_hp_hostinfo(unsigned long arg, unsigned int data_size) 
	else

		karg.host_no =  -1;



	/* Reformat the fw_version into a string

	 */

	karg.fw_version[0] = ioc->facts.FWVersion.Struct.Major >= 10 ?

		((ioc->facts.FWVersion.Struct.Major / 10) + '0') : '0';

	karg.fw_version[1] = (ioc->facts.FWVersion.Struct.Major % 10 ) + '0';

	karg.fw_version[2] = '.';

	karg.fw_version[3] = ioc->facts.FWVersion.Struct.Minor >= 10 ?

		((ioc->facts.FWVersion.Struct.Minor / 10) + '0') : '0';

	karg.fw_version[4] = (ioc->facts.FWVersion.Struct.Minor % 10 ) + '0';

	karg.fw_version[5] = '.';

	karg.fw_version[6] = ioc->facts.FWVersion.Struct.Unit >= 10 ?

		((ioc->facts.FWVersion.Struct.Unit / 10) + '0') : '0';

	karg.fw_version[7] = (ioc->facts.FWVersion.Struct.Unit % 10 ) + '0';

	karg.fw_version[8] = '.';

	karg.fw_version[9] = ioc->facts.FWVersion.Struct.Dev >= 10 ?

		((ioc->facts.FWVersion.Struct.Dev / 10) + '0') : '0';

	karg.fw_version[10] = (ioc->facts.FWVersion.Struct.Dev % 10 ) + '0';

	karg.fw_version[11] = '\0';

	/* Reformat the fw_version into a string */

	snprintf(karg.fw_version, sizeof(karg.fw_version),

		 "%.2hhu.%.2hhu.%.2hhu.%.2hhu",

		 ioc->facts.FWVersion.Struct.Major,

		 ioc->facts.FWVersion.Struct.Minor,

		 ioc->facts.FWVersion.Struct.Unit,

		 ioc->facts.FWVersion.Struct.Dev);



	/* Issue a config request to get the device serial number

	 */

drivers/message/fusion/mptsas.c

+0 −1
Original line number Diff line number Diff line
@@ -1165,7 +1165,6 @@ mptsas_schedule_target_reset(void *iocp) 
	 * issue target reset to next device in the queue

	 */



	head = &hd->target_reset_list;

	if (list_empty(head))

		return;