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.

Signed-off-by: Judith Mendez <jm@ti.com>
Reviewed-by: Anshul Dalal <anshuld@ti.com>
Reviewed-by: Moteen Shah <m-shah@ti.com>

diff --git a/arch/arm/mach-k3/am62ax/am62a7_init.c b/arch/arm/mach-k3/am62ax/am62a7_init.c
index 00173e6..48d578e 100644 (file)
--- a/arch/arm/mach-k3/am62ax/am62a7_init.c
+++ b/arch/arm/mach-k3/am62ax/am62a7_init.c
@@ -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))

diff --git a/arch/arm/mach-k3/am62px/am62p5_init.c b/arch/arm/mach-k3/am62px/am62p5_init.c
index 44a2d44..aebd520 100644 (file)
--- a/arch/arm/mach-k3/am62px/am62p5_init.c
+++ b/arch/arm/mach-k3/am62px/am62p5_init.c
@@ -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))

diff --git a/arch/arm/mach-k3/am62x/am625_init.c b/arch/arm/mach-k3/am62x/am625_init.c
index 8f4ddf5..14f93ac 100644 (file)
--- a/arch/arm/mach-k3/am62x/am625_init.c
+++ b/arch/arm/mach-k3/am62x/am625_init.c
@@ -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))