Skip to contentSkip to conversation

UFS patches for Linux kernel v5.14

PATCH In review Bart Van Assche 3 participants 9 messages Jun 24, 2021 – Jun 25, 2021 SCSI

lore
Share & tools
lore
#0 lore raw

v2 cover UFS patches for Linux kernel v5.14

Hi Martin,

The three patches in this series are intended for kernel v5.14. These patches have been compile tested only but should be easy to review.

Thanks,

Bart.

Changes compared to v1:
- Dropped patches 3 and 4.
- Added a new patch at the start of this series that reduces code duplication in the runtime power managment implementation.

Bart Van Assche (3):
ufs: Reduce code duplication in the runtime power managment
implementation
ufs: Rename the second ufshcd_probe_hba() argument
ufs: Remove ufshcd_valid_tag()

 drivers/scsi/ufs/tc-dwc-g210-pci.c | 34 ++----------
 drivers/scsi/ufs/ufshcd-pci.c      | 48 +----------------
 drivers/scsi/ufs/ufshcd-pltfrm.c   | 47 -----------------
 drivers/scsi/ufs/ufshcd.c          | 83 ++++++++++--------------------
 drivers/scsi/ufs/ufshcd.h          |  9 ++--
 5 files changed, 36 insertions(+), 185 deletions(-)
#1 lore raw

PATCH v2 1/3 ufs: Reduce code duplication in the runtime power managment implementation

Move the dev_get_drvdata() calls into the ufshcd_{system,runtime}_*() functions. Remove ufshcd_runtime_idle() since it is empty. This patch does not change any functionality.

Cc Adrian Hunter <[email protected]>
Cc Stanley Chu <[email protected]>
Cc Can Guo <[email protected]>
Cc Asutosh Das <[email protected]>
Cc Avri Altman <[email protected]>
---
 drivers/scsi/ufs/tc-dwc-g210-pci.c | 34 +++------------------
 drivers/scsi/ufs/ufshcd-pci.c      | 48 ++----------------------------
 drivers/scsi/ufs/ufshcd-pltfrm.c   | 47 -----------------------------
 drivers/scsi/ufs/ufshcd.c          | 35 ++++++++++------------
 drivers/scsi/ufs/ufshcd.h          |  9 +++---
 5 files changed, 26 insertions(+), 147 deletions(-)
drivers/scsi/ufs/tc-dwc-g210-pci.c +4 -30
index ec4589afbc13..96ef98a95b85 100644
@@ -23,31 +23,6 @@ static int tc_type = TC_G210_INV;
 module_param(tc_type, int, 0);
 MODULE_PARM_DESC(tc_type, "Test Chip Type (20 = 20-bit, 40 = 40-bit)");
 
-static int tc_dwc_g210_pci_suspend(struct device *dev)
-{
-	return ufshcd_system_suspend(dev_get_drvdata(dev));
-}
-
-static int tc_dwc_g210_pci_resume(struct device *dev)
-{
-	return ufshcd_system_resume(dev_get_drvdata(dev));
-}
-
-static int tc_dwc_g210_pci_runtime_suspend(struct device *dev)
-{
-	return ufshcd_runtime_suspend(dev_get_drvdata(dev));
-}
-
-static int tc_dwc_g210_pci_runtime_resume(struct device *dev)
-{
-	return ufshcd_runtime_resume(dev_get_drvdata(dev));
-}
-
-static int tc_dwc_g210_pci_runtime_idle(struct device *dev)
-{
-	return ufshcd_runtime_idle(dev_get_drvdata(dev));
-}
-
 /*
  * struct ufs_hba_dwc_vops - UFS DWC specific variant operations
  */
@@ -143,11 +118,10 @@ tc_dwc_g210_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 }
 
 static const struct dev_pm_ops tc_dwc_g210_pci_pm_ops = {
-	.suspend	= tc_dwc_g210_pci_suspend,
-	.resume		= tc_dwc_g210_pci_resume,
-	.runtime_suspend = tc_dwc_g210_pci_runtime_suspend,
-	.runtime_resume  = tc_dwc_g210_pci_runtime_resume,
-	.runtime_idle    = tc_dwc_g210_pci_runtime_idle,
+	.suspend	 = ufshcd_system_suspend,
+	.resume		 = ufshcd_system_resume,
+	.runtime_suspend = ufshcd_runtime_suspend,
+	.runtime_resume  = ufshcd_runtime_resume,
 	.prepare	 = ufshcd_suspend_prepare,
 	.complete	 = ufshcd_resume_complete,
 };
drivers/scsi/ufs/ufshcd-pci.c +2 -46

60 lines not on this page · raw message

drivers/scsi/ufs/ufshcd-pltfrm.c +0 -47

53 lines not on this page · raw message

drivers/scsi/ufs/ufshcd.c +16 -19
index 5b31de83a63a..f097720b6b5e 100644
@@ -9204,15 +9204,16 @@ static int ufshcd_resume(struct ufs_hba *hba)
 }
 
 /**
- * ufshcd_system_suspend - system suspend routine
- * @hba: per adapter instance
+ * ufshcd_system_suspend - system suspend callback
+ * @dev: Device associated with the UFS controller.
  *
  * Check the description of ufshcd_suspend() function for more details.
  *
  * Returns 0 for success and non-zero for failure
  */
-int ufshcd_system_suspend(struct ufs_hba *hba)
+int ufshcd_system_suspend(struct device *dev)
 {
+	struct ufs_hba *hba = dev_get_drvdata(dev);
 	int ret = 0;
 	ktime_t start = ktime_get();
 
@@ -9229,16 +9230,16 @@ int ufshcd_system_suspend(struct ufs_hba *hba)
 EXPORT_SYMBOL(ufshcd_system_suspend);
 
 /**
- * ufshcd_system_resume - system resume routine
- * @hba: per adapter instance
+ * ufshcd_system_resume - system resume callback
+ * @dev: Device associated with the UFS controller.
  *
  * Returns 0 for success and non-zero for failure
  */
-
-int ufshcd_system_resume(struct ufs_hba *hba)
+int ufshcd_system_resume(struct device *dev)
 {
-	int ret = 0;
+	struct ufs_hba *hba = dev_get_drvdata(dev);
 	ktime_t start = ktime_get();
+	int ret = 0;
 
 	if (pm_runtime_suspended(hba->dev))
 		goto out;
@@ -9255,15 +9256,16 @@ int ufshcd_system_resume(struct ufs_hba *hba)
 EXPORT_SYMBOL(ufshcd_system_resume);
 
 /**
- * ufshcd_runtime_suspend - runtime suspend routine
- * @hba: per adapter instance
+ * ufshcd_runtime_suspend - runtime suspend callback
+ * @dev: Device associated with the UFS controller.
  *
  * Check the description of ufshcd_suspend() function for more details.
  *
  * Returns 0 for success and non-zero for failure
  */
-int ufshcd_runtime_suspend(struct ufs_hba *hba)
+int ufshcd_runtime_suspend(struct device *dev)
 {
+	struct ufs_hba *hba = dev_get_drvdata(dev);
 	int ret;
 	ktime_t start = ktime_get();
 
@@ -9278,7 +9280,7 @@ EXPORT_SYMBOL(ufshcd_runtime_suspend);
 
 /**
  * ufshcd_runtime_resume - runtime resume routine
- * @hba: per adapter instance
+ * @dev: Device associated with the UFS controller.
  *
  * This function basically brings controller
  * to active state. Following operations are done in this function:
@@ -9286,8 +9288,9 @@ EXPORT_SYMBOL(ufshcd_runtime_suspend);
  * 1. Turn on all the controller related clocks
  * 2. Turn ON VCC rail
  */
-int ufshcd_runtime_resume(struct ufs_hba *hba)
+int ufshcd_runtime_resume(struct device *dev)
 {
+	struct ufs_hba *hba = dev_get_drvdata(dev);
 	int ret;
 	ktime_t start = ktime_get();
 
@@ -9300,12 +9303,6 @@ int ufshcd_runtime_resume(struct ufs_hba *hba)
 }
 EXPORT_SYMBOL(ufshcd_runtime_resume);
 
-int ufshcd_runtime_idle(struct ufs_hba *hba)
-{
-	return 0;
-}
-EXPORT_SYMBOL(ufshcd_runtime_idle);
-
 /**
  * ufshcd_shutdown - shutdown routine
  * @hba: per adapter instance
drivers/scsi/ufs/ufshcd.h +4 -5
index c98d540ac044..dc75426c609f 100644
@@ -1009,11 +1009,10 @@ static inline u8 ufshcd_wb_get_query_index(struct ufs_hba *hba)
 	return 0;
 }
 
-extern int ufshcd_runtime_suspend(struct ufs_hba *hba);
-extern int ufshcd_runtime_resume(struct ufs_hba *hba);
-extern int ufshcd_runtime_idle(struct ufs_hba *hba);
-extern int ufshcd_system_suspend(struct ufs_hba *hba);
-extern int ufshcd_system_resume(struct ufs_hba *hba);
+extern int ufshcd_runtime_suspend(struct device *dev);
+extern int ufshcd_runtime_resume(struct device *dev);
+extern int ufshcd_system_suspend(struct device *dev);
+extern int ufshcd_system_resume(struct device *dev);
 extern int ufshcd_shutdown(struct ufs_hba *hba);
 extern int ufshcd_dme_configure_adapt(struct ufs_hba *hba,
 				      int agreed_gear,
Reviewed-by on v2 1/3
#2 lore raw

Re: [PATCH v2 1/3] ufs: Reduce code duplication in the runtime power managment implementation

Quoted 12 lines · Bart Van Assche

Move the dev_get_drvdata() calls into the ufshcd_{system,runtime}_*()

functions. Remove ufshcd_runtime_idle() since it is empty. This patch

does not change any functionality.

Cc Adrian Hunter <[email protected]>
Cc Stanley Chu <[email protected]>
Quoted 7 lines
Cc Can Guo <[email protected]>
Cc Asutosh Das <[email protected]>
Cc Avri Altman <[email protected]>

looks good to me.

#3 lore raw

Re: [PATCH v2 1/3] ufs: Reduce code duplication in the runtime power managment implementation

In reply to Bart Van Assche
Quoted 13 lines · Bart Van Assche

static const struct dev_pm_ops tc_dwc_g210_pci_pm_ops = {

drivers/scsi/ufs/tc-dwc-g210-pci.c +1 -5
-       .suspend        = tc_dwc_g210_pci_suspend,
 
-       .resume         = tc_dwc_g210_pci_resume,
 
-       .runtime_suspend = tc_dwc_g210_pci_runtime_suspend,
 
-       .runtime_resume  = tc_dwc_g210_pci_runtime_resume,
 
-       .runtime_idle    = tc_dwc_g210_pci_runtime_idle,
 
+       .suspend         = ufshcd_system_suspend,

drivers/scsi/ufs/tc-dwc-g210-pci.c tc_dwc_g210_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) · line 126

Quoted 10 lines
drivers/scsi/ufs/tc-dwc-g210-pci.c +3 -0
 
+       .resume          = ufshcd_system_resume,
 
+       .runtime_suspend = ufshcd_runtime_suspend,
 
+       .runtime_resume  = ufshcd_runtime_resume,
 
        .prepare         = ufshcd_suspend_prepare,
 
        .complete        = ufshcd_resume_complete,

Hi Bart,
you need to update this patch since you forgot to change the vendor's driver.

drivers/scsi/ufs/cdns-pltfrm.c
drivers/scsi/ufs/tc-dwc-g210-pltfrm.c
drivers/scsi/ufs/ufs-exynos.c
drivers/scsi/ufs/ufs-hisi.c
drivers/scsi/ufs/ufs-mediatek.c
drivers/scsi/ufs/ufs-qcom.c

Bean

#4 lore raw

Re: [PATCH v2 1/3] ufs: Reduce code duplication in the runtime power managment implementation

In reply to Bart Van Assche
I love your patch! Yet something to improve:

Hi Bart,

I love your patch! Yet something to improve:

[auto build test ERROR on mkp-scsi/for-next]
[also build test ERROR on next-20210625]
[cannot apply to scsi/for-next bvanassche/for-next v5.13-rc7] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/0day-ci/linux/commits/Bart-Van-Assche/UFS-patches-for-Linux-kernel-v5-14/20210625-073154
base:   https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git for-next
config: x86_64-randconfig-a013-20210622 (attached as .config)
compiler: gcc-9 (Debian 9.3.0-22) 9.3.0
reproduce (this is a W=1 build):
        # https://github.com/0day-ci/linux/commit/b5e451996a357bcf0940e038b6812f7d18fa4146
        git remote add linux-review https://github.com/0day-ci/linux
        git fetch --no-tags linux-review Bart-Van-Assche/UFS-patches-for-Linux-kernel-v5-14/20210625-073154
        git checkout b5e451996a357bcf0940e038b6812f7d18fa4146
        # save the attached .config to linux build tree
        make W=1 ARCH=x86_64 

If you fix the issue, kindly add following tag as appropriate

All errors (new ones prefixed by >>):

>> ld: drivers/scsi/ufs/cdns-pltfrm.o:(.rodata+0x30): undefined reference to `ufshcd_pltfrm_suspend'
>> ld: drivers/scsi/ufs/cdns-pltfrm.o:(.rodata+0x38): undefined reference to `ufshcd_pltfrm_resume'
>> ld: drivers/scsi/ufs/cdns-pltfrm.o:(.rodata+0xc0): undefined reference to `ufshcd_pltfrm_runtime_suspend'
>> ld: drivers/scsi/ufs/cdns-pltfrm.o:(.rodata+0xc8): undefined reference to `ufshcd_pltfrm_runtime_resume'
>> ld: drivers/scsi/ufs/cdns-pltfrm.o:(.rodata+0xd0): undefined reference to `ufshcd_pltfrm_runtime_idle'

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org

#5 lore raw

Re: [PATCH v2 1/3] ufs: Reduce code duplication in the runtime power managment implementation

In reply to Bart Van Assche
I love your patch! Yet something to improve:

Hi Bart,

I love your patch! Yet something to improve:

[auto build test ERROR on mkp-scsi/for-next]
[also build test ERROR on next-20210625]
[cannot apply to scsi/for-next bvanassche/for-next v5.13-rc7] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/0day-ci/linux/commits/Bart-Van-Assche/UFS-patches-for-Linux-kernel-v5-14/20210625-073154
base:   https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git for-next
config: powerpc-allyesconfig (attached as .config)
compiler: powerpc64-linux-gcc (GCC) 9.3.0

reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/b5e451996a357bcf0940e038b6812f7d18fa4146
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Bart-Van-Assche/UFS-patches-for-Linux-kernel-v5-14/20210625-073154 git checkout b5e451996a357bcf0940e038b6812f7d18fa4146
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=powerpc

If you fix the issue, kindly add following tag as appropriate

All errors (new ones prefixed by >>):

>> powerpc64-linux-ld: drivers/scsi/ufs/tc-dwc-g210-pltfrm.o:(.data.rel.ro.tc_dwc_g210_pltfm_pm_ops+0x18): undefined reference to `ufshcd_pltfrm_resume'
>> powerpc64-linux-ld: drivers/scsi/ufs/tc-dwc-g210-pltfrm.o:(.data.rel.ro.tc_dwc_g210_pltfm_pm_ops+0x58): undefined reference to `ufshcd_pltfrm_suspend'
>> powerpc64-linux-ld: drivers/scsi/ufs/tc-dwc-g210-pltfrm.o:(.data.rel.ro.tc_dwc_g210_pltfm_pm_ops+0x88): undefined reference to `ufshcd_pltfrm_runtime_idle'
>> powerpc64-linux-ld: drivers/scsi/ufs/tc-dwc-g210-pltfrm.o:(.data.rel.ro.tc_dwc_g210_pltfm_pm_ops+0x98): undefined reference to `ufshcd_pltfrm_runtime_resume'
>> powerpc64-linux-ld: drivers/scsi/ufs/tc-dwc-g210-pltfrm.o:(.data.rel.ro.tc_dwc_g210_pltfm_pm_ops+0xa8): undefined reference to `ufshcd_pltfrm_runtime_suspend'
>> powerpc64-linux-ld: drivers/scsi/ufs/cdns-pltfrm.o:(.data.rel.ro.cdns_ufs_dev_pm_ops+0x18): undefined reference to `ufshcd_pltfrm_resume'
>> powerpc64-linux-ld: drivers/scsi/ufs/cdns-pltfrm.o:(.data.rel.ro.cdns_ufs_dev_pm_ops+0x58): undefined reference to `ufshcd_pltfrm_suspend'
>> powerpc64-linux-ld: drivers/scsi/ufs/cdns-pltfrm.o:(.data.rel.ro.cdns_ufs_dev_pm_ops+0x88): undefined reference to `ufshcd_pltfrm_runtime_idle'
>> powerpc64-linux-ld: drivers/scsi/ufs/cdns-pltfrm.o:(.data.rel.ro.cdns_ufs_dev_pm_ops+0x98): undefined reference to `ufshcd_pltfrm_runtime_resume'
>> powerpc64-linux-ld: drivers/scsi/ufs/cdns-pltfrm.o:(.data.rel.ro.cdns_ufs_dev_pm_ops+0xa8): undefined reference to `ufshcd_pltfrm_runtime_suspend'
>> powerpc64-linux-ld: drivers/scsi/ufs/ufs-exynos.o:(.data.rel.ro.exynos_ufs_pm_ops+0x18): undefined reference to `ufshcd_pltfrm_resume'
>> powerpc64-linux-ld: drivers/scsi/ufs/ufs-exynos.o:(.data.rel.ro.exynos_ufs_pm_ops+0x58): undefined reference to `ufshcd_pltfrm_suspend'
>> powerpc64-linux-ld: drivers/scsi/ufs/ufs-exynos.o:(.data.rel.ro.exynos_ufs_pm_ops+0x88): undefined reference to `ufshcd_pltfrm_runtime_idle'
>> powerpc64-linux-ld: drivers/scsi/ufs/ufs-exynos.o:(.data.rel.ro.exynos_ufs_pm_ops+0x98): undefined reference to `ufshcd_pltfrm_runtime_resume'
>> powerpc64-linux-ld: drivers/scsi/ufs/ufs-exynos.o:(.data.rel.ro.exynos_ufs_pm_ops+0xa8): undefined reference to `ufshcd_pltfrm_runtime_suspend'
>> powerpc64-linux-ld: drivers/scsi/ufs/ufs-hisi.o:(.data.rel.ro.ufs_hisi_pm_ops+0x18): undefined reference to `ufshcd_pltfrm_resume'
>> powerpc64-linux-ld: drivers/scsi/ufs/ufs-hisi.o:(.data.rel.ro.ufs_hisi_pm_ops+0x58): undefined reference to `ufshcd_pltfrm_suspend'
>> powerpc64-linux-ld: drivers/scsi/ufs/ufs-hisi.o:(.data.rel.ro.ufs_hisi_pm_ops+0x88): undefined reference to `ufshcd_pltfrm_runtime_idle'
>> powerpc64-linux-ld: drivers/scsi/ufs/ufs-hisi.o:(.data.rel.ro.ufs_hisi_pm_ops+0x98): undefined reference to `ufshcd_pltfrm_runtime_resume'
>> powerpc64-linux-ld: drivers/scsi/ufs/ufs-hisi.o:(.data.rel.ro.ufs_hisi_pm_ops+0xa8): undefined reference to `ufshcd_pltfrm_runtime_suspend'

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org

#6 lore raw

PATCH v2 2/3 ufs: Rename the second ufshcd_probe_hba() argument

In reply to Bart Van Assche

Rename the second argument of ufshcd_probe_hba() such that the name of that argument reflects its purpose instead of how the function is called. See also commit 1b9e21412f72 ("scsi: ufs: Split ufshcd_probe_hba() based on its called flow").

---
 drivers/scsi/ufs/ufshcd.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/scsi/ufs/ufshcd.c +4 -4
index f097720b6b5e..fb493533c034 100644
@@ -7964,13 +7964,13 @@ static int ufshcd_clear_ua_wluns(struct ufs_hba *hba)
 }
 
 /**
- * ufshcd_probe_hba - probe hba to detect device and initialize
+ * ufshcd_probe_hba - probe hba to detect device and initialize it
  * @hba: per-adapter instance
- * @async: asynchronous execution or not
+ * @init_dev_params: whether or not to call ufshcd_device_params_init().
  *
  * Execute link-startup and verify device initialization
  */
-static int ufshcd_probe_hba(struct ufs_hba *hba, bool async)
+static int ufshcd_probe_hba(struct ufs_hba *hba, bool init_dev_params)
 {
 	int ret;
 	unsigned long flags;
@@ -8002,7 +8002,7 @@ static int ufshcd_probe_hba(struct ufs_hba *hba, bool async)
 	 * Initialize UFS device parameters used by driver, these
 	 * parameters are associated with UFS descriptors.
 	 */
-	if (async) {
+	if (init_dev_params) {
 		ret = ufshcd_device_params_init(hba);
 		if (ret)
 			goto out;
Reviewed-by on v2 2/3
#7 lore raw

Re: [PATCH v2 2/3] ufs: Rename the second ufshcd_probe_hba() argument

Quoted 15 lines · Bart Van Assche

Rename the second argument of ufshcd_probe_hba() such that the name of

that argument reflects its purpose instead of how the function is called.

See also commit 1b9e21412f72 ("scsi: ufs: Split ufshcd_probe_hba() based

on its called flow").

Quoted 7 lines
Cc Bean Huo <[email protected]>
Cc Asutosh Das <[email protected]>
Cc Can Guo <[email protected]>

Thanks for change.

#8 lore raw

PATCH v2 3/3 ufs: Remove ufshcd_valid_tag()

In reply to Bart Van Assche

scsi_add_host() allocates shost->can_queue tags. ufshcd_init() sets shost->can_queue to hba->nutrs. In other words, we know that tag values will be in the range [0, hba->nutrs). Hence remove the checks that verify that blk_get_request() returns a tag in this range. This check was introduced by commit 14497328b6a6 ("scsi: ufs: verify command tag validity").

Cc Alim Akhtar <[email protected]>
Cc Avri Altman <[email protected]>
Cc Gilad Broner <[email protected]>
Cc Yaniv Gardi <[email protected]>
Cc Subhash Jadavani <[email protected]>
Cc Dolev Raviv <[email protected]>
---
 drivers/scsi/ufs/ufshcd.c | 40 ++++++---------------------------------
 1 file changed, 6 insertions(+), 34 deletions(-)
drivers/scsi/ufs/ufshcd.c +6 -34
index fb493533c034..64a24fb7da27 100644
@@ -253,11 +253,6 @@ static inline void ufshcd_wb_toggle_flush(struct ufs_hba *hba, bool enable);
 static void ufshcd_hba_vreg_set_lpm(struct ufs_hba *hba);
 static void ufshcd_hba_vreg_set_hpm(struct ufs_hba *hba);
 
-static inline bool ufshcd_valid_tag(struct ufs_hba *hba, int tag)
-{
-	return tag >= 0 && tag < hba->nutrs;
-}
-
 static inline void ufshcd_enable_irq(struct ufs_hba *hba)
 {
 	if (!hba->is_irq_enabled) {
@@ -2701,21 +2696,11 @@ static void ufshcd_init_lrb(struct ufs_hba *hba, struct ufshcd_lrb *lrb, int i)
  */
 static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd)
 {
+	struct ufs_hba *hba = shost_priv(host);
+	int tag = cmd->request->tag;
 	struct ufshcd_lrb *lrbp;
-	struct ufs_hba *hba;
-	int tag;
 	int err = 0;
 
-	hba = shost_priv(host);
-
-	tag = cmd->request->tag;
-	if (!ufshcd_valid_tag(hba, tag)) {
-		dev_err(hba->dev,
-			"%s: invalid command tag %d: cmd=0x%p, cmd->request=0x%p",
-			__func__, tag, cmd, cmd->request);
-		BUG();
-	}
-
 	if (!down_read_trylock(&hba->clk_scaling_lock))
 		return SCSI_MLQUEUE_HOST_BUSY;
 
@@ -2968,7 +2953,6 @@ static int ufshcd_exec_dev_cmd(struct ufs_hba *hba,
 		goto out_unlock;
 	}
 	tag = req->tag;
-	WARN_ON_ONCE(!ufshcd_valid_tag(hba, tag));
 
 	if (unlikely(test_bit(tag, &hba->outstanding_reqs))) {
 		err = -EBUSY;
@@ -6675,7 +6659,6 @@ static int ufshcd_issue_devman_upiu_cmd(struct ufs_hba *hba,
 		goto out_unlock;
 	}
 	tag = req->tag;
-	WARN_ON_ONCE(!ufshcd_valid_tag(hba, tag));
 
 	if (unlikely(test_bit(tag, &hba->outstanding_reqs))) {
 		err = -EBUSY;
@@ -6978,25 +6961,14 @@ static int ufshcd_try_to_abort_task(struct ufs_hba *hba, int tag)
  */
 static int ufshcd_abort(struct scsi_cmnd *cmd)
 {
-	struct Scsi_Host *host;
-	struct ufs_hba *hba;
+	struct Scsi_Host *host = cmd->device->host;
+	struct ufs_hba *hba = shost_priv(host);
+	unsigned int tag = cmd->request->tag;
+	struct ufshcd_lrb *lrbp = &hba->lrb[tag];
 	unsigned long flags;
-	unsigned int tag;
 	int err = 0;
-	struct ufshcd_lrb *lrbp;
 	u32 reg;
 
-	host = cmd->device->host;
-	hba = shost_priv(host);
-	tag = cmd->request->tag;
-	lrbp = &hba->lrb[tag];
-	if (!ufshcd_valid_tag(hba, tag)) {
-		dev_err(hba->dev,
-			"%s: invalid command tag %d: cmd=0x%p, cmd->request=0x%p",
-			__func__, tag, cmd, cmd->request);
-		BUG();
-	}
-
 	ufshcd_hold(hba, false);
 	reg = ufshcd_readl(hba, REG_UTP_TRANSFER_REQ_DOOR_BELL);
 	/* If command is already aborted/completed, return SUCCESS */