scsi: ufs: core: Reuse device management locking code

Group those 3 calls that repeat for every device management command into
lock and unlock handlers.

Reviewed-by: Bean Huo <beanhuo@micron.com>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Avri Altman <avri.altman@wdc.com>
Link: https://lore.kernel.org/r/20240309081104.5006-2-avri.altman@wdc.com
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
index e30fd125988d7a8ca521d6fb30e97c671f269732..cdd9a5100f8547c75b74564e02ac0f4d3d77d174 100644 (file)
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -3274,6 +3274,20 @@ retry:
        return err;
 }
 
+static void ufshcd_dev_man_lock(struct ufs_hba *hba)
+{
+       ufshcd_hold(hba);
+       mutex_lock(&hba->dev_cmd.lock);
+       down_read(&hba->clk_scaling_lock);
+}
+
+static void ufshcd_dev_man_unlock(struct ufs_hba *hba)
+{
+       up_read(&hba->clk_scaling_lock);
+       mutex_unlock(&hba->dev_cmd.lock);
+       ufshcd_release(hba);
+}
+
 /**
  * ufshcd_exec_dev_cmd - API for sending device management requests
  * @hba: UFS hba
@@ -3296,8 +3310,6 @@ static int ufshcd_exec_dev_cmd(struct ufs_hba *hba,
        /* Protects use of hba->reserved_slot. */
        lockdep_assert_held(&hba->dev_cmd.lock);
 
-       down_read(&hba->clk_scaling_lock);
-
        lrbp = &hba->lrb[tag];
        lrbp->cmd = NULL;
        err = ufshcd_compose_dev_cmd(hba, lrbp, cmd_type, tag);
@@ -3314,7 +3326,6 @@ static int ufshcd_exec_dev_cmd(struct ufs_hba *hba,
                                    (struct utp_upiu_req *)lrbp->ucd_rsp_ptr);
 
 out:
-       up_read(&hba->clk_scaling_lock);
        return err;
 }
 
@@ -3385,8 +3396,8 @@ int ufshcd_query_flag(struct ufs_hba *hba, enum query_opcode opcode,
 
        BUG_ON(!hba);
 
-       ufshcd_hold(hba);
-       mutex_lock(&hba->dev_cmd.lock);
+       ufshcd_dev_man_lock(hba);
+
        ufshcd_init_query(hba, &request, &response, opcode, idn, index,
                        selector);
 
@@ -3428,8 +3439,7 @@ int ufshcd_query_flag(struct ufs_hba *hba, enum query_opcode opcode,
                                MASK_QUERY_UPIU_FLAG_LOC) & 0x1;
 
 out_unlock:
-       mutex_unlock(&hba->dev_cmd.lock);
-       ufshcd_release(hba);
+       ufshcd_dev_man_unlock(hba);
        return err;
 }
 
@@ -3459,9 +3469,8 @@ int ufshcd_query_attr(struct ufs_hba *hba, enum query_opcode opcode,
                return -EINVAL;
        }
 
-       ufshcd_hold(hba);
+       ufshcd_dev_man_lock(hba);
 
-       mutex_lock(&hba->dev_cmd.lock);
        ufshcd_init_query(hba, &request, &response, opcode, idn, index,
                        selector);
 
@@ -3491,8 +3500,7 @@ int ufshcd_query_attr(struct ufs_hba *hba, enum query_opcode opcode,
        *attr_val = be32_to_cpu(response->upiu_res.value);
 
 out_unlock:
-       mutex_unlock(&hba->dev_cmd.lock);
-       ufshcd_release(hba);
+       ufshcd_dev_man_unlock(hba);
        return err;
 }
 
@@ -3555,9 +3563,8 @@ static int __ufshcd_query_descriptor(struct ufs_hba *hba,
                return -EINVAL;
        }
 
-       ufshcd_hold(hba);
+       ufshcd_dev_man_lock(hba);
 
-       mutex_lock(&hba->dev_cmd.lock);
        ufshcd_init_query(hba, &request, &response, opcode, idn, index,
                        selector);
        hba->dev_cmd.query.descriptor = desc_buf;
@@ -3590,8 +3597,7 @@ static int __ufshcd_query_descriptor(struct ufs_hba *hba,
 
 out_unlock:
        hba->dev_cmd.query.descriptor = NULL;
-       mutex_unlock(&hba->dev_cmd.lock);
-       ufshcd_release(hba);
+       ufshcd_dev_man_unlock(hba);
        return err;
 }
 
@@ -5072,8 +5078,8 @@ static int ufshcd_verify_dev_init(struct ufs_hba *hba)
        int err = 0;
        int retries;
 
-       ufshcd_hold(hba);
-       mutex_lock(&hba->dev_cmd.lock);
+       ufshcd_dev_man_lock(hba);
+
        for (retries = NOP_OUT_RETRIES; retries > 0; retries--) {
                err = ufshcd_exec_dev_cmd(hba, DEV_CMD_TYPE_NOP,
                                          hba->nop_out_timeout);
@@ -5083,8 +5089,8 @@ static int ufshcd_verify_dev_init(struct ufs_hba *hba)
 
                dev_dbg(hba->dev, "%s: error %d retrying\n", __func__, err);
        }
-       mutex_unlock(&hba->dev_cmd.lock);
-       ufshcd_release(hba);
+
+       ufshcd_dev_man_unlock(hba);
 
        if (err)
                dev_err(hba->dev, "%s: NOP OUT failed %d\n", __func__, err);
@@ -7210,8 +7216,6 @@ static int ufshcd_issue_devman_upiu_cmd(struct ufs_hba *hba,
        /* Protects use of hba->reserved_slot. */
        lockdep_assert_held(&hba->dev_cmd.lock);
 
-       down_read(&hba->clk_scaling_lock);
-
        lrbp = &hba->lrb[tag];
        lrbp->cmd = NULL;
        lrbp->task_tag = tag;
@@ -7276,7 +7280,6 @@ static int ufshcd_issue_devman_upiu_cmd(struct ufs_hba *hba,
        ufshcd_add_query_upiu_trace(hba, err ? UFS_QUERY_ERR : UFS_QUERY_COMP,
                                    (struct utp_upiu_req *)lrbp->ucd_rsp_ptr);
 
-       up_read(&hba->clk_scaling_lock);
        return err;
 }
 
@@ -7315,13 +7318,11 @@ int ufshcd_exec_raw_upiu_cmd(struct ufs_hba *hba,
                cmd_type = DEV_CMD_TYPE_NOP;
                fallthrough;
        case UPIU_TRANSACTION_QUERY_REQ:
-               ufshcd_hold(hba);
-               mutex_lock(&hba->dev_cmd.lock);
+               ufshcd_dev_man_lock(hba);
                err = ufshcd_issue_devman_upiu_cmd(hba, req_upiu, rsp_upiu,
                                                   desc_buff, buff_len,
                                                   cmd_type, desc_op);
-               mutex_unlock(&hba->dev_cmd.lock);
-               ufshcd_release(hba);
+               ufshcd_dev_man_unlock(hba);
 
                break;
        case UPIU_TRANSACTION_TASK_REQ:
@@ -7381,9 +7382,7 @@ int ufshcd_advanced_rpmb_req_handler(struct ufs_hba *hba, struct utp_upiu_req *r
        u16 ehs_len;
 
        /* Protects use of hba->reserved_slot. */
-       ufshcd_hold(hba);
-       mutex_lock(&hba->dev_cmd.lock);
-       down_read(&hba->clk_scaling_lock);
+       ufshcd_dev_man_lock(hba);
 
        lrbp = &hba->lrb[tag];
        lrbp->cmd = NULL;
@@ -7449,9 +7448,8 @@ int ufshcd_advanced_rpmb_req_handler(struct ufs_hba *hba, struct utp_upiu_req *r
                }
        }
 
-       up_read(&hba->clk_scaling_lock);
-       mutex_unlock(&hba->dev_cmd.lock);
-       ufshcd_release(hba);
+       ufshcd_dev_man_unlock(hba);
+
        return err ? : result;
 }
 
@@ -8714,9 +8712,7 @@ static void ufshcd_set_timestamp_attr(struct ufs_hba *hba)
        if (dev_info->wspecversion < 0x400)
                return;
 
-       ufshcd_hold(hba);
-
-       mutex_lock(&hba->dev_cmd.lock);
+       ufshcd_dev_man_lock(hba);
 
        ufshcd_init_query(hba, &request, &response,
                          UPIU_QUERY_OPCODE_WRITE_ATTR,
@@ -8734,8 +8730,7 @@ static void ufshcd_set_timestamp_attr(struct ufs_hba *hba)
                dev_err(hba->dev, "%s: failed to set timestamp %d\n",
                        __func__, err);
 
-       mutex_unlock(&hba->dev_cmd.lock);
-       ufshcd_release(hba);
+       ufshcd_dev_man_unlock(hba);
 }
 
 /**