From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 16 Dec 2020 21:34:31 +0000 (-0800)
Subject: Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
X-Git-Tag: v5.15~2161
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=60f7c503d971a731ee3c4f884a9f2e80d476730d;p=platform%2Fkernel%2Flinux-starfive.git

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

Pull SCSI updates from James Bottomley:
 "This consists of the usual driver updates (ufs, qla2xxx, smartpqi,
  target, zfcp, fnic, mpt3sas, ibmvfc) plus a load of cleanups, a major
  power management rework and a load of assorted minor updates.

  There are a few core updates (formatting fixes being the big one) but
  nothing major this cycle"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (279 commits)
  scsi: mpt3sas: Update driver version to 36.100.00.00
  scsi: mpt3sas: Handle trigger page after firmware update
  scsi: mpt3sas: Add persistent MPI trigger page
  scsi: mpt3sas: Add persistent SCSI sense trigger page
  scsi: mpt3sas: Add persistent Event trigger page
  scsi: mpt3sas: Add persistent Master trigger page
  scsi: mpt3sas: Add persistent trigger pages support
  scsi: mpt3sas: Sync time periodically between driver and firmware
  scsi: qla2xxx: Update version to 10.02.00.104-k
  scsi: qla2xxx: Fix device loss on 4G and older HBAs
  scsi: qla2xxx: If fcport is undergoing deletion complete I/O with retry
  scsi: qla2xxx: Fix the call trace for flush workqueue
  scsi: qla2xxx: Fix flash update in 28XX adapters on big endian machines
  scsi: qla2xxx: Handle aborts correctly for port undergoing deletion
  scsi: qla2xxx: Fix N2N and NVMe connect retry failure
  scsi: qla2xxx: Fix FW initialization error on big endian machines
  scsi: qla2xxx: Fix crash during driver load on big endian machines
  scsi: qla2xxx: Fix compilation issue in PPC systems
  scsi: qla2xxx: Don't check for fw_started while posting NVMe command
  scsi: qla2xxx: Tear down session if FW say it is down
  ...
---

60f7c503d971a731ee3c4f884a9f2e80d476730d
diff --cc drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
index 960de37,88f203f..7c12804
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
@@@ -2449,14 -2448,8 +2448,13 @@@ static int interrupt_init_v3_hw(struct 
  		if (rc) {
  			dev_err(dev, "could not request cq%d interrupt, rc=%d\n",
  				i, rc);
- 			rc = -ENOENT;
- 			goto free_irq_vectors;
+ 			return -ENOENT;
  		}
 +		cq->irq_mask = pci_irq_get_affinity(pdev, i + BASE_VECTORS_V3_HW);
 +		if (!cq->irq_mask) {
 +			dev_err(dev, "could not get cq%d irq affinity!\n", i);
 +			return -ENOENT;
 +		}
  	}
  
  	return 0;
diff --cc drivers/scsi/scsi_lib.c
index 03c6d06,b7ac145..4848ae3
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@@ -1703,9 -1706,15 +1706,14 @@@ out_put_budget
  		break;
  	case BLK_STS_RESOURCE:
  	case BLK_STS_ZONE_RESOURCE:
 -		if (atomic_read(&sdev->device_busy) ||
 -		    scsi_device_blocked(sdev))
 +		if (scsi_device_blocked(sdev))
  			ret = BLK_STS_DEV_RESOURCE;
  		break;
+ 	case BLK_STS_AGAIN:
+ 		scsi_req(req)->result = DID_BUS_BUSY << 16;
+ 		if (req->rq_flags & RQF_DONTPREP)
+ 			scsi_mq_uninit_cmd(cmd);
+ 		break;
  	default:
  		if (unlikely(!scsi_device_online(sdev)))
  			scsi_req(req)->result = DID_NO_CONNECT << 16;