stm32mp1: add stboard command

Allow to update board identification in OTP 59.

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>

diff --git a/board/st/stm32mp1/Kconfig b/board/st/stm32mp1/Kconfig
index 5f81f942a0825f3de3c9e5e53f51df1673ea29d4..87216c096384e3aeb214be760dcf6ed85b375482 100644 (file)
--- a/board/st/stm32mp1/Kconfig
+++ b/board/st/stm32mp1/Kconfig
@@ -15,4 +15,11 @@ config ENV_SECT_SIZE
 config ENV_OFFSET
        default 0x280000 if ENV_IS_IN_SPI_FLASH
 
+config CMD_STBOARD
+       bool "stboard - command for OTP board information"
+       default y
+       help
+         This compile the stboard command to
+         read and write the board in the OTP.
+
 endif

diff --git a/board/st/stm32mp1/Makefile b/board/st/stm32mp1/Makefile
index 8188075b1a398d78aacacae9ccaba9a227aa4885..3c6c035b118a916b4565a115ef8f38dd66d29428 100644 (file)
--- a/board/st/stm32mp1/Makefile
+++ b/board/st/stm32mp1/Makefile
@@ -7,6 +7,7 @@ ifdef CONFIG_SPL_BUILD
 obj-y += spl.o
 else
 obj-y += stm32mp1.o
+obj-$(CONFIG_CMD_STBOARD) += cmd_stboard.o
 endif
 
 obj-y += board.o

diff --git a/board/st/stm32mp1/cmd_stboard.c b/board/st/stm32mp1/cmd_stboard.c
new file mode 100644 (file)
index 0000000..f781c36
--- /dev/null
+++ b/board/st/stm32mp1/cmd_stboard.c
@@ -0,0 +1,145 @@
+// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
+/*
+ * Copyright (C) 2019, STMicroelectronics - All Rights Reserved
+ */
+
+#include <common.h>
+#include <console.h>
+#include <misc.h>
+#include <dm/device.h>
+#include <dm/uclass.h>
+
+static bool check_stboard(u16 board)
+{
+       unsigned int i;
+       const u16 st_board_id[] = {
+               0x1272,
+               0x1263,
+               0x1264,
+               0x1298,
+               0x1341,
+               0x1497,
+       };
+
+       for (i = 0; i < ARRAY_SIZE(st_board_id); i++)
+               if (board == st_board_id[i])
+                       return true;
+
+       return false;
+}
+
+static void display_stboard(u32 otp)
+{
+       printf("Board: MB%04x Var%d Rev.%c-%02d\n",
+              otp >> 16,
+              (otp >> 12) & 0xF,
+              ((otp >> 8) & 0xF) - 1 + 'A',
+              otp & 0xF);
+}
+
+static int do_stboard(cmd_tbl_t *cmdtp, int flag, int argc,
+                     char * const argv[])
+{
+       int ret;
+       u32 otp;
+       u8 revision;
+       unsigned long board, variant, bom;
+       struct udevice *dev;
+       int confirmed = argc == 6 && !strcmp(argv[1], "-y");
+
+       argc -= 1 + confirmed;
+       argv += 1 + confirmed;
+
+       if (argc != 0 && argc != 4)
+               return CMD_RET_USAGE;
+
+       ret = uclass_get_device_by_driver(UCLASS_MISC,
+                                         DM_GET_DRIVER(stm32mp_bsec),
+                                         &dev);
+
+       ret = misc_read(dev, STM32_BSEC_SHADOW(BSEC_OTP_BOARD),
+                       &otp, sizeof(otp));
+
+       if (ret) {
+               puts("OTP read error");
+               return CMD_RET_FAILURE;
+       }
+
+       if (argc == 0) {
+               if (!otp)
+                       puts("Board : OTP board FREE\n");
+               else
+                       display_stboard(otp);
+               return CMD_RET_SUCCESS;
+       }
+
+       if (otp) {
+               display_stboard(otp);
+               printf("ERROR: OTP board not FREE\n");
+               return CMD_RET_FAILURE;
+       }
+
+       if (strict_strtoul(argv[0], 16, &board) < 0 ||
+           board == 0 || board > 0xFFFF) {
+               printf("argument %d invalid: %s\n", 1, argv[0]);
+               return CMD_RET_USAGE;
+       }
+
+       if (strict_strtoul(argv[1], 10, &variant) < 0 ||
+           variant == 0 || variant > 15) {
+               printf("argument %d invalid: %s\n", 2, argv[1]);
+               return CMD_RET_USAGE;
+       }
+
+       revision = argv[2][0] - 'A' + 1;
+       if (strlen(argv[2]) > 1 || revision == 0 || revision > 15) {
+               printf("argument %d invalid: %s\n", 3, argv[2]);
+               return CMD_RET_USAGE;
+       }
+
+       if (strict_strtoul(argv[3], 10, &bom) < 0 ||
+           bom == 0 || bom > 15) {
+               printf("argument %d invalid: %s\n", 4, argv[3]);
+               return CMD_RET_USAGE;
+       }
+
+       otp = (board << 16) | (variant << 12) | (revision << 8) | bom;
+       display_stboard(otp);
+       printf("=> OTP[%d] = %08X\n", BSEC_OTP_BOARD, otp);
+
+       if (!check_stboard((u16)board)) {
+               printf("Unknown board MB%04x\n", (u16)board);
+               return CMD_RET_FAILURE;
+       }
+       if (!confirmed) {
+               printf("Warning: Programming BOARD in OTP is irreversible!\n");
+               printf("Really perform this OTP programming? <y/N>\n");
+
+               if (!confirm_yesno()) {
+                       puts("BOARD programming aborted\n");
+                       return CMD_RET_FAILURE;
+               }
+       }
+
+       ret = misc_write(dev, STM32_BSEC_OTP(BSEC_OTP_BOARD),
+                        &otp, sizeof(otp));
+
+       if (ret) {
+               puts("BOARD programming error\n");
+               return CMD_RET_FAILURE;
+       }
+       puts("BOARD programming done\n");
+
+       return CMD_RET_SUCCESS;
+}
+
+U_BOOT_CMD(stboard, 6, 0, do_stboard,
+          "read/write board reference in OTP",
+          "\n"
+          "  Print current board information\n"
+          "stboard [-y] <Board> <Variant> <Revision> <BOM>\n"
+          "  Write board information\n"
+          "  - Board: xxxx, example 1264 for MB1264\n"
+          "  - Variant: 1 ... 15\n"
+          "  - Revision: A...O\n"
+          "  - BOM: 1...15\n");