Add Support for eMMC boot in AM65x and J721e
Subsystems (5)
v3 cover Add Support for eMMC boot in AM65x and J721e
The following patches add support for eMMC boot in TI's Am65x and J721e devices.
v3:
1. Added a patch to fix a clash between two dummy clocks of the same name in k3-j721e-r5-common-proc-board.dtb
2. Converted the init() API patch to two patches adding deferred_probe() APIs to the mmc core and sdhci layers respectively.
3. Fixed up config_pm_pre_callback() call order in patch 9.
v2:
1. Reordered the patches according to Lokesh's preference
2. Fixed patch 2 breaking platforms where DM_MMC is not enabled.
Faiz Abbas (11):
mmc: Add a saved_clock member
mmc: Add a deferred_probe() API
sdhci: Add sdhci_deferred_probe() API
mmc: Merge SD_LEGACY and MMC_LEGACY bus modes
mmc: am654_sdhci: Update output tap delay writes
mmc: am654_sdhci: Implement workaround for card detect
spl: mmc: Fix spl_mmc_get_uboot_raw_sector() implementation
arm: K3: sysfw-loader: Add a config_pm_pre_callback()
arm: dts: k3-j721e-r5-common-proc-board: Use unique names for dummy
clocks
configs: am65x_evm: Add CONFIG_SUPPORT_EMMC_BOOT
configs: j721e_evm: Add Support for eMMC boot
arch/arm/dts/k3-am65-main.dtsi | 12 +- arch/arm/dts/k3-am654-base-board-u-boot.dtsi | 11 +- arch/arm/dts/k3-j721e-main.dtsi | 15 +- .../arm/dts/k3-j721e-r5-common-proc-board.dts | 4 +- arch/arm/mach-imx/imx8/image.c | 3 +- arch/arm/mach-k3/am6_init.c | 33 +++- arch/arm/mach-k3/include/mach/sysfw-loader.h | 2 +- arch/arm/mach-k3/j721e_init.c | 33 +++- arch/arm/mach-k3/sysfw-loader.c | 6 +- common/spl/spl_mmc.c | 11 +- configs/am65x_evm_a53_defconfig | 1 + configs/am65x_evm_r5_defconfig | 1 + configs/j721e_evm_a72_defconfig | 3 + configs/j721e_evm_r5_defconfig | 3 + drivers/mmc/am654_sdhci.c | 173 +++++++++++++----- drivers/mmc/fsl_esdhc_imx.c | 1 - drivers/mmc/mmc-uclass.c | 15 ++ drivers/mmc/mmc.c | 20 +- drivers/mmc/omap_hsmmc.c | 1 - drivers/mmc/sdhci.c | 15 ++ drivers/mmc/zynq_sdhci.c | 1 - include/configs/am65x_evm.h | 2 - include/mmc.h | 12 +- include/sdhci.h | 1 + 24 files changed, 298 insertions(+), 81 deletions(-)
Signature · 1 line
2.19.2
PATCH v3 1/11 mmc: Add a saved_clock member
Add a saved_clock member to struct mmc to store the previous clock speed in the clock needs to be stopped for some time.
--- include/mmc.h | 1 + 1 file changed, 1 insertion(+)
include/mmc.h +1 -0
@@ -603,6 +603,7 @@ struct mmc {bool clk_disable;/* true if the clock can be turned off */ uint bus_width;uint clock; +uint saved_clock;enum mmc_voltage signal_voltage;uint card_caps;uint host_caps;
Signature · 1 line
2.19.2
PATCH v3 2/11 mmc: Add a deferred_probe() API
In reply to Faiz AbbasAdd a deferred_probe() API for platforms that want to do some configurations just before starting to enumerate the device.
--- drivers/mmc/mmc-uclass.c | 15 +++++++++++++++ drivers/mmc/mmc.c | 4 +++- include/mmc.h | 10 ++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-)
drivers/mmc/mmc-uclass.c +15 -0
@@ -138,6 +138,21 @@ int mmc_host_power_cycle(struct mmc *mmc)return dm_mmc_host_power_cycle (mmc->dev); } +int dm_mmc_deferred_probe (struct udevice *dev) +{ +struct dm_mmc_ops *ops =mmc_get_ops (dev); + +if (ops->deferred_probe) +return ops->deferred_probe (dev); + +return 0 ; +} + +int mmc_deferred_probe (struct mmc *mmc) +{ +return dm_mmc_deferred_probe (mmc->dev); +} +int mmc_of_parse (struct udevice *dev,struct mmc_config *cfg) {int val;
drivers/mmc/mmc.c +3 -1
@@ -2845,7 +2845,9 @@ int mmc_start_init(struct mmc *mmc)*/ mmc->host_caps = mmc->cfg->host_caps |MMC_CAP (SD_LEGACY ) |MMC_CAP (MMC_LEGACY ) |MMC_MODE_1BIT ; - +#if CONFIG_IS_ENABLED (DM_MMC ) +mmc_deferred_probe (mmc); +#endif #if !defined(CONFIG_MMC_BROKEN_CD ) no_card =mmc_getcd (mmc) ==0 ;#else
include/mmc.h +10 -0
@@ -407,6 +407,14 @@ struct mmc; #if CONFIG_IS_ENABLED(DM_MMC) struct dm_mmc_ops { + /** + * deferred_probe() - Some configurations that need to be deferred + * to just before enumerating the device + * + * @dev: Device to init + * @return 0 if Ok, -ve if error + */ + int (*deferred_probe)(struct udevice *dev); /** * send_cmd() - Send a command to the MMC device *
@@ -490,6 +498,7 @@ int dm_mmc_get_wp(struct udevice *dev);int dm_mmc_execute_tuning (struct udevice *dev,uint opcode);int dm_mmc_wait_dat0 (struct udevice *dev,int state,int timeout_us);int dm_mmc_host_power_cycle (struct udevice *dev); +int dm_mmc_deferred_probe (struct udevice *dev);/* Transition functions for compatibility */ int mmc_set_ios (struct mmc *mmc);
@@ -499,6 +508,7 @@ int mmc_execute_tuning(struct mmc *mmc, uint opcode);int mmc_wait_dat0 (struct mmc *mmc,int state,int timeout_us);int mmc_set_enhanced_strobe (struct mmc *mmc);int mmc_host_power_cycle (struct mmc *mmc); +int mmc_deferred_probe (struct mmc *mmc);#else struct mmc_ops {
Signature · 1 line
2.19.2
PATCH v3 3/11 sdhci: Add sdhci_deferred_probe() API
In reply to Faiz AbbasAdd the sdhci_deferred_probe() function to register as the deferred_probe() callback to the mmc core. It will in turn call the deferred_probe() callback of the platform drivers as declared in the sdhci_ops.
--- drivers/mmc/sdhci.c | 15 +++++++++++++++ include/sdhci.h | 1 + 2 files changed, 16 insertions(+)
drivers/mmc/sdhci.c +15 -0
@@ -658,6 +658,20 @@ int sdhci_probe(struct udevice *dev)return sdhci_init (mmc); } +static int sdhci_deferred_probe (struct udevice *dev) +{ +int err; +struct mmc *mmc =mmc_get_mmc_dev (dev); +struct sdhci_host *host = mmc->priv; + +if (host->ops && host->ops->deferred_probe) { + err = host->ops->deferred_probe (host); +if (err) +return err; + } +return 0 ; +} +static int sdhci_get_cd (struct udevice *dev) {struct mmc *mmc =mmc_get_mmc_dev (dev);
@@ -692,6 +706,7 @@ const struct dm_mmc_ops sdhci_ops = { .send_cmd = sdhci_send_command, .set_ios = sdhci_set_ios, .get_cd = sdhci_get_cd, + .deferred_probe = sdhci_deferred_probe,#ifdef MMC_SUPPORTS_TUNING .execute_tuning = sdhci_execute_tuning,#endif
include/sdhci.h +1 -0
@@ -268,6 +268,7 @@ struct sdhci_ops {void (*set_clock)(struct sdhci_host *host,u32 div);int (*platform_execute_tuning)(struct mmc *host,u8 opcode);void (*set_delay)(struct sdhci_host *host); +int (*deferred_probe)(struct sdhci_host *host); };#if CONFIG_IS_ENABLED (MMC_SDHCI_ADMA )
Signature · 1 line
2.19.2
PATCH v3 4/11 mmc: Merge SD_LEGACY and MMC_LEGACY bus modes
In reply to Faiz AbbasMMC_LEGACY & SD_LEGACY are not differentiated timings in the spec and don't have any meaningful differences. Therefore, get rid of all references to SD_LEGACY and use MMC_LEGACY to mean both of them.
--- drivers/mmc/fsl_esdhc_imx.c | 1 - drivers/mmc/mmc.c | 16 +++++++--------- drivers/mmc/omap_hsmmc.c | 1 - drivers/mmc/zynq_sdhci.c | 1 - include/mmc.h | 1 - 5 files changed, 7 insertions(+), 13 deletions(-)
drivers/mmc/fsl_esdhc_imx.c +0 -1
@@ -743,7 +743,6 @@ static int esdhc_set_timing(struct mmc *mmc)switch (mmc->selected_mode) {case MMC_LEGACY : -case SD_LEGACY :esdhc_reset_tuning (mmc);writel (mixctrl, ®s->mixctrl);break ;
drivers/mmc/mmc.c +7 -9
@@ -132,7 +132,6 @@ const char *mmc_mode_name(enum bus_mode mode) {static const char *const names[] = { [MMC_LEGACY ] ="MMC legacy" , - [SD_LEGACY ] ="SD Legacy" , [MMC_HS ] ="MMC High Speed (26MHz)" , [SD_HS ] ="SD High Speed (50MHz)" , [UHS_SDR12 ] ="UHS SDR12 (25MHz)" ,
@@ -158,7 +157,6 @@ static uint mmc_mode2freq(struct mmc *mmc, enum bus_mode mode) {static const int freqs[] = { [MMC_LEGACY ] =25000000 , - [SD_LEGACY ] =25000000 , [MMC_HS ] =26000000 , [SD_HS ] =50000000 , [MMC_HS_52 ] =52000000 ,
@@ -1239,7 +1237,7 @@ static int sd_get_capabilities(struct mmc *mmc)u32 sd3_bus_mode;#endif - mmc->card_caps =MMC_MODE_1BIT |MMC_CAP (SD_LEGACY ); + mmc->card_caps =MMC_MODE_1BIT |MMC_CAP (MMC_LEGACY );if (mmc_host_is_spi (mmc))return 0 ;
@@ -1352,7 +1350,7 @@ static int sd_set_card_speed(struct mmc *mmc, enum bus_mode mode)return 0 ;switch (mode) { -case SD_LEGACY : +case MMC_LEGACY : speed =UHS_SDR12_BUS_SPEED ;break ;case SD_HS :
@@ -1695,7 +1693,7 @@ static const struct mode_width_tuning sd_modes_by_pref[] = { },#endif { - .mode = SD_LEGACY, + .mode = MMC_LEGACY, .widths = MMC_MODE_4BIT | MMC_MODE_1BIT, } };
@@ -1725,7 +1723,7 @@ static int sd_select_mode_and_width(struct mmc *mmc, uint card_caps)if (mmc_host_is_spi (mmc)) {mmc_set_bus_width (mmc,1 ); -mmc_select_mode (mmc,SD_LEGACY ); +mmc_select_mode (mmc,MMC_LEGACY );mmc_set_clock (mmc, mmc->tran_speed,MMC_CLK_ENABLE );return 0 ; }
@@ -1784,7 +1782,7 @@ static int sd_select_mode_and_width(struct mmc *mmc, uint card_caps) error:/* revert to a safer bus speed */ -mmc_select_mode (mmc,SD_LEGACY ); +mmc_select_mode (mmc,MMC_LEGACY );mmc_set_clock (mmc, mmc->tran_speed,MMC_CLK_ENABLE ); }
@@ -2561,7 +2559,7 @@ static int mmc_startup(struct mmc *mmc)#if CONFIG_IS_ENABLED (MMC_TINY )mmc_set_clock (mmc, mmc->legacy_speed, false); -mmc_select_mode (mmc,IS_SD (mmc) ?SD_LEGACY :MMC_LEGACY ); +mmc_select_mode (mmc,MMC_LEGACY );mmc_set_bus_width (mmc,1 );#else if (IS_SD (mmc)) {
@@ -2843,7 +2841,7 @@ int mmc_start_init(struct mmc *mmc)* all hosts are capable of 1 bit bus-width and able to use the legacy * timings. */ - mmc->host_caps = mmc->cfg->host_caps |MMC_CAP (SD_LEGACY ) | + mmc->host_caps = mmc->cfg->host_caps |MMC_CAP (MMC_LEGACY ) |MMC_CAP (MMC_LEGACY ) |MMC_MODE_1BIT ;#if CONFIG_IS_ENABLED (DM_MMC )mmc_deferred_probe (mmc);
drivers/mmc/omap_hsmmc.c +0 -1
@@ -392,7 +392,6 @@ static void omap_hsmmc_set_timing(struct mmc *mmc)break ;case MMC_LEGACY :case MMC_HS : -case SD_LEGACY :case UHS_SDR12 : val |=AC12_UHSMC_SDR12 ;break ;
drivers/mmc/zynq_sdhci.c +0 -1
@@ -37,7 +37,6 @@ struct arasan_sdhci_priv {static const u8 mode2timing[] = { [MMC_LEGACY ] =UHS_SDR12_BUS_SPEED , - [SD_LEGACY ] =UHS_SDR12_BUS_SPEED , [MMC_HS ] =HIGH_SPEED_BUS_SPEED , [SD_HS ] =HIGH_SPEED_BUS_SPEED , [MMC_HS_52 ] =HIGH_SPEED_BUS_SPEED ,
include/mmc.h +0 -1
@@ -543,7 +543,6 @@ struct sd_ssr {enum bus_mode {MMC_LEGACY , -SD_LEGACY ,MMC_HS ,SD_HS ,MMC_HS_52 ,
Signature · 1 line
2.19.2
PATCH v3 5/11 mmc: am654_sdhci: Update output tap delay writes
In reply to Faiz AbbasWith the latest RIOT, there is a different otap delay value for each speed mode. Add a new binding with every supported speed mode. Also disable a given speed mode in the host caps if its corresponding otap-del-sel is not present.
--- arch/arm/dts/k3-am65-main.dtsi | 12 +++- arch/arm/dts/k3-am654-base-board-u-boot.dtsi | 11 ++- arch/arm/dts/k3-j721e-main.dtsi | 15 ++++- drivers/mmc/am654_sdhci.c | 70 +++++++++++++++++--- 4 files changed, 95 insertions(+), 13 deletions(-)
arch/arm/dts/k3-am65-main.dtsi +11 -1
@@ -98,7 +98,17 @@ interrupts = <GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>; mmc-ddr-1_8v; mmc-hs200-1_8v; - ti,otap-del-sel = <0x2>; + ti,otap-del-sel-legacy = <0x0>; + ti,otap-del-sel-mmc-hs = <0x0>; + ti,otap-del-sel-sd-hs = <0x0>; + ti,otap-del-sel-sdr12 = <0x0>; + ti,otap-del-sel-sdr25 = <0x0>; + ti,otap-del-sel-sdr50 = <0x8>; + ti,otap-del-sel-sdr104 = <0x5>; + ti,otap-del-sel-ddr50 = <0x5>; + ti,otap-del-sel-ddr52 = <0x5>; + ti,otap-del-sel-hs200 = <0x5>; + ti,otap-del-sel-hs400 = <0x0>; ti,trm-icp = <0x8>; dma-coherent; };
arch/arm/dts/k3-am654-base-board-u-boot.dtsi +10 -1
@@ -29,7 +29,16 @@ clock-names = "clk_ahb", "clk_xin"; power-domains = <&k3_pds 48 TI_SCI_PD_EXCLUSIVE>; max-frequency = <25000000>; - ti,otap-del-sel = <0x2>; + ti,otap-del-sel-legacy = <0x0>; + ti,otap-del-sel-mmc-hs = <0x0>; + ti,otap-del-sel-sd-hs = <0x0>; + ti,otap-del-sel-sdr12 = <0x0>; + ti,otap-del-sel-sdr25 = <0x0>; + ti,otap-del-sel-sdr50 = <0x8>; + ti,otap-del-sel-sdr104 = <0x7>; + ti,otap-del-sel-ddr50 = <0x4>; + ti,otap-del-sel-ddr52 = <0x4>; + ti,otap-del-sel-hs200 = <0x7>; ti,trm-icp = <0x8>; };
arch/arm/dts/k3-j721e-main.dtsi +13 -2
@@ -232,9 +232,14 @@ assigned-clocks = <&k3_clks 91 1>; assigned-clock-parents = <&k3_clks 91 2>; bus-width = <8>; - ti,otap-del-sel = <0x2>; ti,trm-icp = <0x8>; dma-coherent; + mmc-ddr-1_8v; + ti,otap-del-sel-legacy = <0x0>; + ti,otap-del-sel-mmc-hs = <0x0>; + ti,otap-del-sel-ddr52 = <0x5>; + ti,otap-del-sel-hs200 = <0x6>; + ti,otap-del-sel-hs400 = <0x0>; }; main_sdhci1: sdhci at 4fb0000 {
@@ -246,7 +251,13 @@ clocks = <&k3_clks 92 0>, <&k3_clks 92 5>; assigned-clocks = <&k3_clks 92 0>; assigned-clock-parents = <&k3_clks 92 1>; - ti,otap-del-sel = <0x2>; + ti,otap-del-sel-legacy = <0x0>; + ti,otap-del-sel-sd-hs = <0xf>; + ti,otap-del-sel-sdr12 = <0xf>; + ti,otap-del-sel-sdr25 = <0xf>; + ti,otap-del-sel-sdr50 = <0xc>; + ti,otap-del-sel-sdr104 = <0x5>; + ti,otap-del-sel-ddr50 = <0xc>; ti,trm-icp = <0x8>; dma-coherent; };
drivers/mmc/am654_sdhci.c +61 -9
122 lines not on this page · raw message
Signature · 1 line
2.19.2
PATCH v3 6/11 mmc: am654_sdhci: Implement workaround for card detect
In reply to Faiz AbbasThe 4 bit MMC controllers have an internal debounce for the SDCD line with a debounce delay of 1 second. Therefore, after clocks to the IP are enabled, software has to wait for this time before it can power on the controller.
Add a deferred_probe() callback which polls on sdcd for a maximum of 2 seconds before switching on power to the controller or (in the case of no card) returning a ENOMEDIUM. This pushes the 1 second wait time to when the card is actually needed rather than at every probe() making sure that users who don't insert an SD card in the slot don't have to wait such a long time.
--- drivers/mmc/am654_sdhci.c | 109 ++++++++++++++++++++++++-------------- 1 file changed, 68 insertions(+), 41 deletions(-)
drivers/mmc/am654_sdhci.c +68 -41
@@ -218,44 +218,6 @@ static int am654_sdhci_set_ios_post(struct sdhci_host *host)return 0 ; } -const struct sdhci_ops am654_sdhci_ops = { - .set_ios_post = &am654_sdhci_set_ios_post, - .set_control_reg = &am654_sdhci_set_control_reg, -}; - -const struct am654_driver_data am654_drv_data = { - .ops = &am654_sdhci_ops, - .flags =IOMUX_PRESENT |FREQSEL_2_BIT |DLL_PRESENT |STRBSEL_4_BIT , -}; - -const struct am654_driver_data j721e_8bit_drv_data = { - .ops = &am654_sdhci_ops, - .flags =DLL_PRESENT , -}; - -static int j721e_4bit_sdhci_set_ios_post (struct sdhci_host *host) -{ -struct udevice *dev = host->mmc->dev; -struct am654_sdhci_plat *plat =dev_get_platdata (dev); -u32 otap_del_sel, mask, val; - - otap_del_sel = plat->otap_del_sel[host->mmc->selected_mode]; - mask =OTAPDLYENA_MASK |OTAPDLYSEL_MASK ; - val = (1 <<OTAPDLYENA_SHIFT ) | (otap_del_sel <<OTAPDLYSEL_SHIFT ); -regmap_update_bits (plat->base,PHY_CTRL4 , mask, val); - -return 0 ; -} - -const struct sdhci_ops j721e_4bit_sdhci_ops = { - .set_ios_post = &j721e_4bit_sdhci_set_ios_post, -}; - -const struct am654_driver_data j721e_4bit_drv_data = { - .ops = &j721e_4bit_sdhci_ops, - .flags =IOMUX_PRESENT , -}; -int am654_sdhci_init (struct am654_sdhci_plat *plat) {u32 ctl_cfg_2 =0 ;
@@ -302,6 +264,73 @@ int am654_sdhci_init(struct am654_sdhci_plat *plat)return 0 ; } +#define MAX_SDCD_DEBOUNCE_TIME 2000 +static int am654_sdhci_deferred_probe (struct sdhci_host *host) +{ +struct udevice *dev = host->mmc->dev; +struct am654_sdhci_plat *plat =dev_get_platdata (dev); +unsigned long start; +int val; + +/* +* The controller takes about 1 second to debounce the card detect line +* and doesn't let us power on until that time is up. Instead of waiting +* for 1 second at every stage, poll on the CARD_PRESENT bit upto a +* maximum of 2 seconds to be safe.. +*/ + start =get_timer (0 ); +do { +if (get_timer (start) >MAX_SDCD_DEBOUNCE_TIME ) +return -ENOMEDIUM ; + + val =mmc_getcd (host->mmc); + }while (!val); + +am654_sdhci_init (plat); + +return sdhci_probe (dev); +} + +const struct sdhci_ops am654_sdhci_ops = { + .deferred_probe = am654_sdhci_deferred_probe, + .set_ios_post = &am654_sdhci_set_ios_post, + .set_control_reg = &am654_sdhci_set_control_reg, +}; + +const struct am654_driver_data am654_drv_data = { + .ops = &am654_sdhci_ops, + .flags =IOMUX_PRESENT |FREQSEL_2_BIT |DLL_PRESENT |STRBSEL_4_BIT , +}; + +const struct am654_driver_data j721e_8bit_drv_data = { + .ops = &am654_sdhci_ops, + .flags =DLL_PRESENT , +}; + +static int j721e_4bit_sdhci_set_ios_post (struct sdhci_host *host) +{ +struct udevice *dev = host->mmc->dev; +struct am654_sdhci_plat *plat =dev_get_platdata (dev); +u32 otap_del_sel, mask, val; + + otap_del_sel = plat->otap_del_sel[host->mmc->selected_mode]; + mask =OTAPDLYENA_MASK |OTAPDLYSEL_MASK ; + val = (1 <<OTAPDLYENA_SHIFT ) | (otap_del_sel <<OTAPDLYSEL_SHIFT ); +regmap_update_bits (plat->base,PHY_CTRL4 , mask, val); + +return 0 ; +} + +const struct sdhci_ops j721e_4bit_sdhci_ops = { + .deferred_probe = am654_sdhci_deferred_probe, + .set_ios_post = &j721e_4bit_sdhci_set_ios_post, +}; + +const struct am654_driver_data j721e_4bit_drv_data = { + .ops = &j721e_4bit_sdhci_ops, + .flags =IOMUX_PRESENT , +}; +static int sdhci_am654_get_otap_delay (struct udevice *dev,struct mmc_config *cfg) {
@@ -375,9 +404,7 @@ static int am654_sdhci_probe(struct udevice *dev)regmap_init_mem_index (dev_ofnode (dev), &plat->base,1 ); -am654_sdhci_init (plat); - -return sdhci_probe (dev); +return 0 ; }static int am654_sdhci_ofdata_to_platdata (struct udevice *dev)
Signature · 1 line
2.19.2
PATCH v3 7/11 spl: mmc: Fix spl_mmc_get_uboot_raw_sector() implementation
In reply to Faiz AbbasThe call to spl_mmc_get_uboot_raw_sector() completely ignores and overwrites the raw_sect value passed from the caller of spl_mmc_load().
Fix this by passing raw_sect to the function and returning the same value in the default case.
--- arch/arm/mach-imx/imx8/image.c | 3 ++- common/spl/spl_mmc.c | 11 ++++------- 2 files changed, 6 insertions(+), 8 deletions(-)
arch/arm/mach-imx/imx8/image.c +2 -1
@@ -197,7 +197,8 @@ unsigned long spl_spi_get_uboot_offs(struct spi_flash *flash)#endif #ifdef CONFIG_SPL_MMC_SUPPORT -unsigned long spl_mmc_get_uboot_raw_sector (struct mmc *mmc) +unsigned long spl_mmc_get_uboot_raw_sector (struct mmc *mmc, +unsigned long raw_sect) {int end;
common/spl/spl_mmc.c +4 -7
@@ -317,13 +317,10 @@ int spl_boot_partition(const u32 boot_device) }#endif -unsigned long __weak spl_mmc_get_uboot_raw_sector (struct mmc *mmc) +unsigned long __weak spl_mmc_get_uboot_raw_sector (struct mmc *mmc, +unsigned long raw_sect) { -#ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR -return CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR ; -#else -return 0 ; -#endif +return raw_sect; } int spl_mmc_load(struct spl_image_info *spl_image,
@@ -392,7 +389,7 @@ int spl_mmc_load(struct spl_image_info *spl_image,return err; } - raw_sect =spl_mmc_get_uboot_raw_sector (mmc); + raw_sect =spl_mmc_get_uboot_raw_sector (mmc, raw_sect);#ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION err = mmc_load_image_raw_partition(spl_image, mmc, raw_part,
Signature · 1 line
2.19.2
PATCH v3 8/11 arm: K3: sysfw-loader: Add a config_pm_pre_callback()
In reply to Faiz AbbasSystem firmware does not guarantee that clocks going out of the device will be stable during power management configuration. There are some DCRC errors when SPL tries to get the next stage during eMMC boot after sysfw pm configuration.
Therefore add a config_pm_pre_callback() to switch off the eMMC clock before power management and restart it after it is done.
--- arch/arm/mach-k3/am6_init.c | 33 +++++++++++++++++++- arch/arm/mach-k3/include/mach/sysfw-loader.h | 2 +- arch/arm/mach-k3/j721e_init.c | 33 +++++++++++++++++++- arch/arm/mach-k3/sysfw-loader.c | 6 +++- 4 files changed, 70 insertions(+), 4 deletions(-)
arch/arm/mach-k3/am6_init.c +32 -1
@@ -17,6 +17,7 @@#include <dm/uclass-internal.h> #include <dm/pinctrl.h> #include <linux/soc/ti/ti_sci_protocol.h> +#include <mmc.h> #ifdef CONFIG_SPL_BUILD #ifdef CONFIG_K3_LOAD_SYSFW
@@ -86,6 +87,33 @@ static void store_boot_index_from_rom(void) bootindex = *(u32 *)(CONFIG_SYS_K3_BOOT_PARAM_TABLE_INDEX ); } +#if defined(CONFIG_K3_LOAD_SYSFW ) +void k3_mmc_stop_clock (void ) +{ +if (spl_boot_device () ==BOOT_DEVICE_MMC1 ) { +struct mmc *mmc =find_mmc_device (0 ); + +if (!mmc) +return ; + + mmc->saved_clock = mmc->clock; +mmc_set_clock (mmc,0 , true); + } +} + +void k3_mmc_restart_clock (void ) +{ +if (spl_boot_device () ==BOOT_DEVICE_MMC1 ) { +struct mmc *mmc =find_mmc_device (0 ); + +if (!mmc) +return ; + +mmc_set_clock (mmc, mmc->saved_clock, false); + } +} +#endif +void board_init_f (ulong dummy) {#if defined(CONFIG_K3_LOAD_SYSFW ) || defined(CONFIG_K3_AM654_DDRSS )
@@ -138,7 +166,10 @@ void board_init_f(ulong dummy)* callback hook, effectively switching on (or over) the console * output. */ -k3_sysfw_loader (preloader_console_init); +k3_sysfw_loader (k3_mmc_stop_clock, k3_mmc_restart_clock); + +/* Prepare console output */ +preloader_console_init ();/* Disable ROM configured firewalls right after loading sysfw */ #ifdef CONFIG_TI_SECURE_DEVICE
arch/arm/mach-k3/include/mach/sysfw-loader.h +1 -1
@@ -7,6 +7,6 @@#ifndef _SYSFW_LOADER_H_#define _SYSFW_LOADER_H_ -void k3_sysfw_loader (void (*config_pm_done_callback)(void )); +void k3_sysfw_loader (void (*config_pm_pre_callback)(void ),void (*config_pm_done_callback)(void ));#endif
arch/arm/mach-k3/j721e_init.c +32 -1
@@ -18,6 +18,7 @@#include <dm.h> #include <dm/uclass-internal.h> #include <dm/pinctrl.h> +#include <mmc.h> #ifdef CONFIG_SPL_BUILD #ifdef CONFIG_K3_LOAD_SYSFW
@@ -100,6 +101,33 @@ static void ctrl_mmr_unlock(void)mmr_unlock (CTRL_MMR0_BASE ,7 ); } +#if defined(CONFIG_K3_LOAD_SYSFW ) +void k3_mmc_stop_clock (void ) +{ +if (spl_boot_device () ==BOOT_DEVICE_MMC1 ) { +struct mmc *mmc =find_mmc_device (0 ); + +if (!mmc) +return ; + + mmc->saved_clock = mmc->clock; +mmc_set_clock (mmc,0 , true); + } +} + +void k3_mmc_restart_clock (void ) +{ +if (spl_boot_device () ==BOOT_DEVICE_MMC1 ) { +struct mmc *mmc =find_mmc_device (0 ); + +if (!mmc) +return ; + +mmc_set_clock (mmc, mmc->saved_clock, false); + } +} +#endif +/* * This uninitialized global variable would normal end up in the .bss section, * but the .bss is cleared between writing and reading this variable, so move
@@ -154,7 +182,10 @@ void board_init_f(ulong dummy)* callback hook, effectively switching on (or over) the console * output. */ -k3_sysfw_loader (preloader_console_init); +k3_sysfw_loader (k3_mmc_stop_clock, k3_mmc_restart_clock); + +/* Prepare console output */ +preloader_console_init ();/* Disable ROM configured firewalls right after loading sysfw */ #ifdef CONFIG_TI_SECURE_DEVICE
arch/arm/mach-k3/sysfw-loader.c +5 -1
@@ -197,7 +197,8 @@ exit: }#endif -void k3_sysfw_loader (void (*config_pm_done_callback)(void )) +void k3_sysfw_loader (void (*config_pm_pre_callback) (void ), +void (*config_pm_done_callback)(void )) {struct spl_image_info spl_image = {0 };struct spl_boot_device bootdev = {0 };
@@ -291,6 +292,9 @@ void k3_sysfw_loader(void (*config_pm_done_callback)(void))/* Get handle for accessing SYSFW services */ ti_sci =get_ti_sci_handle (); +if (config_pm_pre_callback) +config_pm_pre_callback (); +/* Parse and apply the different SYSFW configuration fragments */ k3_sysfw_configure_using_fit (sysfw_load_address, ti_sci);
Signature · 1 line
2.19.2
PATCH v3 9/11 arm: dts: k3-j721e-r5-common-proc-board: Use unique names for dummy clocks
In reply to Faiz AbbasUpdate the dummy clock names to use unique identifiers. Otherwise the previous node just gets overwitten by the next one with the same name. This fixes eMMC boot not working on J721e-evm.
--- arch/arm/dts/k3-j721e-r5-common-proc-board.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/dts/k3-j721e-r5-common-proc-board.dts +2 -2
@@ -34,14 +34,14 @@ u-boot,dm-spl; }; - clk_200mhz: dummy_clock { + clk_200mhz: dummy_clock_200mhz { compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <200000000>; u-boot,dm-spl; }; - clk_19_2mhz: dummy_clock { + clk_19_2mhz: dummy_clock_19_2mhz { compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <19200000>;
Signature · 1 line
2.19.2
PATCH v3 10/11 configs: am65x_evm: Add CONFIG_SUPPORT_EMMC_BOOT
In reply to Faiz AbbasWith CONFIG_SUPPORT_EMMC_BOOT moved to Kconfig, move it to defconfig files.
--- configs/am65x_evm_a53_defconfig | 1 + configs/am65x_evm_r5_defconfig | 1 + include/configs/am65x_evm.h | 2 -- 3 files changed, 2 insertions(+), 2 deletions(-)
configs/am65x_evm_a53_defconfig +1 -0
@@ -74,6 +74,7 @@ CONFIG_DM_KEYBOARD=y CONFIG_DM_MAILBOX=y CONFIG_K3_SEC_PROXY=y CONFIG_DM_MMC=y +CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ADMA=y CONFIG_SPL_MMC_SDHCI_ADMA=y
configs/am65x_evm_r5_defconfig +1 -0
@@ -73,6 +73,7 @@ CONFIG_K3_SEC_PROXY=y CONFIG_MISC=y CONFIG_K3_AVS0=y CONFIG_DM_MMC=y +CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_MMC_SDHCI=y CONFIG_SPL_MMC_SDHCI_ADMA=y CONFIG_MMC_SDHCI_AM654=y
include/configs/am65x_evm.h +0 -2
@@ -127,8 +127,6 @@#define CONFIG_SYS_MMC_ENV_PART 1#endif -#define CONFIG_SUPPORT_EMMC_BOOT -/* Now for the remaining common defines */ #include <configs/ti_armv7_common.h>
Signature · 1 line
2.19.2
PATCH v3 11/11 configs: j721e_evm: Add Support for eMMC boot
In reply to Faiz AbbasEnable configs to support eMMC boot.
--- configs/j721e_evm_a72_defconfig | 3 +++ configs/j721e_evm_r5_defconfig | 3 +++ 2 files changed, 6 insertions(+)
configs/j721e_evm_a72_defconfig +3 -0
@@ -28,6 +28,8 @@ CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_STACK_R=y CONFIG_SPL_SEPARATE_BSS=y +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x1400 CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_DM_MAILBOX=y
@@ -99,6 +101,7 @@ CONFIG_SYS_I2C_OMAP24XX=y CONFIG_DM_MAILBOX=y CONFIG_K3_SEC_PROXY=y CONFIG_DM_MMC=y +CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ADMA=y CONFIG_SPL_MMC_SDHCI_ADMA=y
configs/j721e_evm_r5_defconfig +3 -0
@@ -26,6 +26,8 @@ CONFIG_USE_BOOTCOMMAND=y CONFIG_SPL_STACK_R=y CONFIG_SPL_SEPARATE_BSS=y CONFIG_SPL_EARLY_BSS=y +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x400 CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_DM_MAILBOX=y
@@ -77,6 +79,7 @@ CONFIG_MISC=y CONFIG_FS_LOADER=y CONFIG_K3_AVS0=y CONFIG_DM_MMC=y +CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_MMC_SDHCI=y CONFIG_SPL_MMC_SDHCI_ADMA=y CONFIG_MMC_SDHCI_AM654=y
Signature · 1 line
2.19.2
v3 cover Add Support for eMMC boot in AM65x and J721e
In reply to Faiz AbbasHi Faiz,
Quoted 2 lines · Faiz Abbas
The following patches add support for eMMC boot in TI's Am65x and J721e devices.
About adding deferred_probe(), i want to know Peng's opinion. But it's my preference. I will review about your series. Thanks for accepting my suggestion.
Best Regards,
Jaehoon Chung
Quoted 52 lines
v3:
1. Added a patch to fix a clash between two dummy clocks of the same name in k3-j721e-r5-common-proc-board.dtb
2. Converted theinit()API patch to two patches addingdeferred_probe()APIs to the mmc core and sdhci layers respectively.
3. Fixed upconfig_pm_pre_callback()call order in patch 9.v2:
1. Reordered the patches according to Lokesh's preference
2. Fixed patch 2 breaking platforms whereDM_MMCis not enabled.Faiz Abbas (11):
mmc: Add asaved_clockmember
mmc: Add adeferred_probe()API
sdhci: Addsdhci_deferred_probe()API
mmc: MergeSD_LEGACYandMMC_LEGACYbus modes
mmc:am654_sdhci: Update output tap delay writes
mmc:am654_sdhci: Implement workaround for card detect
spl: mmc: Fixspl_mmc_get_uboot_raw_sector()implementation
arm: K3: sysfw-loader: Add aconfig_pm_pre_callback()
arm: dts: k3-j721e-r5-common-proc-board: Use unique names for dummy
clocks
configs:am65x_evm: AddCONFIG_SUPPORT_EMMC_BOOT
configs:j721e_evm: Add Support for eMMC bootarch/arm/dts/k3-am65-main.dtsi | 12 +- arch/arm/dts/k3-am654-base-board-u-boot.dtsi | 11 +- arch/arm/dts/k3-j721e-main.dtsi | 15 +- .../arm/dts/k3-j721e-r5-common-proc-board.dts | 4 +- arch/arm/mach-imx/imx8/image.c | 3 +- arch/arm/mach-k3/am6_init.c | 33 +++- arch/arm/mach-k3/include/mach/sysfw-loader.h | 2 +- arch/arm/mach-k3/j721e_init.c | 33 +++- arch/arm/mach-k3/sysfw-loader.c | 6 +- common/spl/spl_mmc.c | 11 +- configs/am65x_evm_a53_defconfig | 1 + configs/am65x_evm_r5_defconfig | 1 + configs/j721e_evm_a72_defconfig | 3 + configs/j721e_evm_r5_defconfig | 3 + drivers/mmc/am654_sdhci.c | 173 +++++++++++++----- drivers/mmc/fsl_esdhc_imx.c | 1 - drivers/mmc/mmc-uclass.c | 15 ++ drivers/mmc/mmc.c | 20 +- drivers/mmc/omap_hsmmc.c | 1 - drivers/mmc/sdhci.c | 15 ++ drivers/mmc/zynq_sdhci.c | 1 - include/configs/am65x_evm.h | 2 - include/mmc.h | 12 +- include/sdhci.h | 1 + 24 files changed, 298 insertions(+), 81 deletions(-)
v3 cover Add Support for eMMC boot in AM65x and J721e
Peng,
Quoted 10 lines · Jaehoon Chung
Hi Faiz,
Quoted 2 lines · Faiz Abbas
The following patches add support for eMMC boot in TI's Am65x and J721e devices.
About adding
deferred_probe(), i want to know Peng's opinion. But it's my preference. I will review about your series. Thanks for accepting my suggestion.
Any feedback? Can you pick these patches up for next?
Thanks,
Faiz
v3 cover Add Support for eMMC boot in AM65x and J721e
Quoted 12 lines
Subject: Re: [PATCH v3 00/11] Add Support for eMMC boot in AM65x and J721e
Peng,
Quoted 6 lines · Jaehoon Chung
Hi Faiz,
Quoted 2 lines · Faiz Abbas
The following patches add support for eMMC boot in TI's Am65x and J721e devices.
Quoted 6 lines
Quoted 4 lines
About adding
deferred_probe(), i want to know Peng's opinion. But it's my preference. I will review about your series. Thanks for accepting my suggestion.Any feedback? Can you pick these patches up for next?
When first glance to deferred_probe, I thought it behaviors as Linux defer probe :)
I am ok with this series. I need run a CI for this series, then send pull request to Tom's next tree. Should be tomorrow, if no concern or issues
Regards,
Peng.
Quoted 3 lines
Thanks,
Faiz
v3 cover Add Support for eMMC boot in AM65x and J721e
Quoted 17 lines · Peng Fan
Quoted 17 lines
Subject: Re: [PATCH v3 00/11] Add Support for eMMC boot in AM65x and J721e
Peng,
Quoted 10 lines · Jaehoon Chung
Hi Faiz,
Quoted 2 lines · Faiz Abbas
The following patches add support for eMMC boot in TI's Am65x and J721e devices.
About adding
deferred_probe(), i want to know Peng's opinion. But it's my preference. I will review about your series. Thanks for accepting my suggestion.
Quoted 8 lines
Quoted 1 line
Any feedback? Can you pick these patches up for next?
When first glance to
deferred_probe, I thought it behaviors as Linux defer probe :)I am ok with this series. I need run a CI for this series, then send pull request to Tom's next tree. Should be tomorrow, if no concern or issues
Sounds good. I'm not still checking fully. But looks good to me.
Best Regards,
Jaehoon Chung
Quoted 6 lines
Regards,
Peng.Quoted 3 lines
Thanks,
Faiz