From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 2 Jul 2021 22:14:36 +0000 (-0700)
Subject: Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=bd31b9efbf549d9630bf2f269a3a56dcb29fcac1;p=linux.git

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

Pull SCSI updates from James Bottomley:
 "This series consists of the usual driver updates (ufs, ibmvfc,
  megaraid_sas, lpfc, elx, mpi3mr, qedi, iscsi, storvsc, mpt3sas) with
  elx and mpi3mr being new drivers.

  The major core change is a rework to drop the status byte handling
  macros and the old bit shifted definitions and the rest of the updates
  are minor fixes"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (287 commits)
  scsi: aha1740: Avoid over-read of sense buffer
  scsi: arcmsr: Avoid over-read of sense buffer
  scsi: ips: Avoid over-read of sense buffer
  scsi: ufs: ufs-mediatek: Add missing of_node_put() in ufs_mtk_probe()
  scsi: elx: libefc: Fix IRQ restore in efc_domain_dispatch_frame()
  scsi: elx: libefc: Fix less than zero comparison of a unsigned int
  scsi: elx: efct: Fix pointer error checking in debugfs init
  scsi: elx: efct: Fix is_originator return code type
  scsi: elx: efct: Fix link error for _bad_cmpxchg
  scsi: elx: efct: Eliminate unnecessary boolean check in efct_hw_command_cancel()
  scsi: elx: efct: Do not use id uninitialized in efct_lio_setup_session()
  scsi: elx: efct: Fix error handling in efct_hw_init()
  scsi: elx: efct: Remove redundant initialization of variable lun
  scsi: elx: efct: Fix spelling mistake "Unexected" -> "Unexpected"
  scsi: lpfc: Fix build error in lpfc_scsi.c
  scsi: target: iscsi: Remove redundant continue statement
  scsi: qla4xxx: Remove redundant continue statement
  scsi: ppa: Switch to use module_parport_driver()
  scsi: imm: Switch to use module_parport_driver()
  scsi: mpt3sas: Fix error return value in _scsih_expander_add()
  ...
---

bd31b9efbf549d9630bf2f269a3a56dcb29fcac1
diff --cc drivers/scsi/ufs/ufshcd.c
index 72fd41bfbd54b,25fe18a36cd21..b87ff68aa9aa0
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@@ -2872,13 -2969,8 +2969,11 @@@ static int ufshcd_exec_dev_cmd(struct u
  	}
  	tag = req->tag;
  	WARN_ON_ONCE(!ufshcd_valid_tag(hba, tag));
 +	/* Set the timeout such that the SCSI error handler is not activated. */
 +	req->timeout = msecs_to_jiffies(2 * timeout);
 +	blk_mq_start_request(req);
  
- 	init_completion(&wait);
- 	lrbp = &hba->lrb[tag];
- 	if (unlikely(lrbp->in_use)) {
+ 	if (unlikely(test_bit(tag, &hba->outstanding_reqs))) {
  		err = -EBUSY;
  		goto out;
  	}