scsi: ufs: Introduce ufshcd_clkgate_delay_set()

Since the code to modify delay_ms while holding the host lock occurs twice,
introduce a function that performs this action.

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

diff --git a/drivers/scsi/ufs/ufs-mediatek.c b/drivers/scsi/ufs/ufs-mediatek.c
index 2b26acc74efbf9602c4bdeda5e996094e45e8d60..d19b3549530209106549819266d861b744206705 100644 (file)
--- a/drivers/scsi/ufs/ufs-mediatek.c
+++ b/drivers/scsi/ufs/ufs-mediatek.c
@@ -857,7 +857,6 @@ static int ufs_mtk_pre_link(struct ufs_hba *hba)
 
 static void ufs_mtk_setup_clk_gating(struct ufs_hba *hba)
 {
-       unsigned long flags;
        u32 ah_ms;
 
        if (ufshcd_is_clkgating_allowed(hba)) {
@@ -866,9 +865,7 @@ static void ufs_mtk_setup_clk_gating(struct ufs_hba *hba)
                                          hba->ahit);
                else
                        ah_ms = 10;
-               spin_lock_irqsave(hba->host->host_lock, flags);
-               hba->clk_gating.delay_ms = ah_ms + 5;
-               spin_unlock_irqrestore(hba->host->host_lock, flags);
+               ufshcd_clkgate_delay_set(hba->dev, ah_ms + 5);
        }
 }
 

diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index 254dd1e568dd2f39565ce9ce2d9ceb724b940f06..ba6b35f36bcc3fab5c8e085d3572c01cf8cc8eb7 100644 (file)
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -1864,18 +1864,26 @@ static ssize_t ufshcd_clkgate_delay_show(struct device *dev,
        return sysfs_emit(buf, "%lu\n", hba->clk_gating.delay_ms);
 }
 
+void ufshcd_clkgate_delay_set(struct device *dev, unsigned long value)
+{
+       struct ufs_hba *hba = dev_get_drvdata(dev);
+       unsigned long flags;
+
+       spin_lock_irqsave(hba->host->host_lock, flags);
+       hba->clk_gating.delay_ms = value;
+       spin_unlock_irqrestore(hba->host->host_lock, flags);
+}
+EXPORT_SYMBOL_GPL(ufshcd_clkgate_delay_set);
+
 static ssize_t ufshcd_clkgate_delay_store(struct device *dev,
                struct device_attribute *attr, const char *buf, size_t count)
 {
-       struct ufs_hba *hba = dev_get_drvdata(dev);
-       unsigned long flags, value;
+       unsigned long value;
 
        if (kstrtoul(buf, 0, &value))
                return -EINVAL;
 
-       spin_lock_irqsave(hba->host->host_lock, flags);
-       hba->clk_gating.delay_ms = value;
-       spin_unlock_irqrestore(hba->host->host_lock, flags);
+       ufshcd_clkgate_delay_set(dev, value);
        return count;
 }
 

diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h
index e9cdfbe64c09d1a7469ff1ece81c735fd1372241..af896cbde395881344709e327ee8c7fdf97951f5 100644 (file)
--- a/drivers/scsi/ufs/ufshcd.h
+++ b/drivers/scsi/ufs/ufshcd.h
@@ -1184,6 +1184,8 @@ int ufshcd_read_string_desc(struct ufs_hba *hba, u8 desc_index,
 int ufshcd_hold(struct ufs_hba *hba, bool async);
 void ufshcd_release(struct ufs_hba *hba);
 
+void ufshcd_clkgate_delay_set(struct device *dev, unsigned long value);
+
 void ufshcd_map_desc_id_to_length(struct ufs_hba *hba, enum desc_idn desc_id,
                                  int *desc_length);