ARM: uniphier: show STM (SCP) status on boot and pinmon command

The SCP (System Control Processor) or what we call STM (Stand-by
MPU) is integrated in LD4, Pro4, sLD8, LD6b, LD11, and LD20.
For these SoCs, show the information if STM is enabled.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/arch/arm/mach-uniphier/board_late_init.c b/arch/arm/mach-uniphier/board_late_init.c
index 92dd6105e488c1c0e5281518c3f49a3656161d35..4bfa10b374ad8b2306f052d1ee75fb5f8e4dfe1a 100644 (file)
--- a/arch/arm/mach-uniphier/board_late_init.c
+++ b/arch/arm/mach-uniphier/board_late_init.c
@@ -64,27 +64,33 @@ int board_late_init(void)
 
        switch (uniphier_boot_device_raw()) {
        case BOOT_DEVICE_MMC1:
-               printf("eMMC Boot\n");
+               printf("eMMC Boot");
                setenv("bootmode", "emmcboot");
                break;
        case BOOT_DEVICE_NAND:
-               printf("NAND Boot\n");
+               printf("NAND Boot");
                setenv("bootmode", "nandboot");
                nand_denali_wp_disable();
                break;
        case BOOT_DEVICE_NOR:
-               printf("NOR Boot\n");
+               printf("NOR Boot");
                setenv("bootmode", "norboot");
                break;
        case BOOT_DEVICE_USB:
-               printf("USB Boot\n");
+               printf("USB Boot");
                setenv("bootmode", "usbboot");
                break;
        default:
-               printf("Unknown\n");
+               printf("Unknown");
                break;
        }
 
+       if (uniphier_have_internal_stm())
+               printf(" (STM: %s)",
+                      uniphier_boot_from_backend() ? "OFF" : "ON");
+
+       printf("\n");
+
        if (uniphier_set_fdt_file())
                printf("fdt_file environment was not set correctly\n");
 

diff --git a/arch/arm/mach-uniphier/boot-device/boot-device.c b/arch/arm/mach-uniphier/boot-device/boot-device.c
index 5ec0b5b87c458367b9228f519cd4ac579ffc0e4f..00809777b24ae1ec73b03029b39d5cee8bf60423 100644 (file)
--- a/arch/arm/mach-uniphier/boot-device/boot-device.c
+++ b/arch/arm/mach-uniphier/boot-device/boot-device.c
@@ -22,6 +22,7 @@ struct uniphier_boot_device_info {
        const unsigned int *boot_device_count;
        int (*boot_device_is_usb)(u32 pinmon);
        unsigned int (*boot_device_fixup)(unsigned int mode);
+       int have_internal_stm;
 };
 
 static const struct uniphier_boot_device_info uniphier_boot_device_info[] = {
@@ -31,6 +32,7 @@ static const struct uniphier_boot_device_info uniphier_boot_device_info[] = {
                .boot_device_sel_shift = 0,
                .boot_device_table = uniphier_sld3_boot_device_table,
                .boot_device_count = &uniphier_sld3_boot_device_count,
+               .have_internal_stm = 0,
        },
 #endif
 #if defined(CONFIG_ARCH_UNIPHIER_LD4)
@@ -39,6 +41,7 @@ static const struct uniphier_boot_device_info uniphier_boot_device_info[] = {
                .boot_device_sel_shift = 1,
                .boot_device_table = uniphier_ld4_boot_device_table,
                .boot_device_count = &uniphier_ld4_boot_device_count,
+               .have_internal_stm = 1,
        },
 #endif
 #if defined(CONFIG_ARCH_UNIPHIER_PRO4)
@@ -47,6 +50,7 @@ static const struct uniphier_boot_device_info uniphier_boot_device_info[] = {
                .boot_device_sel_shift = 1,
                .boot_device_table = uniphier_ld4_boot_device_table,
                .boot_device_count = &uniphier_ld4_boot_device_count,
+               .have_internal_stm = 0,
        },
 #endif
 #if defined(CONFIG_ARCH_UNIPHIER_SLD8)
@@ -55,6 +59,7 @@ static const struct uniphier_boot_device_info uniphier_boot_device_info[] = {
                .boot_device_sel_shift = 1,
                .boot_device_table = uniphier_ld4_boot_device_table,
                .boot_device_count = &uniphier_ld4_boot_device_count,
+               .have_internal_stm = 1,
        },
 #endif
 #if defined(CONFIG_ARCH_UNIPHIER_PRO5)
@@ -63,6 +68,7 @@ static const struct uniphier_boot_device_info uniphier_boot_device_info[] = {
                .boot_device_sel_shift = 1,
                .boot_device_table = uniphier_pro5_boot_device_table,
                .boot_device_count = &uniphier_pro5_boot_device_count,
+               .have_internal_stm = 0,
        },
 #endif
 #if defined(CONFIG_ARCH_UNIPHIER_PXS2)
@@ -73,6 +79,7 @@ static const struct uniphier_boot_device_info uniphier_boot_device_info[] = {
                .boot_device_count = &uniphier_pxs2_boot_device_count,
                .boot_device_is_usb = uniphier_pxs2_boot_device_is_usb,
                .boot_device_fixup = uniphier_pxs2_boot_device_fixup,
+               .have_internal_stm = 0,
        },
 #endif
 #if defined(CONFIG_ARCH_UNIPHIER_LD6B)
@@ -83,6 +90,7 @@ static const struct uniphier_boot_device_info uniphier_boot_device_info[] = {
                .boot_device_count = &uniphier_pxs2_boot_device_count,
                .boot_device_is_usb = uniphier_pxs2_boot_device_is_usb,
                .boot_device_fixup = uniphier_pxs2_boot_device_fixup,
+               .have_internal_stm = 1, /* STM on A-chip */
        },
 #endif
 #if defined(CONFIG_ARCH_UNIPHIER_LD11)
@@ -93,6 +101,7 @@ static const struct uniphier_boot_device_info uniphier_boot_device_info[] = {
                .boot_device_count = &uniphier_ld11_boot_device_count,
                .boot_device_is_usb = uniphier_ld11_boot_device_is_usb,
                .boot_device_fixup = uniphier_ld11_boot_device_fixup,
+               .have_internal_stm = 1,
        },
 #endif
 #if defined(CONFIG_ARCH_UNIPHIER_LD20)
@@ -103,6 +112,7 @@ static const struct uniphier_boot_device_info uniphier_boot_device_info[] = {
                .boot_device_count = &uniphier_ld11_boot_device_count,
                .boot_device_is_usb = uniphier_ld20_boot_device_is_usb,
                .boot_device_fixup = uniphier_ld11_boot_device_fixup,
+               .have_internal_stm = 1,
        },
 #endif
 };
@@ -161,6 +171,24 @@ u32 spl_boot_device(void)
                                info->boot_device_fixup(raw_mode) : raw_mode;
 }
 
+int uniphier_have_internal_stm(void)
+{
+       const struct uniphier_boot_device_info *info;
+
+       info = uniphier_get_boot_device_info();
+       if (!info) {
+               pr_err("unsupported SoC\n");
+               return -ENOTSUPP;
+       }
+
+       return info->have_internal_stm;
+}
+
+int uniphier_boot_from_backend(void)
+{
+       return !!(readl(SG_PINMON0) & BIT(27));
+}
+
 #ifndef CONFIG_SPL_BUILD
 
 static int do_pinmon(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
@@ -176,12 +204,16 @@ static int do_pinmon(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                return CMD_RET_FAILURE;
        }
 
-       printf("Boot Swap: %s\n\n", boot_is_swapped() ? "ON" : "OFF");
+       if (uniphier_have_internal_stm())
+               printf("STB Micon: %s\n",
+                      uniphier_boot_from_backend() ? "OFF" : "ON");
+
+       printf("Boot Swap: %s\n", boot_is_swapped() ? "ON" : "OFF");
 
        pinmon = readl(SG_PINMON0);
 
        if (info->boot_device_is_usb)
-               printf("USB Boot: %s\n\n",
+               printf("USB Boot:  %s\n",
                       info->boot_device_is_usb(pinmon) ? "ON" : "OFF");
 
        boot_device_count = *info->boot_device_count;
@@ -189,7 +221,7 @@ static int do_pinmon(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        boot_sel = pinmon >> info->boot_device_sel_shift;
        boot_sel &= boot_device_count - 1;
 
-       printf("Boot Mode Sel:\n");
+       printf("\nBoot Mode Sel:\n");
        for (i = 0; i < boot_device_count; i++)
                printf(" %c %02x %s\n", i == boot_sel ? '*' : ' ', i,
                       info->boot_device_table[i].desc);

diff --git a/arch/arm/mach-uniphier/init.h b/arch/arm/mach-uniphier/init.h
index 5c45f2d31bfc8ca18962998ada5cb7791980f3d0..4803d08038c8124de2469a276408e30e50897ec2 100644 (file)
--- a/arch/arm/mach-uniphier/init.h
+++ b/arch/arm/mach-uniphier/init.h
@@ -121,6 +121,8 @@ void uniphier_ld11_clk_init(void);
 void uniphier_ld20_clk_init(void);
 
 unsigned int uniphier_boot_device_raw(void);
+int uniphier_have_internal_stm(void);
+int uniphier_boot_from_backend(void);
 int uniphier_pin_init(const char *pinconfig_name);
 void uniphier_smp_kick_all_cpus(void);
 void cci500_init(int nr_slaves);