arm: mach-k3: am642: Provide a way to obtain boot device for non SPLs

Let's provide get_boot_device() for AM64, similar to what we did
in commit 2f9095e2bf59 ("arm: mach-k3: am625: Provide a way to obtain boot
device for non SPLs") for AM62.

Signed-off-by: Wadim Egorov <w.egorov@phytec.de>

diff --git a/arch/arm/mach-k3/Makefile b/arch/arm/mach-k3/Makefile
index 1bd523329a4f8e68e8b018c75e65d2f88a1b091b..3101f57d3248cb1688ef364b04003bd757efd940 100644 (file)
--- a/arch/arm/mach-k3/Makefile
+++ b/arch/arm/mach-k3/Makefile
@@ -26,3 +26,4 @@ obj-$(CONFIG_SOC_K3_AM62P5) += am62p5_init.o
 endif
 obj-y += common.o security.o
 obj-$(CONFIG_SOC_K3_AM625) += am62x/
+obj-$(CONFIG_SOC_K3_AM642) += am64x/

diff --git a/arch/arm/mach-k3/am642_init.c b/arch/arm/mach-k3/am642_init.c
index 80c3cb3479f7bb1fc7b90e5d0735570070000107..f341b4f367cbac7c508017b149754906d2d83475 100644 (file)
--- a/arch/arm/mach-k3/am642_init.c
+++ b/arch/arm/mach-k3/am642_init.c
@@ -285,97 +285,7 @@ u32 spl_mmc_boot_mode(struct mmc *mmc, const u32 boot_device)
        }
 }
 
-static u32 __get_backup_bootmedia(u32 main_devstat)
-{
-       u32 bkup_bootmode =
-           (main_devstat & MAIN_DEVSTAT_BACKUP_BOOTMODE_MASK) >>
-           MAIN_DEVSTAT_BACKUP_BOOTMODE_SHIFT;
-       u32 bkup_bootmode_cfg =
-           (main_devstat & MAIN_DEVSTAT_BACKUP_BOOTMODE_CFG_MASK) >>
-           MAIN_DEVSTAT_BACKUP_BOOTMODE_CFG_SHIFT;
-
-       switch (bkup_bootmode) {
-       case BACKUP_BOOT_DEVICE_UART:
-               return BOOT_DEVICE_UART;
-
-       case BACKUP_BOOT_DEVICE_DFU:
-               if (bkup_bootmode_cfg & MAIN_DEVSTAT_BACKUP_USB_MODE_MASK)
-                       return BOOT_DEVICE_USB;
-               return BOOT_DEVICE_DFU;
-
-
-       case BACKUP_BOOT_DEVICE_ETHERNET:
-               return BOOT_DEVICE_ETHERNET;
-
-       case BACKUP_BOOT_DEVICE_MMC:
-               if (bkup_bootmode_cfg)
-                       return BOOT_DEVICE_MMC2;
-               return BOOT_DEVICE_MMC1;
-
-       case BACKUP_BOOT_DEVICE_SPI:
-               return BOOT_DEVICE_SPI;
-
-       case BACKUP_BOOT_DEVICE_I2C:
-               return BOOT_DEVICE_I2C;
-       };
-
-       return BOOT_DEVICE_RAM;
-}
-
-static u32 __get_primary_bootmedia(u32 main_devstat)
-{
-       u32 bootmode = (main_devstat & MAIN_DEVSTAT_PRIMARY_BOOTMODE_MASK) >>
-           MAIN_DEVSTAT_PRIMARY_BOOTMODE_SHIFT;
-       u32 bootmode_cfg =
-           (main_devstat & MAIN_DEVSTAT_PRIMARY_BOOTMODE_CFG_MASK) >>
-           MAIN_DEVSTAT_PRIMARY_BOOTMODE_CFG_SHIFT;
-
-       switch (bootmode) {
-       case BOOT_DEVICE_OSPI:
-               fallthrough;
-       case BOOT_DEVICE_QSPI:
-               fallthrough;
-       case BOOT_DEVICE_XSPI:
-               fallthrough;
-       case BOOT_DEVICE_SPI:
-               return BOOT_DEVICE_SPI;
-
-       case BOOT_DEVICE_ETHERNET_RGMII:
-               fallthrough;
-       case BOOT_DEVICE_ETHERNET_RMII:
-               return BOOT_DEVICE_ETHERNET;
-
-       case BOOT_DEVICE_EMMC:
-               return BOOT_DEVICE_MMC1;
-
-       case BOOT_DEVICE_NAND:
-               return BOOT_DEVICE_NAND;
-
-       case BOOT_DEVICE_MMC:
-               if ((bootmode_cfg & MAIN_DEVSTAT_PRIMARY_MMC_PORT_MASK) >>
-                    MAIN_DEVSTAT_PRIMARY_MMC_PORT_SHIFT)
-                       return BOOT_DEVICE_MMC2;
-               return BOOT_DEVICE_MMC1;
-
-       case BOOT_DEVICE_DFU:
-               if ((bootmode_cfg & MAIN_DEVSTAT_PRIMARY_USB_MODE_MASK) >>
-                   MAIN_DEVSTAT_PRIMARY_USB_MODE_SHIFT)
-                       return BOOT_DEVICE_USB;
-               return BOOT_DEVICE_DFU;
-
-       case BOOT_DEVICE_NOBOOT:
-               return BOOT_DEVICE_RAM;
-       }
-
-       return bootmode;
-}
-
 u32 spl_boot_device(void)
 {
-       u32 devstat = readl(CTRLMMR_MAIN_DEVSTAT);
-
-       if (bootindex == K3_PRIMARY_BOOTMODE)
-               return __get_primary_bootmedia(devstat);
-       else
-               return __get_backup_bootmedia(devstat);
+       return get_boot_device();
 }

diff --git a/arch/arm/mach-k3/am64x/Makefile b/arch/arm/mach-k3/am64x/Makefile
new file mode 100644 (file)
index 0000000..acf09c3
--- /dev/null
+++ b/arch/arm/mach-k3/am64x/Makefile
@@ -0,0 +1,2 @@
+# SPDX-License-Identifier:     GPL-2.0+
+obj-y += boot.o

diff --git a/arch/arm/mach-k3/am64x/boot.c b/arch/arm/mach-k3/am64x/boot.c
new file mode 100644 (file)
index 0000000..ce8ae94
--- /dev/null
+++ b/arch/arm/mach-k3/am64x/boot.c
@@ -0,0 +1,105 @@
+// SPDX-License-Identifier: GPL-2.0+
+#include <asm/io.h>
+#include <asm/arch/hardware.h>
+#include <asm/arch/spl.h>
+
+static u32 __get_backup_bootmedia(u32 main_devstat)
+{
+       u32 bkup_bootmode =
+           (main_devstat & MAIN_DEVSTAT_BACKUP_BOOTMODE_MASK) >>
+           MAIN_DEVSTAT_BACKUP_BOOTMODE_SHIFT;
+       u32 bkup_bootmode_cfg =
+           (main_devstat & MAIN_DEVSTAT_BACKUP_BOOTMODE_CFG_MASK) >>
+           MAIN_DEVSTAT_BACKUP_BOOTMODE_CFG_SHIFT;
+
+       switch (bkup_bootmode) {
+       case BACKUP_BOOT_DEVICE_UART:
+               return BOOT_DEVICE_UART;
+
+       case BACKUP_BOOT_DEVICE_DFU:
+               if (bkup_bootmode_cfg & MAIN_DEVSTAT_BACKUP_USB_MODE_MASK)
+                       return BOOT_DEVICE_USB;
+               return BOOT_DEVICE_DFU;
+
+       case BACKUP_BOOT_DEVICE_ETHERNET:
+               return BOOT_DEVICE_ETHERNET;
+
+       case BACKUP_BOOT_DEVICE_MMC:
+               if (bkup_bootmode_cfg)
+                       return BOOT_DEVICE_MMC2;
+               return BOOT_DEVICE_MMC1;
+
+       case BACKUP_BOOT_DEVICE_SPI:
+               return BOOT_DEVICE_SPI;
+
+       case BACKUP_BOOT_DEVICE_I2C:
+               return BOOT_DEVICE_I2C;
+       };
+
+       return BOOT_DEVICE_RAM;
+}
+
+static u32 __get_primary_bootmedia(u32 main_devstat)
+{
+       u32 bootmode = (main_devstat & MAIN_DEVSTAT_PRIMARY_BOOTMODE_MASK) >>
+           MAIN_DEVSTAT_PRIMARY_BOOTMODE_SHIFT;
+       u32 bootmode_cfg =
+           (main_devstat & MAIN_DEVSTAT_PRIMARY_BOOTMODE_CFG_MASK) >>
+           MAIN_DEVSTAT_PRIMARY_BOOTMODE_CFG_SHIFT;
+
+       switch (bootmode) {
+       case BOOT_DEVICE_OSPI:
+               fallthrough;
+       case BOOT_DEVICE_QSPI:
+               fallthrough;
+       case BOOT_DEVICE_XSPI:
+               fallthrough;
+       case BOOT_DEVICE_SPI:
+               return BOOT_DEVICE_SPI;
+
+       case BOOT_DEVICE_ETHERNET_RGMII:
+               fallthrough;
+       case BOOT_DEVICE_ETHERNET_RMII:
+               return BOOT_DEVICE_ETHERNET;
+
+       case BOOT_DEVICE_EMMC:
+               return BOOT_DEVICE_MMC1;
+
+       case BOOT_DEVICE_NAND:
+               return BOOT_DEVICE_NAND;
+
+       case BOOT_DEVICE_MMC:
+               if ((bootmode_cfg & MAIN_DEVSTAT_PRIMARY_MMC_PORT_MASK) >>
+                    MAIN_DEVSTAT_PRIMARY_MMC_PORT_SHIFT)
+                       return BOOT_DEVICE_MMC2;
+               return BOOT_DEVICE_MMC1;
+
+       case BOOT_DEVICE_DFU:
+               if ((bootmode_cfg & MAIN_DEVSTAT_PRIMARY_USB_MODE_MASK) >>
+                   MAIN_DEVSTAT_PRIMARY_USB_MODE_SHIFT)
+                       return BOOT_DEVICE_USB;
+               return BOOT_DEVICE_DFU;
+
+       case BOOT_DEVICE_NOBOOT:
+               return BOOT_DEVICE_RAM;
+       }
+
+       return bootmode;
+}
+
+u32 get_boot_device(void)
+{
+       u32 devstat = readl(CTRLMMR_MAIN_DEVSTAT);
+       u32 bootmode = *(u32 *)(CONFIG_SYS_K3_BOOT_PARAM_TABLE_INDEX);
+       u32 bootmedia;
+
+       if (bootmode == K3_PRIMARY_BOOTMODE)
+               bootmedia = __get_primary_bootmedia(devstat);
+       else
+               bootmedia = __get_backup_bootmedia(devstat);
+
+       debug("%s: devstat = 0x%x bootmedia = 0x%x bootmode = %d\n",
+             __func__, devstat, bootmedia, bootmode);
+
+       return bootmedia;
+}