From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 21 Sep 2019 17:50:15 +0000 (-0700)
Subject: Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
X-Git-Tag: for-linus-2019-09-27~49
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=10fd71780f7d155f4e35fecfad0ebd4a725a244b;p=linux-2.6-block.git

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

Pull SCSI updates from James Bottomley:
 "This is mostly update of the usual drivers: qla2xxx, ufs, smartpqi,
  lpfc, hisi_sas, qedf, mpt3sas; plus a whole load of minor updates. The
  only core change this time around is the addition of request batching
  for virtio. Since batching requires an additional flag to use, it
  should be invisible to the rest of the drivers"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (264 commits)
  scsi: hisi_sas: Fix the conflict between device gone and host reset
  scsi: hisi_sas: Add BIST support for phy loopback
  scsi: hisi_sas: Add hisi_sas_debugfs_alloc() to centralise allocation
  scsi: hisi_sas: Remove some unused function arguments
  scsi: hisi_sas: Remove redundant work declaration
  scsi: hisi_sas: Remove hisi_sas_hw.slot_complete
  scsi: hisi_sas: Assign NCQ tag for all NCQ commands
  scsi: hisi_sas: Update all the registers after suspend and resume
  scsi: hisi_sas: Retry 3 times TMF IO for SAS disks when init device
  scsi: hisi_sas: Remove sleep after issue phy reset if sas_smp_phy_control() fails
  scsi: hisi_sas: Directly return when running I_T_nexus reset if phy disabled
  scsi: hisi_sas: Use true/false as input parameter of sas_phy_reset()
  scsi: hisi_sas: add debugfs auto-trigger for internal abort time out
  scsi: virtio_scsi: unplug LUNs when events missed
  scsi: scsi_dh_rdac: zero cdb in send_mode_select()
  scsi: fcoe: fix null-ptr-deref Read in fc_release_transport
  scsi: ufs-hisi: use devm_platform_ioremap_resource() to simplify code
  scsi: ufshcd: use devm_platform_ioremap_resource() to simplify code
  scsi: hisi_sas: use devm_platform_ioremap_resource() to simplify code
  scsi: ufs: Use kmemdup in ufshcd_read_string_desc()
  ...
---

10fd71780f7d155f4e35fecfad0ebd4a725a244b
diff --cc drivers/scsi/lpfc/lpfc_sli4.h
index a81ef0293696,4bdd58de4692..0d4882a9e634
--- a/drivers/scsi/lpfc/lpfc_sli4.h
+++ b/drivers/scsi/lpfc/lpfc_sli4.h
@@@ -44,14 -44,6 +44,11 @@@
  #define LPFC_HBA_HDWQ_MAX	128
  #define LPFC_HBA_HDWQ_DEF	0
  
 +/* FCP MQ queue count limiting */
 +#define LPFC_FCP_MQ_THRESHOLD_MIN	0
 +#define LPFC_FCP_MQ_THRESHOLD_MAX	256
 +#define LPFC_FCP_MQ_THRESHOLD_DEF	8
 +
- /* Common buffer size to accomidate SCSI and NVME IO buffers */
- #define LPFC_COMMON_IO_BUF_SZ	768
- 
  /*
   * Provide the default FCF Record attributes used by the driver
   * when nonFIP mode is configured and there is no other default
diff --cc drivers/scsi/qla2xxx/qla_os.c
index 98e60a34afd9,51154c049385..73db01e3b4e4
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@@ -4824,8 -4803,7 +4811,8 @@@ struct scsi_qla_host *qla2x00_create_ho
  		    "Alloc failed for scan database.\n");
  		dma_free_coherent(&ha->pdev->dev, vha->gnl.size,
  		    vha->gnl.l, vha->gnl.ldma);
 +		vha->gnl.l = NULL;
- 		scsi_remove_host(vha->host);
+ 		scsi_host_put(vha->host);
  		return NULL;
  	}
  	INIT_DELAYED_WORK(&vha->scan.scan_work, qla_scan_work_fn);