Skip to contentSkip to conversation

Odroid n2 using eMMC would fail to boot up

PATCH Superseded Anand Moon 4 participants 9 messages Dec 26, 2019 – Jan 11, 2020

Subsystems (4)

v3 of 6 Superseded Latest is v6 →

lore
Share & tools
lore

Anand Moon

author
#0 lore raw

v3 cover Odroid n2 using eMMC would fail to boot up

Here are some small changes to fix booting of Odroid N2 using eMMC. Fixed the clk tunnig during mmc initialization.

Build and tested on top of below patches
[0] https://patchwork.ozlabs.org/patch/1213648/
[1] https://patchwork.ozlabs.org/patch/1213650/

Tested on below eMMC module on Odroid N2 and C2
new orange - eMMC AJNB4R 14.6 GiB MMC 5.1
old back - eMMC CGND3R 58.2 GiB MMC 5.0

Prevoius changes:
Fixed the clk tuning as per mainline kernel
[3]v1 https://patchwork.ozlabs.org/cover/1201206/
[4]v2 https://patchwork.ozlabs.org/cover/1215217/

-Anand

Anand Moon (3):
mmc: meson-gx: Fix clk phase tuning for MMC
configs: meson64: enable GIC support for G12A/G12B
board: amlogic: select PWRSEQ for all amlogic platform

 arch/arm/include/asm/arch-meson/sd_emmc.h | 14 ++++++--------
 arch/arm/mach-meson/Kconfig               |  1 +
 drivers/mmc/meson_gx_mmc.c                |  9 +++++----
 include/configs/meson64.h                 |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)
Signature · 1 line
2.24.1
author
#1 lore raw

PATCH v3 1/3 mmc: meson-gx: Fix clk phase tuning for MMC

As per mainline line kernel fix the clk tunnig phase for mmc, set Core=180, Tx=0, Rx=0 clk phase for mmc initialization.

---
Changes from previous
v2: Fix the clk phase macro to support PHASE_180
drop the wrong CLK_CORE_PHASE_MASK macro.

v1: use the mainline kernel tuning for clk tuning. Fixed the commmit messages.
Patch v1:
https://patchwork.ozlabs.org/patch/1201208/

Before these changes.

    clock is enabled (380953Hz)
    clock is enabled (25000000Hz)
After these changes
    clock is enabled (380953Hz)
    clock is enabled (25000000Hz)
    clock is enabled (52000000Hz)
Test on Odroid N2 and Odroid C2 with eMMC and microSD cards
---
 arch/arm/include/asm/arch-meson/sd_emmc.h | 14 ++++++--------
 drivers/mmc/meson_gx_mmc.c                |  9 +++++----
 2 files changed, 11 insertions(+), 12 deletions(-)
arch/arm/include/asm/arch-meson/sd_emmc.h +6 -8
index e3a72c8b66..ee20c009e2 100644
@@ -7,6 +7,7 @@
 #define __SD_EMMC_H__
 
 #include <mmc.h>
+#include <linux/bitops.h>
 
 #define SDIO_PORT_A			0
 #define SDIO_PORT_B			1
@@ -19,14 +20,11 @@
 #define   CLK_MAX_DIV			63
 #define   CLK_SRC_24M			(0 << 6)
 #define   CLK_SRC_DIV2			(1 << 6)
-#define   CLK_CO_PHASE_000		(0 << 8)
-#define   CLK_CO_PHASE_090		(1 << 8)
-#define   CLK_CO_PHASE_180		(2 << 8)
-#define   CLK_CO_PHASE_270		(3 << 8)
-#define   CLK_TX_PHASE_000		(0 << 10)
-#define   CLK_TX_PHASE_090		(1 << 10)
-#define   CLK_TX_PHASE_180		(2 << 10)
-#define   CLK_TX_PHASE_270		(3 << 10)
+
+#define   CLK_PHASE_180 		2
+#define   CLK_TX_PHASE_MASK		GENMASK(11, 10)
+#define   CLK_RX_PHASE_MASK		GENMASK(13, 12)
+
 #define   CLK_ALWAYS_ON			BIT(24)
 
 #define MESON_SD_EMMC_CFG		0x44
drivers/mmc/meson_gx_mmc.c +5 -4
index 86c1a7164a..ad697d3a5e 100644
@@ -52,10 +52,11 @@ static void meson_mmc_config_clock(struct mmc *mmc)
 	clk_div = DIV_ROUND_UP(clk, mmc->clock);
 
 	/* 180 phase core clock */
-	meson_mmc_clk |= CLK_CO_PHASE_180;
-
-	/* 180 phase tx clock */
-	meson_mmc_clk |= CLK_TX_PHASE_000;
+	meson_mmc_clk |= CLK_PHASE_180;
+	/* 000 phase rx clock */
+	meson_mmc_clk |= CLK_RX_PHASE_MASK;
+	/* 000 phase tx clock */
+	meson_mmc_clk |= CLK_TX_PHASE_MASK;
 
 	/* clock settings */
 	meson_mmc_clk |= clk_src;
Signature · 1 line
2.24.1
author
#4 lore raw

PATCH v3 2/3 configs: meson64: enable GIC support for G12A/G12B

In reply to Anand Moon

Enable GIC support for G12A/G12B platform.

---
 include/configs/meson64.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/configs/meson64.h +1 -1
index 736081277d..50707a3197 100644
@@ -8,7 +8,7 @@
 #define __MESON64_CONFIG_H
 
 /* Generic Interrupt Controller Definitions */
-#if defined(CONFIG_MESON_AXG)
+#if (defined(CONFIG_MESON_AXG) || defined(CONFIG_MESON_G12A))
 #define GICD_BASE			0xffc01000
 #define GICC_BASE			0xffc02000
 #else /* MESON GXL and GXBB */
Signature · 1 line
2.24.1
author
#7 lore raw

PATCH v3 3/3 board: amlogic: select PWRSEQ for all amlogic platform

In reply to Anand Moon

commit a10388dc6982 ("mmc: meson-gx: add support for mmc-pwrseq-emmc") introduce CONFIG_PWESEQ for power sequence for eMMC module on amlogic platform, so enable this to all amlogic boards.

---
 arch/arm/mach-meson/Kconfig | 1 +
 1 file changed, 1 insertion(+)
arch/arm/mach-meson/Kconfig +1 -0
index e29e4c0acc..513a33dae2 100644
@@ -8,6 +8,7 @@ config MESON64_COMMON
 	select DM_SERIAL
 	select SYSCON
 	select REGMAP
+	select PWRSEQ
 	select BOARD_LATE_INIT
 	imply CMD_DM
 
Signature · 1 line
2.24.1
reviewer
#2 lore raw

PATCH v3 1/3 mmc: meson-gx: Fix clk phase tuning for MMC

In reply to Anand Moon
Quoted 66 lines · Anand Moon

As per mainline line kernel fix the clk tunnig phase for mmc, set Core=180, Tx=0, Rx=0 clk phase for mmc initialization.

---
Changes from previous
v2: Fix the clk phase macro to support PHASE_180
drop the wrong CLK_CORE_PHASE_MASK macro.

v1: use the mainline kernel tuning for clk tuning. Fixed the commmit messages.
Patch v1:
https://patchwork.ozlabs.org/patch/1201208/

Before these changes.

    clock is enabled (380953Hz)
    clock is enabled (25000000Hz)
After these changes
    clock is enabled (380953Hz)
    clock is enabled (25000000Hz)
    clock is enabled (52000000Hz)
Test on Odroid N2 and Odroid C2 with eMMC and microSD cards
---
 arch/arm/include/asm/arch-meson/sd_emmc.h | 14 ++++++--------
 drivers/mmc/meson_gx_mmc.c                |  9 +++++----
 2 files changed, 11 insertions(+), 12 deletions(-)
arch/arm/include/asm/arch-meson/sd_emmc.h +6 -8
index e3a72c8b66..ee20c009e2 100644
@@ -7,6 +7,7 @@
 #define __SD_EMMC_H__
 
 #include <mmc.h>
+#include <linux/bitops.h>
 
 #define SDIO_PORT_A			0
 #define SDIO_PORT_B			1
@@ -19,14 +20,11 @@
 #define   CLK_MAX_DIV			63
 #define   CLK_SRC_24M			(0 << 6)
 #define   CLK_SRC_DIV2			(1 << 6)
-#define   CLK_CO_PHASE_000		(0 << 8)
-#define   CLK_CO_PHASE_090		(1 << 8)
-#define   CLK_CO_PHASE_180		(2 << 8)
-#define   CLK_CO_PHASE_270		(3 << 8)
-#define   CLK_TX_PHASE_000		(0 << 10)
-#define   CLK_TX_PHASE_090		(1 << 10)
-#define   CLK_TX_PHASE_180		(2 << 10)
-#define   CLK_TX_PHASE_270		(3 << 10)
+
+#define   CLK_PHASE_180 		2
+#define   CLK_TX_PHASE_MASK		GENMASK(11, 10)
+#define   CLK_RX_PHASE_MASK		GENMASK(13, 12)
+
 #define   CLK_ALWAYS_ON			BIT(24)
 
 #define MESON_SD_EMMC_CFG		0x44
drivers/mmc/meson_gx_mmc.c +0 -0
index 86c1a7164a..ad697d3a5e 100644
@@ -52,10 +52,11 @@ static void meson_mmc_config_clock(struct mmc *mmc)
 	clk_div = DIV_ROUND_UP(clk, mmc->clock);
 

drivers/mmc/meson_gx_mmc.c static void meson_mmc_config_clock(struct mmc *mmc) · line 59

Quoted 10 lines
drivers/mmc/meson_gx_mmc.c +5 -4
 	/* 180 phase core clock */
-	meson_mmc_clk |= CLK_CO_PHASE_180;
-
-	/* 180 phase tx clock */
-	meson_mmc_clk |= CLK_TX_PHASE_000;
+	meson_mmc_clk |= CLK_PHASE_180;
+	/* 000 phase rx clock */
+	meson_mmc_clk |= CLK_RX_PHASE_MASK;
+	/* 000 phase tx clock */
+	meson_mmc_clk |= CLK_TX_PHASE_MASK;

The comment on your previous version seemed correct but I think what you have implemented here is still not doing what you expect.

Quoted 3 lines
drivers/mmc/meson_gx_mmc.c +0 -0
 	/* clock settings */
 	meson_mmc_clk |= clk_src;
#5 lore raw

PATCH v3 2/3 configs: meson64: enable GIC support for G12A/G12B

In reply to Anand Moon
Quoted 14 lines · Anand Moon

Enable GIC support for G12A/G12B platform.

---
 include/configs/meson64.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/configs/meson64.h +0 -0
index 736081277d..50707a3197 100644

include/configs/meson64.h line 14

Quoted 8 lines
include/configs/meson64.h +1 -1
@@ -8,7 +8,7 @@
 #define __MESON64_CONFIG_H
 
 /* Generic Interrupt Controller Definitions */
-#if defined(CONFIG_MESON_AXG)
+#if (defined(CONFIG_MESON_AXG) || defined(CONFIG_MESON_G12A))
 #define GICD_BASE			0xffc01000
 #define GICC_BASE			0xffc02000
 #else /* MESON GXL and GXBB */

Applied this patch to u-boot-amlogic

Neil

#8 lore raw

PATCH v3 3/3 board: amlogic: select PWRSEQ for all amlogic platform

In reply to Anand Moon
Quoted 16 lines · Anand Moon

commit a10388dc6982 ("mmc: meson-gx: add support for mmc-pwrseq-emmc") introduce CONFIG_PWESEQ for power sequence for eMMC module on amlogic platform, so enable this to all amlogic boards.

---
 arch/arm/mach-meson/Kconfig | 1 +
 1 file changed, 1 insertion(+)
arch/arm/mach-meson/Kconfig +0 -0
index e29e4c0acc..513a33dae2 100644

arch/arm/mach-meson/Kconfig config MESON64_COMMON · line 14

Quoted 7 lines
arch/arm/mach-meson/Kconfig +1 -0
@@ -8,6 +8,7 @@ config MESON64_COMMON
 	select DM_SERIAL
 	select SYSCON
 	select REGMAP
+	select PWRSEQ
 	select BOARD_LATE_INIT
 	imply CMD_DM
 

Applied this patch to u-boot-amlogic

Neil

#6 lore raw

PATCH v3 2/3 configs: meson64: enable GIC support for G12A/G12B

In reply to Neil Armstrong
Quoted 5 lines

Subject: Re: [PATCHv3 2/3] configs: meson64: enable GIC support for G12A/G12B

Quoted 1 line · Anand Moon

Enable GIC support for G12A/G12B platform.

Just wonder what is GIC support in U-Boot?

Thanks,
Peng.

Quoted 25 lines
Quoted 13 lines
---
 include/configs/meson64.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/configs/meson64.h +0 -0
index 736081277d..50707a3197 100644

include/configs/meson64.h line 14

Quoted 8 lines
include/configs/meson64.h +1 -0
@@ -8,7 +8,7 @@
 #define __MESON64_CONFIG_H
 
 /* Generic Interrupt Controller Definitions */ -#if
 defined(CONFIG_MESON_AXG)
+#if (defined(CONFIG_MESON_AXG) || defined(CONFIG_MESON_G12A))
 #define GICD_BASE			0xffc01000
 #define GICC_BASE			0xffc02000
 #else /* MESON GXL and GXBB */

Applied this patch to u-boot-amlogic

Neil

author
#3 lore raw

PATCH v3 1/3 mmc: meson-gx: Fix clk phase tuning for MMC

In reply to Jerome Brunet

Hi Jerome,

Quoted 70 lines · Jerome Brunet
Quoted 66 lines · Anand Moon

As per mainline line kernel fix the clk tunnig phase for mmc, set Core=180, Tx=0, Rx=0 clk phase for mmc initialization.

---
Changes from previous
v2: Fix the clk phase macro to support PHASE_180
drop the wrong CLK_CORE_PHASE_MASK macro.

v1: use the mainline kernel tuning for clk tuning. Fixed the commmit messages.
Patch v1:
https://patchwork.ozlabs.org/patch/1201208/

Before these changes.

    clock is enabled (380953Hz)
    clock is enabled (25000000Hz)
After these changes
    clock is enabled (380953Hz)
    clock is enabled (25000000Hz)
    clock is enabled (52000000Hz)
Test on Odroid N2 and Odroid C2 with eMMC and microSD cards
---
 arch/arm/include/asm/arch-meson/sd_emmc.h | 14 ++++++--------
 drivers/mmc/meson_gx_mmc.c                |  9 +++++----
 2 files changed, 11 insertions(+), 12 deletions(-)
arch/arm/include/asm/arch-meson/sd_emmc.h +6 -8
index e3a72c8b66..ee20c009e2 100644
@@ -7,6 +7,7 @@
 #define __SD_EMMC_H__
 
 #include <mmc.h>
+#include <linux/bitops.h>
 
 #define SDIO_PORT_A                  0
 #define SDIO_PORT_B                  1
@@ -19,14 +20,11 @@
 #define   CLK_MAX_DIV                        63
 #define   CLK_SRC_24M                        (0 << 6)
 #define   CLK_SRC_DIV2                       (1 << 6)
-#define   CLK_CO_PHASE_000           (0 << 8)
-#define   CLK_CO_PHASE_090           (1 << 8)
-#define   CLK_CO_PHASE_180           (2 << 8)
-#define   CLK_CO_PHASE_270           (3 << 8)
-#define   CLK_TX_PHASE_000           (0 << 10)
-#define   CLK_TX_PHASE_090           (1 << 10)
-#define   CLK_TX_PHASE_180           (2 << 10)
-#define   CLK_TX_PHASE_270           (3 << 10)
+
+#define   CLK_PHASE_180              2
+#define   CLK_TX_PHASE_MASK          GENMASK(11, 10)
+#define   CLK_RX_PHASE_MASK          GENMASK(13, 12)
+
 #define   CLK_ALWAYS_ON                      BIT(24)
 
 #define MESON_SD_EMMC_CFG            0x44
drivers/mmc/meson_gx_mmc.c +0 -0
index 86c1a7164a..ad697d3a5e 100644
@@ -52,10 +52,11 @@ static void meson_mmc_config_clock(struct mmc *mmc)
      clk_div = DIV_ROUND_UP(clk, mmc->clock);
 
Quoted 13 lines

drivers/mmc/meson_gx_mmc.c static void meson_mmc_config_clock(struct mmc *mmc) · line 59

Quoted 10 lines
drivers/mmc/meson_gx_mmc.c +5 -4
      /* 180 phase core clock */
-     meson_mmc_clk |= CLK_CO_PHASE_180;
-
-     /* 180 phase tx clock */
-     meson_mmc_clk |= CLK_TX_PHASE_000;
+     meson_mmc_clk |= CLK_PHASE_180;
+     /* 000 phase rx clock */
+     meson_mmc_clk |= CLK_RX_PHASE_MASK;
+     /* 000 phase tx clock */
+     meson_mmc_clk |= CLK_TX_PHASE_MASK;

The comment on your previous version seemed correct but I think what you have implemented here is still not doing what you expect.

Thanks for your review. Ok I admit, I did not study the code correctly and it's wrong to set this way. Plz discard this changes it's wrong. It did not worked for some sdcards and emmc.

-Anand