linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2] mmc: sdhci-sprd: Wait until DLL locked after being configured
@ 2021-09-26  9:28 Chunyan Zhang
  2021-09-27  5:48 ` Adrian Hunter
  2021-09-27 22:32 ` Ulf Hansson
  0 siblings, 2 replies; 3+ messages in thread
From: Chunyan Zhang @ 2021-09-26  9:28 UTC (permalink / raw)
  To: Ulf Hansson, Adrian Hunter
  Cc: linux-mmc, Baolin Wang, Orson Zhai, Chunyan Zhang, Chunyan Zhang,
	zhenxiong.lai, yuelin.tang, LKML

From: Zhenxiong Lai <zhenxiong.lai@unisoc.com>

According to the specification, DLL status has to be locked before using it.

Signed-off-by: Zhenxiong Lai <zhenxiong.lai@unisoc.com>
Signed-off-by: Chunyan Zhang <chunyan.zhang@unisoc.com>
---
Changes since v1:
* Use read_poll_timeout() instead of while loop.
---
 drivers/mmc/host/sdhci-sprd.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/drivers/mmc/host/sdhci-sprd.c b/drivers/mmc/host/sdhci-sprd.c
index 11e375579cfb..f33e9349e4e6 100644
--- a/drivers/mmc/host/sdhci-sprd.c
+++ b/drivers/mmc/host/sdhci-sprd.c
@@ -8,6 +8,7 @@
 #include <linux/delay.h>
 #include <linux/dma-mapping.h>
 #include <linux/highmem.h>
+#include <linux/iopoll.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
@@ -39,6 +40,9 @@
 #define  SDHCI_SPRD_BIT_POSRD_DLY_INV		BIT(21)
 #define  SDHCI_SPRD_BIT_NEGRD_DLY_INV		BIT(29)
 
+#define SDHCI_SPRD_REG_32_DLL_STS0	0x210
+#define SDHCI_SPRD_DLL_LOCKED		BIT(18)
+
 #define SDHCI_SPRD_REG_32_BUSY_POSI		0x250
 #define  SDHCI_SPRD_BIT_OUTR_CLK_AUTO_EN	BIT(25)
 #define  SDHCI_SPRD_BIT_INNR_CLK_AUTO_EN	BIT(24)
@@ -256,6 +260,15 @@ static void sdhci_sprd_enable_phy_dll(struct sdhci_host *host)
 	sdhci_writel(host, tmp, SDHCI_SPRD_REG_32_DLL_CFG);
 	/* wait 1ms */
 	usleep_range(1000, 1250);
+
+	if (read_poll_timeout(sdhci_readl, tmp, (tmp & SDHCI_SPRD_DLL_LOCKED),
+		2000, USEC_PER_SEC, false, host, SDHCI_SPRD_REG_32_DLL_STS0)) {
+		pr_err("%s: DLL locked fail!\n", mmc_hostname(host->mmc));
+		pr_info("%s: DLL_STS0 : 0x%x, DLL_CFG : 0x%x\n",
+			 mmc_hostname(host->mmc),
+			 sdhci_readl(host, SDHCI_SPRD_REG_32_DLL_STS0),
+			 sdhci_readl(host, SDHCI_SPRD_REG_32_DLL_CFG));
+	}
 }
 
 static void sdhci_sprd_set_clock(struct sdhci_host *host, unsigned int clock)
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH v2] mmc: sdhci-sprd: Wait until DLL locked after being configured
  2021-09-26  9:28 [PATCH v2] mmc: sdhci-sprd: Wait until DLL locked after being configured Chunyan Zhang
@ 2021-09-27  5:48 ` Adrian Hunter
  2021-09-27 22:32 ` Ulf Hansson
  1 sibling, 0 replies; 3+ messages in thread
From: Adrian Hunter @ 2021-09-27  5:48 UTC (permalink / raw)
  To: Chunyan Zhang, Ulf Hansson
  Cc: linux-mmc, Baolin Wang, Orson Zhai, Chunyan Zhang, zhenxiong.lai,
	yuelin.tang, LKML

On 26/09/21 12:28 pm, Chunyan Zhang wrote:
> From: Zhenxiong Lai <zhenxiong.lai@unisoc.com>
> 
> According to the specification, DLL status has to be locked before using it.
> 
> Signed-off-by: Zhenxiong Lai <zhenxiong.lai@unisoc.com>
> Signed-off-by: Chunyan Zhang <chunyan.zhang@unisoc.com>

Acked-by: Adrian Hunter <adrian.hunter@intel.com>

> ---
> Changes since v1:
> * Use read_poll_timeout() instead of while loop.
> ---
>  drivers/mmc/host/sdhci-sprd.c | 13 +++++++++++++
>  1 file changed, 13 insertions(+)
> 
> diff --git a/drivers/mmc/host/sdhci-sprd.c b/drivers/mmc/host/sdhci-sprd.c
> index 11e375579cfb..f33e9349e4e6 100644
> --- a/drivers/mmc/host/sdhci-sprd.c
> +++ b/drivers/mmc/host/sdhci-sprd.c
> @@ -8,6 +8,7 @@
>  #include <linux/delay.h>
>  #include <linux/dma-mapping.h>
>  #include <linux/highmem.h>
> +#include <linux/iopoll.h>
>  #include <linux/module.h>
>  #include <linux/of.h>
>  #include <linux/of_device.h>
> @@ -39,6 +40,9 @@
>  #define  SDHCI_SPRD_BIT_POSRD_DLY_INV		BIT(21)
>  #define  SDHCI_SPRD_BIT_NEGRD_DLY_INV		BIT(29)
>  
> +#define SDHCI_SPRD_REG_32_DLL_STS0	0x210
> +#define SDHCI_SPRD_DLL_LOCKED		BIT(18)
> +
>  #define SDHCI_SPRD_REG_32_BUSY_POSI		0x250
>  #define  SDHCI_SPRD_BIT_OUTR_CLK_AUTO_EN	BIT(25)
>  #define  SDHCI_SPRD_BIT_INNR_CLK_AUTO_EN	BIT(24)
> @@ -256,6 +260,15 @@ static void sdhci_sprd_enable_phy_dll(struct sdhci_host *host)
>  	sdhci_writel(host, tmp, SDHCI_SPRD_REG_32_DLL_CFG);
>  	/* wait 1ms */
>  	usleep_range(1000, 1250);
> +
> +	if (read_poll_timeout(sdhci_readl, tmp, (tmp & SDHCI_SPRD_DLL_LOCKED),
> +		2000, USEC_PER_SEC, false, host, SDHCI_SPRD_REG_32_DLL_STS0)) {
> +		pr_err("%s: DLL locked fail!\n", mmc_hostname(host->mmc));
> +		pr_info("%s: DLL_STS0 : 0x%x, DLL_CFG : 0x%x\n",
> +			 mmc_hostname(host->mmc),
> +			 sdhci_readl(host, SDHCI_SPRD_REG_32_DLL_STS0),
> +			 sdhci_readl(host, SDHCI_SPRD_REG_32_DLL_CFG));
> +	}
>  }
>  
>  static void sdhci_sprd_set_clock(struct sdhci_host *host, unsigned int clock)
> 


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH v2] mmc: sdhci-sprd: Wait until DLL locked after being configured
  2021-09-26  9:28 [PATCH v2] mmc: sdhci-sprd: Wait until DLL locked after being configured Chunyan Zhang
  2021-09-27  5:48 ` Adrian Hunter
@ 2021-09-27 22:32 ` Ulf Hansson
  1 sibling, 0 replies; 3+ messages in thread
From: Ulf Hansson @ 2021-09-27 22:32 UTC (permalink / raw)
  To: Chunyan Zhang
  Cc: Adrian Hunter, linux-mmc, Baolin Wang, Orson Zhai, Chunyan Zhang,
	zhenxiong.lai, yuelin.tang, LKML

On Sun, 26 Sept 2021 at 11:28, Chunyan Zhang <zhang.lyra@gmail.com> wrote:
>
> From: Zhenxiong Lai <zhenxiong.lai@unisoc.com>
>
> According to the specification, DLL status has to be locked before using it.
>
> Signed-off-by: Zhenxiong Lai <zhenxiong.lai@unisoc.com>
> Signed-off-by: Chunyan Zhang <chunyan.zhang@unisoc.com>

Applied for next, thanks!

Kind regards
Uffe


> ---
> Changes since v1:
> * Use read_poll_timeout() instead of while loop.
> ---
>  drivers/mmc/host/sdhci-sprd.c | 13 +++++++++++++
>  1 file changed, 13 insertions(+)
>
> diff --git a/drivers/mmc/host/sdhci-sprd.c b/drivers/mmc/host/sdhci-sprd.c
> index 11e375579cfb..f33e9349e4e6 100644
> --- a/drivers/mmc/host/sdhci-sprd.c
> +++ b/drivers/mmc/host/sdhci-sprd.c
> @@ -8,6 +8,7 @@
>  #include <linux/delay.h>
>  #include <linux/dma-mapping.h>
>  #include <linux/highmem.h>
> +#include <linux/iopoll.h>
>  #include <linux/module.h>
>  #include <linux/of.h>
>  #include <linux/of_device.h>
> @@ -39,6 +40,9 @@
>  #define  SDHCI_SPRD_BIT_POSRD_DLY_INV          BIT(21)
>  #define  SDHCI_SPRD_BIT_NEGRD_DLY_INV          BIT(29)
>
> +#define SDHCI_SPRD_REG_32_DLL_STS0     0x210
> +#define SDHCI_SPRD_DLL_LOCKED          BIT(18)
> +
>  #define SDHCI_SPRD_REG_32_BUSY_POSI            0x250
>  #define  SDHCI_SPRD_BIT_OUTR_CLK_AUTO_EN       BIT(25)
>  #define  SDHCI_SPRD_BIT_INNR_CLK_AUTO_EN       BIT(24)
> @@ -256,6 +260,15 @@ static void sdhci_sprd_enable_phy_dll(struct sdhci_host *host)
>         sdhci_writel(host, tmp, SDHCI_SPRD_REG_32_DLL_CFG);
>         /* wait 1ms */
>         usleep_range(1000, 1250);
> +
> +       if (read_poll_timeout(sdhci_readl, tmp, (tmp & SDHCI_SPRD_DLL_LOCKED),
> +               2000, USEC_PER_SEC, false, host, SDHCI_SPRD_REG_32_DLL_STS0)) {
> +               pr_err("%s: DLL locked fail!\n", mmc_hostname(host->mmc));
> +               pr_info("%s: DLL_STS0 : 0x%x, DLL_CFG : 0x%x\n",
> +                        mmc_hostname(host->mmc),
> +                        sdhci_readl(host, SDHCI_SPRD_REG_32_DLL_STS0),
> +                        sdhci_readl(host, SDHCI_SPRD_REG_32_DLL_CFG));
> +       }
>  }
>
>  static void sdhci_sprd_set_clock(struct sdhci_host *host, unsigned int clock)
> --
> 2.25.1
>

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-09-27 22:32 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-26  9:28 [PATCH v2] mmc: sdhci-sprd: Wait until DLL locked after being configured Chunyan Zhang
2021-09-27  5:48 ` Adrian Hunter
2021-09-27 22:32 ` Ulf Hansson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).