From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 22 Feb 2023 21:41:41 +0000 (-0800)
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=8762069330316392331e693befd8a5b632833618;p=linux.git

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

Pull SCSI updates from James Bottomley:
 "Updates to the usual drivers (ufs, lpfc, qla2xxx, libsas).

  The major core change is a rework to remove the two helpers around
  scsi_execute_cmd and use it as the only submission interface along
  with other minor fixes and updates"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (142 commits)
  scsi: ufs: core: Fix an error handling path in ufshcd_read_desc_param()
  scsi: ufs: core: Fix device management cmd timeout flow
  scsi: aic94xx: Add missing check for dma_map_single()
  scsi: smartpqi: Replace one-element array with flexible-array member
  scsi: mpt3sas: Fix a memory leak
  scsi: qla2xxx: Remove the unused variable wwn
  scsi: ufs: core: Fix kernel-doc syntax
  scsi: ufs: core: Add hibernation callbacks
  scsi: snic: Fix memory leak with using debugfs_lookup()
  scsi: ufs: core: Limit DMA alignment check
  scsi: Documentation: Correct spelling
  scsi: Documentation: Correct spelling
  scsi: target: Documentation: Correct spelling
  scsi: aacraid: Allocate cmd_priv with scsicmd
  scsi: ufs: qcom: dt-bindings: Add SM8550 compatible string
  scsi: ufs: ufs-qcom: Clear qunipro_g4_sel for HW version major 5
  scsi: ufs: qcom: fix platform_msi_domain_free_irqs() reference
  scsi: ufs: core: Enable DMA clustering
  scsi: ufs: exynos: Fix the maximum segment size
  scsi: ufs: exynos: Fix DMA alignment for PAGE_SIZE != 4096
  ...
---

8762069330316392331e693befd8a5b632833618
diff --cc drivers/ufs/core/ufshcd.c
index 3a1c4d31e010d,3b3cf78d3b100..276a82b2e5ee3
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@@ -1238,10 -1289,9 +1290,10 @@@ static int ufshcd_clock_scaling_prepare
  	down_write(&hba->clk_scaling_lock);
  
  	if (!hba->clk_scaling.is_allowed ||
- 	    ufshcd_wait_for_doorbell_clr(hba, DOORBELL_CLR_TOUT_US)) {
+ 	    ufshcd_wait_for_doorbell_clr(hba, timeout_us)) {
  		ret = -EBUSY;
  		up_write(&hba->clk_scaling_lock);
 +		mutex_unlock(&hba->wb_mutex);
  		ufshcd_scsi_unblock_requests(hba);
  		goto out;
  	}
@@@ -1279,8 -1325,9 +1331,8 @@@ static void ufshcd_clock_scaling_unprep
  static int ufshcd_devfreq_scale(struct ufs_hba *hba, bool scale_up)
  {
  	int ret = 0;
 -	bool is_writelock = true;
  
- 	ret = ufshcd_clock_scaling_prepare(hba);
+ 	ret = ufshcd_clock_scaling_prepare(hba, 1 * USEC_PER_SEC);
  	if (ret)
  		return ret;
  
diff --cc include/ufs/ufshcd.h
index 727084cd79be4,ed9e3d5addb3a..431c3afb2ce0f
--- a/include/ufs/ufshcd.h
+++ b/include/ufs/ufshcd.h
@@@ -952,9 -1034,7 +1035,8 @@@ struct ufs_hba 
  	enum bkops_status urgent_bkops_lvl;
  	bool is_urgent_bkops_lvl_checked;
  
 +	struct mutex wb_mutex;
  	struct rw_semaphore clk_scaling_lock;
- 	unsigned char desc_size[QUERY_DESC_IDN_MAX];
  	atomic_t scsi_block_reqs_cnt;
  
  	struct device		bsg_dev;