[U-Boot] [PATCH v2 0/2] sunxi: fix eMMC stability issues on A64

[U-Boot] [PATCH v2 0/2] sunxi: fix eMMC stability issues on A64

[Vasily Khoruzhick]

eMMC seems to require new clocking mode and calibration on A64,
otherwise it is pretty unstable on some boards (e.g. Pinebook)
with some eMMCs.

v2: - improve comment about calibration for eMMC on A64
    - simplify ifdef-s around configuring delays

Vasily Khoruzhick (2):
  sunxi-mmc: use new mode on A64
  mmc: sunxi: run calibration on A64

 arch/arm/include/asm/arch-sunxi/mmc.h |  6 +++++-
 arch/arm/mach-sunxi/Kconfig           |  1 +
 drivers/mmc/sunxi_mmc.c               | 13 ++++++++++++-
 3 files changed, 18 insertions(+), 2 deletions(-)

-- 
2.17.0

[U-Boot] [PATCH v2 1/2] sunxi-mmc: use new mode on A64

[Vasily Khoruzhick]

That is necessary for using automatic calibration on A64 eMMC.

Signed-off-by: Vasily khoruzhick <anarsoul@gmail.com>
---
 arch/arm/mach-sunxi/Kconfig | 1 +
 drivers/mmc/sunxi_mmc.c     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
index f0c9d1b058..376380e977 100644
--- a/arch/arm/mach-sunxi/Kconfig
+++ b/arch/arm/mach-sunxi/Kconfig
@@ -256,6 +256,7 @@ config MACH_SUN50I
 	select SUNXI_DE2
 	select SUNXI_GEN_SUN6I
 	select SUNXI_HIGH_SRAM
+	select MMC_SUNXI_HAS_NEW_MODE
 	select SUPPORT_SPL
 	select SUNXI_DRAM_DW
 	select SUNXI_DRAM_DW_32BIT
diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c
index fe6d82c7b4..65d88ee921 100644
--- a/drivers/mmc/sunxi_mmc.c
+++ b/drivers/mmc/sunxi_mmc.c
@@ -165,7 +165,7 @@ static int mmc_set_mod_clk(struct sunxi_mmc_priv *priv, unsigned int hz)
 	}
 
 	if (new_mode) {
-#ifdef CONFIG_MMC_SUNXI_HAS_NEW_MODE
+#if defined(CONFIG_MMC_SUNXI_HAS_NEW_MODE) && !defined(CONFIG_MACH_SUN50I)
 		val = CCM_MMC_CTRL_MODE_SEL_NEW;
 		setbits_le32(&priv->reg->ntsr, SUNXI_MMC_NTSR_MODE_SEL_NEW);
 #endif
-- 
2.17.0

[U-Boot] [PATCH v2 2/2] mmc: sunxi: run calibration on A64

[Vasily Khoruzhick]

Along with using new mode it fixes eMMC instability on Pinebook

Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
---
 arch/arm/include/asm/arch-sunxi/mmc.h |  6 +++++-
 drivers/mmc/sunxi_mmc.c               | 11 +++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/arch/arm/include/asm/arch-sunxi/mmc.h b/arch/arm/include/asm/arch-sunxi/mmc.h
index 1574b8e8fe..d6664a01f2 100644
--- a/arch/arm/include/asm/arch-sunxi/mmc.h
+++ b/arch/arm/include/asm/arch-sunxi/mmc.h
@@ -46,7 +46,9 @@ struct sunxi_mmc {
 	u32 cbda;		/* 0x94 */
 	u32 res2[26];
 #ifdef CONFIG_SUNXI_GEN_SUN6I
-	u32 res3[64];
+	u32 res3[17];
+	u32 samp_dl;
+	u32 res4[46];
 #endif
 	u32 fifo;		/* 0x100 / 0x200 FIFO access address */
 };
@@ -130,5 +132,7 @@ struct sunxi_mmc {
 #define SUNXI_MMC_COMMON_CLK_GATE		(1 << 16)
 #define SUNXI_MMC_COMMON_RESET			(1 << 18)
 
+#define SUNXI_MMC_CAL_DL_SW_EN		(0x1 << 7)
+
 struct mmc *sunxi_mmc_init(int sdc_no);
 #endif /* _SUNXI_MMC_H */
diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c
index 65d88ee921..542b85b592 100644
--- a/drivers/mmc/sunxi_mmc.c
+++ b/drivers/mmc/sunxi_mmc.c
@@ -223,6 +223,17 @@ static int mmc_config_clock(struct sunxi_mmc_priv *priv, struct mmc *mmc)
 	rval &= ~SUNXI_MMC_CLK_DIVIDER_MASK;
 	writel(rval, &priv->reg->clkcr);
 
+#ifdef CONFIG_MACH_SUN50I
+	/* A64 needs to run calibration on eMMC controller and we
+	 * have to set delay of zero before starting calibration.
+	 * Allwinner BSP driver sets a delay only in the case of
+	 * using HS400 which is not supported by mainline U-Boot or
+	 * Linux at the moment
+	 */
+	if (priv->mmc_no == 2)
+		writel(SUNXI_MMC_CAL_DL_SW_EN, &priv->reg->samp_dl);
+#endif
+
 	/* Re-enable Clock */
 	rval |= SUNXI_MMC_CLK_ENABLE;
 	writel(rval, &priv->reg->clkcr);
-- 
2.17.0

[U-Boot] [PATCH v2 2/2] mmc: sunxi: run calibration on A64

[Maxime Ripard]

On Mon, May 14, 2018 at 08:27:23AM -0700, Vasily Khoruzhick wrote:
> Along with using new mode it fixes eMMC instability on Pinebook
> 
> Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>

Acked-by: Maxime Ripard <maxime.ripard@bootlin.com>

Thanks!
Maxime

-- 
Maxime Ripard, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180515/a5577e49/attachment.sig>

[U-Boot] [PATCH v2 1/2] sunxi-mmc: use new mode on A64

[Maxime Ripard]

On Mon, May 14, 2018 at 08:27:22AM -0700, Vasily Khoruzhick wrote:
> That is necessary for using automatic calibration on A64 eMMC.
> 
> Signed-off-by: Vasily khoruzhick <anarsoul@gmail.com>

Acked-by: Maxime Ripard <maxime.ripard@bootlin.com>

Maxime

-- 
Maxime Ripard, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180515/647211a7/attachment.sig>

[U-Boot] [PATCH v2 0/2] sunxi: fix eMMC stability issues on A64

[Jagan Teki]

On Mon, May 14, 2018 at 8:57 PM, Vasily Khoruzhick <anarsoul@gmail.com> wrote:
> eMMC seems to require new clocking mode and calibration on A64,
> otherwise it is pretty unstable on some boards (e.g. Pinebook)
> with some eMMCs.
>
> v2: - improve comment about calibration for eMMC on A64
>     - simplify ifdef-s around configuring delays
>
> Vasily Khoruzhick (2):
>   sunxi-mmc: use new mode on A64
>   mmc: sunxi: run calibration on A64

Applied to u-boot-sunxi/master

[U-Boot] [PATCH v2 1/2] sunxi-mmc: use new mode on A64

[Jagan Teki]

On Mon, May 14, 2018 at 8:57 PM, Vasily Khoruzhick <anarsoul@gmail.com> wrote:
> That is necessary for using automatic calibration on A64 eMMC.
>
> Signed-off-by: Vasily khoruzhick <anarsoul@gmail.com>
> ---
>  arch/arm/mach-sunxi/Kconfig | 1 +
>  drivers/mmc/sunxi_mmc.c     | 2 +-
>  2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
> index f0c9d1b058..376380e977 100644
> --- a/arch/arm/mach-sunxi/Kconfig
> +++ b/arch/arm/mach-sunxi/Kconfig
> @@ -256,6 +256,7 @@ config MACH_SUN50I
>         select SUNXI_DE2
>         select SUNXI_GEN_SUN6I
>         select SUNXI_HIGH_SRAM
> +       select MMC_SUNXI_HAS_NEW_MODE
>         select SUPPORT_SPL
>         select SUNXI_DRAM_DW
>         select SUNXI_DRAM_DW_32BIT
> diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c
> index fe6d82c7b4..65d88ee921 100644
> --- a/drivers/mmc/sunxi_mmc.c
> +++ b/drivers/mmc/sunxi_mmc.c
> @@ -165,7 +165,7 @@ static int mmc_set_mod_clk(struct sunxi_mmc_priv *priv, unsigned int hz)
>         }
>
>         if (new_mode) {
> -#ifdef CONFIG_MMC_SUNXI_HAS_NEW_MODE
> +#if defined(CONFIG_MMC_SUNXI_HAS_NEW_MODE) && !defined(CONFIG_MACH_SUN50I)
>                 val = CCM_MMC_CTRL_MODE_SEL_NEW;

This is breaking eMMC boot on A64

U-Boot SPL 2018.05-00431-gf4fcaa5f15 (May 27 2018 - 23:59:42 +0530)
DRAM: 1024 MiB
Trying to boot from MMC2
unable to select a mode
mmc_load_image_raw_sector: mmc block read error
SPL: failed to boot from all boot devices
### ERROR ### Please RESET the board ###

[U-Boot] [PATCH v2 1/2] sunxi-mmc: use new mode on A64

[Vasily Khoruzhick]

You need both patches in order for it to work.

I tested these patches on Pinebook and Pine64 LTS, both were able to
boot from eMMC. What board are you using?

On Sun, May 27, 2018 at 11:43 AM, Jagan Teki <jagannadh.teki@gmail.com> wrote:
> On Mon, May 14, 2018 at 8:57 PM, Vasily Khoruzhick <anarsoul@gmail.com> wrote:
>> That is necessary for using automatic calibration on A64 eMMC.
>>
>> Signed-off-by: Vasily khoruzhick <anarsoul@gmail.com>
>> ---
>>  arch/arm/mach-sunxi/Kconfig | 1 +
>>  drivers/mmc/sunxi_mmc.c     | 2 +-
>>  2 files changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
>> index f0c9d1b058..376380e977 100644
>> --- a/arch/arm/mach-sunxi/Kconfig
>> +++ b/arch/arm/mach-sunxi/Kconfig
>> @@ -256,6 +256,7 @@ config MACH_SUN50I
>>         select SUNXI_DE2
>>         select SUNXI_GEN_SUN6I
>>         select SUNXI_HIGH_SRAM
>> +       select MMC_SUNXI_HAS_NEW_MODE
>>         select SUPPORT_SPL
>>         select SUNXI_DRAM_DW
>>         select SUNXI_DRAM_DW_32BIT
>> diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c
>> index fe6d82c7b4..65d88ee921 100644
>> --- a/drivers/mmc/sunxi_mmc.c
>> +++ b/drivers/mmc/sunxi_mmc.c
>> @@ -165,7 +165,7 @@ static int mmc_set_mod_clk(struct sunxi_mmc_priv *priv, unsigned int hz)
>>         }
>>
>>         if (new_mode) {
>> -#ifdef CONFIG_MMC_SUNXI_HAS_NEW_MODE
>> +#if defined(CONFIG_MMC_SUNXI_HAS_NEW_MODE) && !defined(CONFIG_MACH_SUN50I)
>>                 val = CCM_MMC_CTRL_MODE_SEL_NEW;
>
> This is breaking eMMC boot on A64
>
> U-Boot SPL 2018.05-00431-gf4fcaa5f15 (May 27 2018 - 23:59:42 +0530)
> DRAM: 1024 MiB
> Trying to boot from MMC2
> unable to select a mode
> mmc_load_image_raw_sector: mmc block read error
> SPL: failed to boot from all boot devices
> ### ERROR ### Please RESET the board ###

[U-Boot] [PATCH v2 1/2] sunxi-mmc: use new mode on A64

[Jagan Teki]

On Mon, May 28, 2018 at 11:13 PM, Vasily Khoruzhick <anarsoul@gmail.com> wrote:
> You need both patches in order for it to work.
>
> I tested these patches on Pinebook and Pine64 LTS, both were able to
> boot from eMMC. What board are you using?

Did you test BPI-M64? Here is the another board [1] where it failed

[1] https://patchwork.ozlabs.org/patch/921421/

Jagan.

-- 
Jagan Teki
Free Software Engineer | www.openedev.com
U-Boot, Linux | Upstream Maintainer
Hyderabad, India.

[U-Boot] [PATCH v2 1/2] sunxi-mmc: use new mode on A64

[Vasily Khoruzhick]

On Mon, May 28, 2018 at 10:04 PM, Jagan Teki <jagannadh.teki@gmail.com> wrote:
> On Mon, May 28, 2018 at 11:13 PM, Vasily Khoruzhick <anarsoul@gmail.com> wrote:
>> You need both patches in order for it to work.
>>
>> I tested these patches on Pinebook and Pine64 LTS, both were able to
>> boot from eMMC. What board are you using?
>
> Did you test BPI-M64? Here is the another board [1] where it failed

I don't have BPI-M64. Could you enable debug in drivers/mmc/mmc.c to
check why it fails to select a mode?

> [1] https://patchwork.ozlabs.org/patch/921421/
>
> Jagan.
>
> --
> Jagan Teki
> Free Software Engineer | www.openedev.com
> U-Boot, Linux | Upstream Maintainer
> Hyderabad, India.

[U-Boot] [PATCH v2 1/2] sunxi-mmc: use new mode on A64

[Vasily Khoruzhick]

On Tue, May 29, 2018 at 8:20 AM, Vasily Khoruzhick <anarsoul@gmail.com> wrote:
> On Mon, May 28, 2018 at 10:04 PM, Jagan Teki <jagannadh.teki@gmail.com> wrote:
>> On Mon, May 28, 2018 at 11:13 PM, Vasily Khoruzhick <anarsoul@gmail.com> wrote:
>>> You need both patches in order for it to work.
>>>
>>> I tested these patches on Pinebook and Pine64 LTS, both were able to
>>> boot from eMMC. What board are you using?
>>
>> Did you test BPI-M64? Here is the another board [1] where it failed
>
> I don't have BPI-M64. Could you enable debug in drivers/mmc/mmc.c to
> check why it fails to select a mode?

I found the issue. Will send v3 in a minute.

>
>> [1] https://patchwork.ozlabs.org/patch/921421/
>>
>> Jagan.
>>
>> --
>> Jagan Teki
>> Free Software Engineer | www.openedev.com
>> U-Boot, Linux | Upstream Maintainer
>> Hyderabad, India.