scsi: ufs: ufs-mediatek: Introduce default delay for reference clock

Introduce default delay time for gating or ungating reference clock instead
of ambiguous magic numbers.

The defined value is suitable for all current MediaTek UFS platforms.

Link: https://lore.kernel.org/r/20211016005802.7729-2-stanley.chu@mediatek.com
Signed-off-by: Stanley Chu <stanley.chu@mediatek.com>
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 d1696db70ce8df18cd6b27756204f007ca63635a..2c7d12a30493f4678cea3328c2a76f4dc59bc3c7 100644 (file)
--- a/drivers/scsi/ufs/ufs-mediatek.c
+++ b/drivers/scsi/ufs/ufs-mediatek.c
@@ -282,7 +282,7 @@ out:
 }
 
 static void ufs_mtk_setup_ref_clk_wait_us(struct ufs_hba *hba,
-                                         u16 gating_us, u16 ungating_us)
+                                         u16 gating_us)
 {
        struct ufs_mtk_host *host = ufshcd_get_variant(hba);
 
@@ -293,7 +293,7 @@ static void ufs_mtk_setup_ref_clk_wait_us(struct ufs_hba *hba,
                host->ref_clk_gating_wait_us = gating_us;
        }
 
-       host->ref_clk_ungating_wait_us = ungating_us;
+       host->ref_clk_ungating_wait_us = REFCLK_DEFAULT_WAIT_US;
 }
 
 static void ufs_mtk_dbg_sel(struct ufs_hba *hba)
@@ -1102,11 +1102,14 @@ static int ufs_mtk_apply_dev_quirks(struct ufs_hba *hba)
         * requirements.
         */
        if (mid == UFS_VENDOR_SAMSUNG)
-               ufs_mtk_setup_ref_clk_wait_us(hba, 1, 1);
+               ufs_mtk_setup_ref_clk_wait_us(hba, 1);
        else if (mid == UFS_VENDOR_SKHYNIX)
-               ufs_mtk_setup_ref_clk_wait_us(hba, 30, 30);
+               ufs_mtk_setup_ref_clk_wait_us(hba, 30);
        else if (mid == UFS_VENDOR_TOSHIBA)
-               ufs_mtk_setup_ref_clk_wait_us(hba, 100, 32);
+               ufs_mtk_setup_ref_clk_wait_us(hba, 100);
+       else
+               ufs_mtk_setup_ref_clk_wait_us(hba,
+                                             REFCLK_DEFAULT_WAIT_US);
 
        return 0;
 }

diff --git a/drivers/scsi/ufs/ufs-mediatek.h b/drivers/scsi/ufs/ufs-mediatek.h
index c96b9b529ee2efdaa363659d989e9187a1111739..414dca86c09ff6d58f4c7cc22c68436d31fcaae1 100644 (file)
--- a/drivers/scsi/ufs/ufs-mediatek.h
+++ b/drivers/scsi/ufs/ufs-mediatek.h
@@ -34,6 +34,7 @@
 #define REFCLK_ACK                  BIT(1)
 
 #define REFCLK_REQ_TIMEOUT_US       3000
+#define REFCLK_DEFAULT_WAIT_US      32
 
 /*
  * Other attributes