From: Stanley Chu <stanley.chu@mediatek.com>
To: <linux-scsi@vger.kernel.org>, <martin.petersen@oracle.com>,
<avri.altman@wdc.com>, <alim.akhtar@samsung.com>,
<jejb@linux.ibm.com>
Cc: <beanhuo@micron.com>, <asutoshd@codeaurora.org>,
<cang@codeaurora.org>, <matthias.bgg@gmail.com>,
<bvanassche@acm.org>, <linux-mediatek@lists.infradead.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>, <kuohong.wang@mediatek.com>,
<peter.wang@mediatek.com>, <chun-hung.wu@mediatek.com>,
<andy.teng@mediatek.com>, Stanley Chu <stanley.chu@mediatek.com>
Subject: [PATCH v4 5/8] scsi: ufs-mediatek: replace all delay places by common delay function
Date: Fri, 13 Mar 2020 17:01:00 +0800 [thread overview]
Message-ID: <20200313090103.15390-6-stanley.chu@mediatek.com> (raw)
In-Reply-To: <20200313090103.15390-1-stanley.chu@mediatek.com>
A common delay function is introduced in UFS core driver, thus
ufs-mediatek can use it to replace all delay codes.
Signed-off-by: Stanley Chu <stanley.chu@mediatek.com>
---
drivers/scsi/ufs/ufs-mediatek.c | 21 +++++----------------
1 file changed, 5 insertions(+), 16 deletions(-)
diff --git a/drivers/scsi/ufs/ufs-mediatek.c b/drivers/scsi/ufs/ufs-mediatek.c
index 3b0e575d7460..0ff6781654fd 100644
--- a/drivers/scsi/ufs/ufs-mediatek.c
+++ b/drivers/scsi/ufs/ufs-mediatek.c
@@ -100,17 +100,6 @@ static int ufs_mtk_bind_mphy(struct ufs_hba *hba)
return err;
}
-static void ufs_mtk_udelay(unsigned long us)
-{
- if (!us)
- return;
-
- if (us < 10)
- udelay(us);
- else
- usleep_range(us, us + 10);
-}
-
static int ufs_mtk_setup_ref_clk(struct ufs_hba *hba, bool on)
{
struct ufs_mtk_host *host = ufshcd_get_variant(hba);
@@ -123,7 +112,7 @@ static int ufs_mtk_setup_ref_clk(struct ufs_hba *hba, bool on)
if (on) {
ufs_mtk_ref_clk_notify(on, res);
- ufs_mtk_udelay(host->ref_clk_ungating_wait_us);
+ ufshcd_wait_us(host->ref_clk_ungating_wait_us, 10, true);
ufshcd_writel(hba, REFCLK_REQUEST, REG_UFS_REFCLK_CTRL);
} else {
ufshcd_writel(hba, REFCLK_RELEASE, REG_UFS_REFCLK_CTRL);
@@ -138,7 +127,7 @@ static int ufs_mtk_setup_ref_clk(struct ufs_hba *hba, bool on)
if (((value & REFCLK_ACK) >> 1) == (value & REFCLK_REQUEST))
goto out;
- usleep_range(100, 200);
+ ufshcd_wait_us(100, 100, true);
} while (time_before(jiffies, timeout));
dev_err(hba->dev, "missing ack of refclk req, reg: 0x%x\n", value);
@@ -150,7 +139,7 @@ static int ufs_mtk_setup_ref_clk(struct ufs_hba *hba, bool on)
out:
host->ref_clk_enabled = on;
if (!on) {
- ufs_mtk_udelay(host->ref_clk_gating_wait_us);
+ ufshcd_wait_us(host->ref_clk_gating_wait_us, 10, true);
ufs_mtk_ref_clk_notify(on, res);
}
@@ -430,12 +419,12 @@ static void ufs_mtk_device_reset(struct ufs_hba *hba)
*
* To be on safe side, keep the reset low for at least 10us.
*/
- usleep_range(10, 15);
+ ufshcd_wait_us(10, 5, true);
ufs_mtk_device_reset_ctrl(1, res);
/* Some devices may need time to respond to rst_n */
- usleep_range(10000, 15000);
+ ufshcd_wait_us(10000, 5000, true);
dev_info(hba->dev, "device reset done\n");
}
--
2.18.0
WARNING: multiple messages have this Message-ID (diff)
From: Stanley Chu <stanley.chu@mediatek.com>
To: <linux-scsi@vger.kernel.org>, <martin.petersen@oracle.com>,
<avri.altman@wdc.com>, <alim.akhtar@samsung.com>,
<jejb@linux.ibm.com>
Cc: Stanley Chu <stanley.chu@mediatek.com>,
bvanassche@acm.org, andy.teng@mediatek.com,
chun-hung.wu@mediatek.com, kuohong.wang@mediatek.com,
linux-kernel@vger.kernel.org, cang@codeaurora.org,
linux-mediatek@lists.infradead.org, peter.wang@mediatek.com,
matthias.bgg@gmail.com, beanhuo@micron.com,
linux-arm-kernel@lists.infradead.org, asutoshd@codeaurora.org
Subject: [PATCH v4 5/8] scsi: ufs-mediatek: replace all delay places by common delay function
Date: Fri, 13 Mar 2020 17:01:00 +0800 [thread overview]
Message-ID: <20200313090103.15390-6-stanley.chu@mediatek.com> (raw)
In-Reply-To: <20200313090103.15390-1-stanley.chu@mediatek.com>
A common delay function is introduced in UFS core driver, thus
ufs-mediatek can use it to replace all delay codes.
Signed-off-by: Stanley Chu <stanley.chu@mediatek.com>
---
drivers/scsi/ufs/ufs-mediatek.c | 21 +++++----------------
1 file changed, 5 insertions(+), 16 deletions(-)
diff --git a/drivers/scsi/ufs/ufs-mediatek.c b/drivers/scsi/ufs/ufs-mediatek.c
index 3b0e575d7460..0ff6781654fd 100644
--- a/drivers/scsi/ufs/ufs-mediatek.c
+++ b/drivers/scsi/ufs/ufs-mediatek.c
@@ -100,17 +100,6 @@ static int ufs_mtk_bind_mphy(struct ufs_hba *hba)
return err;
}
-static void ufs_mtk_udelay(unsigned long us)
-{
- if (!us)
- return;
-
- if (us < 10)
- udelay(us);
- else
- usleep_range(us, us + 10);
-}
-
static int ufs_mtk_setup_ref_clk(struct ufs_hba *hba, bool on)
{
struct ufs_mtk_host *host = ufshcd_get_variant(hba);
@@ -123,7 +112,7 @@ static int ufs_mtk_setup_ref_clk(struct ufs_hba *hba, bool on)
if (on) {
ufs_mtk_ref_clk_notify(on, res);
- ufs_mtk_udelay(host->ref_clk_ungating_wait_us);
+ ufshcd_wait_us(host->ref_clk_ungating_wait_us, 10, true);
ufshcd_writel(hba, REFCLK_REQUEST, REG_UFS_REFCLK_CTRL);
} else {
ufshcd_writel(hba, REFCLK_RELEASE, REG_UFS_REFCLK_CTRL);
@@ -138,7 +127,7 @@ static int ufs_mtk_setup_ref_clk(struct ufs_hba *hba, bool on)
if (((value & REFCLK_ACK) >> 1) == (value & REFCLK_REQUEST))
goto out;
- usleep_range(100, 200);
+ ufshcd_wait_us(100, 100, true);
} while (time_before(jiffies, timeout));
dev_err(hba->dev, "missing ack of refclk req, reg: 0x%x\n", value);
@@ -150,7 +139,7 @@ static int ufs_mtk_setup_ref_clk(struct ufs_hba *hba, bool on)
out:
host->ref_clk_enabled = on;
if (!on) {
- ufs_mtk_udelay(host->ref_clk_gating_wait_us);
+ ufshcd_wait_us(host->ref_clk_gating_wait_us, 10, true);
ufs_mtk_ref_clk_notify(on, res);
}
@@ -430,12 +419,12 @@ static void ufs_mtk_device_reset(struct ufs_hba *hba)
*
* To be on safe side, keep the reset low for at least 10us.
*/
- usleep_range(10, 15);
+ ufshcd_wait_us(10, 5, true);
ufs_mtk_device_reset_ctrl(1, res);
/* Some devices may need time to respond to rst_n */
- usleep_range(10000, 15000);
+ ufshcd_wait_us(10000, 5000, true);
dev_info(hba->dev, "device reset done\n");
}
--
2.18.0
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
WARNING: multiple messages have this Message-ID (diff)
From: Stanley Chu <stanley.chu@mediatek.com>
To: <linux-scsi@vger.kernel.org>, <martin.petersen@oracle.com>,
<avri.altman@wdc.com>, <alim.akhtar@samsung.com>,
<jejb@linux.ibm.com>
Cc: Stanley Chu <stanley.chu@mediatek.com>,
bvanassche@acm.org, andy.teng@mediatek.com,
chun-hung.wu@mediatek.com, kuohong.wang@mediatek.com,
linux-kernel@vger.kernel.org, cang@codeaurora.org,
linux-mediatek@lists.infradead.org, peter.wang@mediatek.com,
matthias.bgg@gmail.com, beanhuo@micron.com,
linux-arm-kernel@lists.infradead.org, asutoshd@codeaurora.org
Subject: [PATCH v4 5/8] scsi: ufs-mediatek: replace all delay places by common delay function
Date: Fri, 13 Mar 2020 17:01:00 +0800 [thread overview]
Message-ID: <20200313090103.15390-6-stanley.chu@mediatek.com> (raw)
In-Reply-To: <20200313090103.15390-1-stanley.chu@mediatek.com>
A common delay function is introduced in UFS core driver, thus
ufs-mediatek can use it to replace all delay codes.
Signed-off-by: Stanley Chu <stanley.chu@mediatek.com>
---
drivers/scsi/ufs/ufs-mediatek.c | 21 +++++----------------
1 file changed, 5 insertions(+), 16 deletions(-)
diff --git a/drivers/scsi/ufs/ufs-mediatek.c b/drivers/scsi/ufs/ufs-mediatek.c
index 3b0e575d7460..0ff6781654fd 100644
--- a/drivers/scsi/ufs/ufs-mediatek.c
+++ b/drivers/scsi/ufs/ufs-mediatek.c
@@ -100,17 +100,6 @@ static int ufs_mtk_bind_mphy(struct ufs_hba *hba)
return err;
}
-static void ufs_mtk_udelay(unsigned long us)
-{
- if (!us)
- return;
-
- if (us < 10)
- udelay(us);
- else
- usleep_range(us, us + 10);
-}
-
static int ufs_mtk_setup_ref_clk(struct ufs_hba *hba, bool on)
{
struct ufs_mtk_host *host = ufshcd_get_variant(hba);
@@ -123,7 +112,7 @@ static int ufs_mtk_setup_ref_clk(struct ufs_hba *hba, bool on)
if (on) {
ufs_mtk_ref_clk_notify(on, res);
- ufs_mtk_udelay(host->ref_clk_ungating_wait_us);
+ ufshcd_wait_us(host->ref_clk_ungating_wait_us, 10, true);
ufshcd_writel(hba, REFCLK_REQUEST, REG_UFS_REFCLK_CTRL);
} else {
ufshcd_writel(hba, REFCLK_RELEASE, REG_UFS_REFCLK_CTRL);
@@ -138,7 +127,7 @@ static int ufs_mtk_setup_ref_clk(struct ufs_hba *hba, bool on)
if (((value & REFCLK_ACK) >> 1) == (value & REFCLK_REQUEST))
goto out;
- usleep_range(100, 200);
+ ufshcd_wait_us(100, 100, true);
} while (time_before(jiffies, timeout));
dev_err(hba->dev, "missing ack of refclk req, reg: 0x%x\n", value);
@@ -150,7 +139,7 @@ static int ufs_mtk_setup_ref_clk(struct ufs_hba *hba, bool on)
out:
host->ref_clk_enabled = on;
if (!on) {
- ufs_mtk_udelay(host->ref_clk_gating_wait_us);
+ ufshcd_wait_us(host->ref_clk_gating_wait_us, 10, true);
ufs_mtk_ref_clk_notify(on, res);
}
@@ -430,12 +419,12 @@ static void ufs_mtk_device_reset(struct ufs_hba *hba)
*
* To be on safe side, keep the reset low for at least 10us.
*/
- usleep_range(10, 15);
+ ufshcd_wait_us(10, 5, true);
ufs_mtk_device_reset_ctrl(1, res);
/* Some devices may need time to respond to rst_n */
- usleep_range(10000, 15000);
+ ufshcd_wait_us(10000, 5000, true);
dev_info(hba->dev, "device reset done\n");
}
--
2.18.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-03-13 9:01 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-13 9:00 [PATCH v4 0/8] scsi: ufs: some cleanups and make the delay for host enabling customizable Stanley Chu
2020-03-13 9:00 ` Stanley Chu
2020-03-13 9:00 ` Stanley Chu
2020-03-13 9:00 ` [PATCH v4 1/8] scsi: ufs: fix uninitialized tx_lanes in ufshcd_disable_tx_lcc() Stanley Chu
2020-03-13 9:00 ` Stanley Chu
2020-03-13 9:00 ` Stanley Chu
2020-03-13 9:00 ` [PATCH v4 2/8] scsi: ufs: remove init_prefetch_data in struct ufs_hba Stanley Chu
2020-03-13 9:00 ` Stanley Chu
2020-03-13 9:00 ` Stanley Chu
2020-03-13 9:00 ` [PATCH v4 3/8] scsi: ufs: use an enum for host capabilities Stanley Chu
2020-03-13 9:00 ` Stanley Chu
2020-03-13 9:00 ` Stanley Chu
2020-03-13 9:00 ` [PATCH v4 4/8] scsi: ufs: introduce common delay function Stanley Chu
2020-03-13 9:00 ` Stanley Chu
2020-03-13 9:00 ` Stanley Chu
2020-03-13 9:01 ` Stanley Chu [this message]
2020-03-13 9:01 ` [PATCH v4 5/8] scsi: ufs-mediatek: replace all delay places by " Stanley Chu
2020-03-13 9:01 ` Stanley Chu
2020-03-13 9:01 ` [PATCH v4 6/8] scsi: ufs: allow customized delay for host enabling Stanley Chu
2020-03-13 9:01 ` Stanley Chu
2020-03-13 9:01 ` Stanley Chu
2020-03-13 9:01 ` [PATCH v4 7/8] scsi: ufs: make HCE polling more compact to improve initializatoin latency Stanley Chu
2020-03-13 9:01 ` Stanley Chu
2020-03-13 9:01 ` Stanley Chu
2020-03-13 9:01 ` [PATCH v4 8/8] scsi: ufs-mediatek: customize the delay for host enabling Stanley Chu
2020-03-13 9:01 ` Stanley Chu
2020-03-13 9:01 ` Stanley Chu
2020-03-14 9:47 ` [PATCH v4 0/8] scsi: ufs: some cleanups and make the delay for host enabling customizable Avri Altman
2020-03-14 9:47 ` Avri Altman
2020-03-14 9:47 ` Avri Altman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200313090103.15390-6-stanley.chu@mediatek.com \
--to=stanley.chu@mediatek.com \
--cc=alim.akhtar@samsung.com \
--cc=andy.teng@mediatek.com \
--cc=asutoshd@codeaurora.org \
--cc=avri.altman@wdc.com \
--cc=beanhuo@micron.com \
--cc=bvanassche@acm.org \
--cc=cang@codeaurora.org \
--cc=chun-hung.wu@mediatek.com \
--cc=jejb@linux.ibm.com \
--cc=kuohong.wang@mediatek.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=matthias.bgg@gmail.com \
--cc=peter.wang@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.