Skip to contentSkip to conversation

scsi: ufs-mediatek: Fix two defects in MediaTek UFS driver

PATCH Superseded Stanley Chu 1 participant 3 messages Oct 15, 2021 SCSI

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover scsi: ufs-mediatek: Fix two defects in MediaTek UFS driver

Hi,

This series fixes two defects in MediaTek UFS drivers.

Stanley Chu (2):
scsi: ufs-mediatek: Introduce default delay for reference clock
scsi: ufs-mediatek: Fix build error of using sched_clock()

 drivers/scsi/ufs/ufs-mediatek.c | 14 +++++++++-----
 drivers/scsi/ufs/ufs-mediatek.h |  1 +
 2 files changed, 10 insertions(+), 5 deletions(-)
Signature · 1 line
2.18.0
#1 lore raw

PATCH 1/2 scsi: 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.

---
 drivers/scsi/ufs/ufs-mediatek.c | 13 ++++++++-----
 drivers/scsi/ufs/ufs-mediatek.h |  1 +
 2 files changed, 9 insertions(+), 5 deletions(-)
drivers/scsi/ufs/ufs-mediatek.c +8 -5
index d1696db70ce8..2c7d12a30493 100644
@@ -282,7 +282,7 @@ static int ufs_mtk_setup_ref_clk(struct ufs_hba *hba, bool on)
 }
 
 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;
 }
drivers/scsi/ufs/ufs-mediatek.h +1 -0
index c96b9b529ee2..414dca86c09f 100644
@@ -34,6 +34,7 @@
 #define REFCLK_ACK                  BIT(1)
 
 #define REFCLK_REQ_TIMEOUT_US       3000
+#define REFCLK_DEFAULT_WAIT_US      32
 
 /*
  * Other attributes
Signature · 1 line
2.18.0
#2 lore raw

PATCH 2/2 scsi: ufs-mediatek: Fix build error of using sched_clock()

In reply to Stanley Chu

Add proper header for using sched_clock() in MediaTek driver.

---
 drivers/scsi/ufs/ufs-mediatek.c | 1 +
 1 file changed, 1 insertion(+)
drivers/scsi/ufs/ufs-mediatek.c +1 -0
index 2c7d12a30493..bc193ba46b31 100644
@@ -15,6 +15,7 @@
 #include <linux/platform_device.h>
 #include <linux/regulator/consumer.h>
 #include <linux/reset.h>
+#include <linux/sched/clock.h>
 #include <linux/soc/mediatek/mtk_sip_svc.h>
 
 #include "ufshcd.h"
Signature · 1 line
2.18.0