refactor(st): move board info in common code

Create a function stm32_display_board_info() that will display ST
board information, from a parameter taken from OTP fuse. The code
is just moved from STM32MP1 part to common directory.

Signed-off-by: Yann Gautier <yann.gautier@st.com>
Change-Id: I9e12fe98b5aabc7791cf2c9d48a38fbf2b219f9e

diff --git a/plat/st/common/include/stm32mp_common.h b/plat/st/common/include/stm32mp_common.h
index 1d592bd9dd25a50d5a00dd4430ea9dc70fa567ca..bb3401f9f898265e618a57dab4b1e89d28b2460c 100644 (file)
--- a/plat/st/common/include/stm32mp_common.h
+++ b/plat/st/common/include/stm32mp_common.h
@@ -123,6 +123,9 @@ void stm32_get_boot_interface(uint32_t *interface, uint32_t *instance);
 /* Function to get BOOT_MODE backup register address */
 uintptr_t stm32_get_bkpr_boot_mode_addr(void);
 
+/* Display board information from the value found in OTP fuse */
+void stm32_display_board_info(uint32_t board_id);
+
 #if PSA_FWU_SUPPORT
 void stm32mp1_fwu_set_boot_idx(void);
 uint32_t stm32_get_and_dec_fwu_trial_boot_cnt(void);

diff --git a/plat/st/common/stm32mp_common.c b/plat/st/common/stm32mp_common.c
index 9b790c2dd49132eee9aa8c927732557c3627487f..f842e163554ec3e4b3f6b4fc269dce1281ab6ef1 100644 (file)
--- a/plat/st/common/stm32mp_common.c
+++ b/plat/st/common/stm32mp_common.c
@@ -25,6 +25,27 @@
 #define HEADER_VERSION_MAJOR_MASK      GENMASK(23, 16)
 #define RESET_TIMEOUT_US_1MS           1000U
 
+/* Internal layout of the 32bit OTP word board_id */
+#define BOARD_ID_BOARD_NB_MASK         GENMASK_32(31, 16)
+#define BOARD_ID_BOARD_NB_SHIFT                16
+#define BOARD_ID_VARCPN_MASK           GENMASK_32(15, 12)
+#define BOARD_ID_VARCPN_SHIFT          12
+#define BOARD_ID_REVISION_MASK         GENMASK_32(11, 8)
+#define BOARD_ID_REVISION_SHIFT                8
+#define BOARD_ID_VARFG_MASK            GENMASK_32(7, 4)
+#define BOARD_ID_VARFG_SHIFT           4
+#define BOARD_ID_BOM_MASK              GENMASK_32(3, 0)
+
+#define BOARD_ID2NB(_id)               (((_id) & BOARD_ID_BOARD_NB_MASK) >> \
+                                        BOARD_ID_BOARD_NB_SHIFT)
+#define BOARD_ID2VARCPN(_id)           (((_id) & BOARD_ID_VARCPN_MASK) >> \
+                                        BOARD_ID_VARCPN_SHIFT)
+#define BOARD_ID2REV(_id)              (((_id) & BOARD_ID_REVISION_MASK) >> \
+                                        BOARD_ID_REVISION_SHIFT)
+#define BOARD_ID2VARFG(_id)            (((_id) & BOARD_ID_VARFG_MASK) >> \
+                                        BOARD_ID_VARFG_SHIFT)
+#define BOARD_ID2BOM(_id)              ((_id) & BOARD_ID_BOM_MASK)
+
 #define BOOT_AUTH_MASK                 GENMASK_32(23, 20)
 #define BOOT_AUTH_SHIFT                        20
 #define BOOT_PART_MASK                 GENMASK_32(19, 16)
@@ -288,6 +309,20 @@ int32_t plat_get_soc_revision(void)
        return (int32_t)(stm32mp_get_chip_version() & SOC_ID_REV_MASK);
 }
 
+void stm32_display_board_info(uint32_t board_id)
+{
+       char rev[2];
+
+       rev[0] = BOARD_ID2REV(board_id) - 1 + 'A';
+       rev[1] = '\0';
+       NOTICE("Board: MB%04x Var%u.%u Rev.%s-%02u\n",
+              BOARD_ID2NB(board_id),
+              BOARD_ID2VARCPN(board_id),
+              BOARD_ID2VARFG(board_id),
+              rev,
+              BOARD_ID2BOM(board_id));
+}
+
 void stm32_save_boot_info(boot_api_context_t *boot_context)
 {
        uint32_t auth_status;

diff --git a/plat/st/stm32mp1/stm32mp1_private.c b/plat/st/stm32mp1/stm32mp1_private.c
index 7119b6477c7650f31603712ba394a9ddfdae7bc2..ea35055a83a90fe5c22944a13dcb8c0ec915b362 100644 (file)
--- a/plat/st/stm32mp1/stm32mp1_private.c
+++ b/plat/st/stm32mp1/stm32mp1_private.c
@@ -16,27 +16,6 @@
 #include <plat/common/platform.h>
 #include <platform_def.h>
 
-/* Internal layout of the 32bit OTP word board_id */
-#define BOARD_ID_BOARD_NB_MASK         GENMASK(31, 16)
-#define BOARD_ID_BOARD_NB_SHIFT                16
-#define BOARD_ID_VARCPN_MASK           GENMASK(15, 12)
-#define BOARD_ID_VARCPN_SHIFT          12
-#define BOARD_ID_REVISION_MASK         GENMASK(11, 8)
-#define BOARD_ID_REVISION_SHIFT                8
-#define BOARD_ID_VARFG_MASK            GENMASK(7, 4)
-#define BOARD_ID_VARFG_SHIFT           4
-#define BOARD_ID_BOM_MASK              GENMASK(3, 0)
-
-#define BOARD_ID2NB(_id)               (((_id) & BOARD_ID_BOARD_NB_MASK) >> \
-                                        BOARD_ID_BOARD_NB_SHIFT)
-#define BOARD_ID2VARCPN(_id)           (((_id) & BOARD_ID_VARCPN_MASK) >> \
-                                        BOARD_ID_VARCPN_SHIFT)
-#define BOARD_ID2REV(_id)              (((_id) & BOARD_ID_REVISION_MASK) >> \
-                                        BOARD_ID_REVISION_SHIFT)
-#define BOARD_ID2VARFG(_id)            (((_id) & BOARD_ID_VARFG_MASK) >> \
-                                        BOARD_ID_VARFG_SHIFT)
-#define BOARD_ID2BOM(_id)              ((_id) & BOARD_ID_BOM_MASK)
-
 #if STM32MP13
 #define TAMP_BOOT_MODE_BACKUP_REG_ID   U(30)
 #endif
@@ -516,23 +495,14 @@ void stm32mp_print_cpuinfo(void)
 
 void stm32mp_print_boardinfo(void)
 {
-       uint32_t board_id = 0;
+       uint32_t board_id = 0U;
 
        if (stm32_get_otp_value(BOARD_ID_OTP, &board_id) != 0) {
                return;
        }
 
        if (board_id != 0U) {
-               char rev[2];
-
-               rev[0] = BOARD_ID2REV(board_id) - 1 + 'A';
-               rev[1] = '\0';
-               NOTICE("Board: MB%04x Var%u.%u Rev.%s-%02u\n",
-                      BOARD_ID2NB(board_id),
-                      BOARD_ID2VARCPN(board_id),
-                      BOARD_ID2VARFG(board_id),
-                      rev,
-                      BOARD_ID2BOM(board_id));
+               stm32_display_board_info(board_id);
        }
 }