mach-k3: am62*: Fix backup from eMMC boot mode
Subsystems (2)
PATCH v2 1/1 mach-k3: am62*: Fix backup from eMMC boot mode
Currently logic in spl_mmc_boot_mode only lookes at main devstat to determine the bootmode to return. Thus, when using: 'eMMC boot' as primary boot mode and 'MMCSD boot from eMMC UDA' as backup boot mode, 'eMMC boot' is always selected. Add check for bootindex to determine if ROM boot via backup boot mode and return MMCSD_MODE_FS which is the only supported backup bootmode with eMMC device.
--- arch/arm/mach-k3/am62ax/am62a7_init.c | 5 +++++ arch/arm/mach-k3/am62px/am62p5_init.c | 5 +++++ arch/arm/mach-k3/am62x/am625_init.c | 5 +++++ 3 files changed, 15 insertions(+)
arch/arm/mach-k3/am62ax/am62a7_init.c +5 -0
@@ -218,6 +218,11 @@ u32 spl_mmc_boot_mode(struct mmc *mmc, const u32 boot_device)u32 bootmode_cfg = (devstat &MAIN_DEVSTAT_PRIMARY_BOOTMODE_CFG_MASK ) >>MAIN_DEVSTAT_PRIMARY_BOOTMODE_CFG_SHIFT ; +if (bootindex !=K3_PRIMARY_BOOTMODE ) { +pr_alert ("Fallback to backup bootmode MMCSD_MODE_FS\n" ); +return MMCSD_MODE_FS ; + } +switch (bootmode) {case BOOT_DEVICE_EMMC :if (IS_ENABLED (CONFIG_SUPPORT_EMMC_BOOT ))
arch/arm/mach-k3/am62px/am62p5_init.c +5 -0
@@ -264,6 +264,11 @@ u32 spl_mmc_boot_mode(struct mmc *mmc, const u32 boot_device)u32 bootmode_cfg = (devstat &MAIN_DEVSTAT_PRIMARY_BOOTMODE_CFG_MASK ) >>MAIN_DEVSTAT_PRIMARY_BOOTMODE_CFG_SHIFT ; +if (bootindex !=K3_PRIMARY_BOOTMODE ) { +pr_alert ("Fallback to backup bootmode MMCSD_MODE_FS\n" ); +return MMCSD_MODE_FS ; + } +switch (bootmode) {case BOOT_DEVICE_EMMC :if (IS_ENABLED (CONFIG_SUPPORT_EMMC_BOOT ))
arch/arm/mach-k3/am62x/am625_init.c +5 -0
@@ -305,6 +305,11 @@ u32 spl_mmc_boot_mode(struct mmc *mmc, const u32 boot_device)u32 bootmode_cfg = (devstat &MAIN_DEVSTAT_PRIMARY_BOOTMODE_CFG_MASK ) >>MAIN_DEVSTAT_PRIMARY_BOOTMODE_CFG_SHIFT ; +if (bootindex !=K3_PRIMARY_BOOTMODE ) { +pr_alert ("Fallback to backup bootmode MMCSD_MODE_FS\n" ); +return MMCSD_MODE_FS ; + } +switch (bootmode) {case BOOT_DEVICE_EMMC :if (IS_ENABLED (CONFIG_SUPPORT_EMMC_BOOT ))
Signature · 1 line
2.49.0
Hi Judith,
Quoted 9 lines · Judith Mendez
Currently logic in
spl_mmc_boot_modeonly lookes at main devstat to determine the bootmode to return. Thus, when using: 'eMMC boot' as primary boot mode and 'MMCSD boot from eMMC UDA' as backup boot mode, 'eMMC boot' is always selected. Add check for bootindex to determine if ROM boot via backup boot mode and returnMMCSD_MODE_FSwhich is the only supported backup bootmode with eMMC device.Signed-off-by Judith Mendez <[email protected]>---
[snip]
Thanks for the patch!
Regards,
Anshul
Quoted 52 lines · Judith Mendez
Currently logic in
spl_mmc_boot_modeonly lookes at main devstat to determine the bootmode to return. Thus, when using: 'eMMC boot' as primary boot mode and 'MMCSD boot from eMMC UDA' as backup boot mode, 'eMMC boot' is always selected. Add check for bootindex to determine if ROM boot via backup boot mode and returnMMCSD_MODE_FSwhich is the only supported backup bootmode with eMMC device.Signed-off-by Judith Mendez <[email protected]>--- arch/arm/mach-k3/am62ax/am62a7_init.c | 5 +++++ arch/arm/mach-k3/am62px/am62p5_init.c | 5 +++++ arch/arm/mach-k3/am62x/am625_init.c | 5 +++++ 3 files changed, 15 insertions(+)arch/arm/mach-k3/am62ax/am62a7_init.c +5
-0@@ -218,6 +218,11 @@ u32 spl_mmc_boot_mode(struct mmc *mmc, const u32 boot_device)u32 bootmode_cfg = (devstat &MAIN_DEVSTAT_PRIMARY_BOOTMODE_CFG_MASK ) >>MAIN_DEVSTAT_PRIMARY_BOOTMODE_CFG_SHIFT ; +if (bootindex !=K3_PRIMARY_BOOTMODE ) { +pr_alert ("Fallback to backup bootmode MMCSD_MODE_FS\n" ); +return MMCSD_MODE_FS ; + } +switch (bootmode) {case BOOT_DEVICE_EMMC :if (IS_ENABLED (CONFIG_SUPPORT_EMMC_BOOT ))arch/arm/mach-k3/am62px/am62p5_init.c +5
-0@@ -264,6 +264,11 @@ u32 spl_mmc_boot_mode(struct mmc *mmc, const u32 boot_device)u32 bootmode_cfg = (devstat &MAIN_DEVSTAT_PRIMARY_BOOTMODE_CFG_MASK ) >>MAIN_DEVSTAT_PRIMARY_BOOTMODE_CFG_SHIFT ; +if (bootindex !=K3_PRIMARY_BOOTMODE ) { +pr_alert ("Fallback to backup bootmode MMCSD_MODE_FS\n" ); +return MMCSD_MODE_FS ; + } +switch (bootmode) {case BOOT_DEVICE_EMMC :if (IS_ENABLED (CONFIG_SUPPORT_EMMC_BOOT ))arch/arm/mach-k3/am62x/am625_init.c +0
-0@@ -305,6 +305,11 @@ u32 spl_mmc_boot_mode(struct mmc *mmc, const u32 boot_device) u32 bootmode_cfg = (devstat & MAIN_DEVSTAT_PRIMARY_BOOTMODE_CFG_MASK) >>
arch/arm/mach-k3/am62x/am625_init.c u32 spl_mmc_boot_mode(struct mmc *mmc, const u32 boot_device) · line 315
Quoted 10 lines
arch/arm/mach-k3/am62x/am625_init.c +5
-0MAIN_DEVSTAT_PRIMARY_BOOTMODE_CFG_SHIFT ; +if (bootindex !=K3_PRIMARY_BOOTMODE ) { +pr_alert ("Fallback to backup bootmode MMCSD_MODE_FS\n" ); +return MMCSD_MODE_FS ; + } +switch (bootmode) {case BOOT_DEVICE_EMMC :if (IS_ENABLED (CONFIG_SUPPORT_EMMC_BOOT ))
Regards,
Moteen
Quoted 8 lines · Judith Mendez
Currently logic in
spl_mmc_boot_modeonly lookes at main devstat to determine the bootmode to return. Thus, when using: 'eMMC boot' as primary boot mode and 'MMCSD boot from eMMC UDA' as backup boot mode, 'eMMC boot' is always selected. Add check for bootindex to determine if ROM boot via backup boot mode and returnMMCSD_MODE_FSwhich is the only supported backup bootmode with eMMC device.[...]
Applied to u-boot/next, thanks!
[1/1] mach-k3: am62*: Fix backup from eMMC boot mode
commit: 6fd45dd488f9605e2f634c7e5da4ac2925c118c8
Signature · 1 line
Tom