stm32mp: cmd_stm32key: add get_misc_dev function

[platform/kernel/u-boot.git] / arch / arm / mach-stm32mp / cmd_stm32key.c

diff --git a/arch/arm/mach-stm32mp/cmd_stm32key.c b/arch/arm/mach-stm32mp/cmd_stm32key.c
index 42fdc11..886c527 100644 (file)
--- a/arch/arm/mach-stm32mp/cmd_stm32key.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32key.c
@@ -14,6 +14,17 @@
 #define STM32_OTP_HASH_KEY_START 24
 #define STM32_OTP_HASH_KEY_SIZE 8
 
+static int get_misc_dev(struct udevice **dev)
+{
+       int ret;
+
+       ret = uclass_get_device_by_driver(UCLASS_MISC, DM_DRIVER_GET(stm32mp_bsec), dev);
+       if (ret)
+               log_err("Can't find stm32mp_bsec driver\n");
+
+       return ret;
+}
+
 static void read_hash_value(u32 addr)
 {
        int i;
@@ -25,32 +36,38 @@ static void read_hash_value(u32 addr)
        }
 }
 
-static void fuse_hash_value(u32 addr, bool print)
+static int fuse_hash_value(u32 addr, bool print)
 {
        struct udevice *dev;
        u32 word, val;
        int i, ret;
 
-       ret = uclass_get_device_by_driver(UCLASS_MISC,
-                                         DM_DRIVER_GET(stm32mp_bsec),
-                                         &dev);
-       if (ret) {
-               log_err("Can't find stm32mp_bsec driver\n");
-               return;
-       }
-
-       for (i = 0; i < STM32_OTP_HASH_KEY_SIZE; i++) {
-               if (print)
-                       printf("Fuse OTP %i : %x\n",
-                              STM32_OTP_HASH_KEY_START + i,
-                              __be32_to_cpu(*(u32 *)addr));
+       ret = get_misc_dev(&dev);
+       if (ret)
+               return ret;
 
-               word = STM32_OTP_HASH_KEY_START + i;
+       for (i = 0, word = STM32_OTP_HASH_KEY_START;
+            i < STM32_OTP_HASH_KEY_SIZE;
+            i++, word++, addr += 4) {
                val = __be32_to_cpu(*(u32 *)addr);
-               misc_write(dev, STM32_BSEC_OTP(word), &val, 4);
-
-               addr += 4;
+               if (print)
+                       printf("Fuse OTP %i : %x\n", word, val);
+
+               ret = misc_write(dev, STM32_BSEC_OTP(word), &val, 4);
+               if (ret != 4) {
+                       log_err("Fuse OTP %i failed\n", word);
+                       return ret;
+               }
+               /* on success, lock the OTP for HASH key */
+               val = 1;
+               ret = misc_write(dev, STM32_BSEC_LOCK(word), &val, 4);
+               if (ret != 4) {
+                       log_err("Lock OTP %i failed\n", word);
+                       return ret;
+               }
        }
+
+       return 0;
 }
 
 static int confirm_prog(void)
@@ -67,36 +84,55 @@ static int confirm_prog(void)
        return 0;
 }
 
-static int do_stm32key(struct cmd_tbl *cmdtp, int flag, int argc,
-                      char *const argv[])
+static int do_stm32key_read(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
        u32 addr;
-       const char *op = argc >= 2 ? argv[1] : NULL;
-       int confirmed = argc > 3 && !strcmp(argv[2], "-y");
 
-       argc -= 2 + confirmed;
-       argv += 2 + confirmed;
-
-       if (argc < 1)
+       if (argc == 1)
                return CMD_RET_USAGE;
 
-       addr = simple_strtoul(argv[0], NULL, 16);
+       addr = simple_strtoul(argv[1], NULL, 16);
        if (!addr)
                return CMD_RET_USAGE;
 
-       if (!strcmp(op, "read"))
-               read_hash_value(addr);
+       read_hash_value(addr);
+
+       return CMD_RET_SUCCESS;
+}
+
+static int do_stm32key_fuse(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
+{
+       u32 addr;
+       bool yes = false;
+
+       if (argc < 2)
+               return CMD_RET_USAGE;
 
-       if (!strcmp(op, "fuse")) {
-               if (!confirmed && !confirm_prog())
-                       return CMD_RET_FAILURE;
-               fuse_hash_value(addr, !confirmed);
+       if (argc == 3) {
+               if (strcmp(argv[1], "-y"))
+                       return CMD_RET_USAGE;
+               yes = true;
        }
 
+       addr = simple_strtoul(argv[argc - 1], NULL, 16);
+       if (!addr)
+               return CMD_RET_USAGE;
+
+       if (!yes && !confirm_prog())
+               return CMD_RET_FAILURE;
+
+       if (fuse_hash_value(addr, !yes))
+               return CMD_RET_FAILURE;
+
+       printf("Hash key updated !\n");
+
        return CMD_RET_SUCCESS;
 }
 
-U_BOOT_CMD(stm32key, 4, 1, do_stm32key,
-          "Fuse ST Hash key",
-          "read <addr>: Read the hash store at addr in memory\n"
-          "stm32key fuse [-y] <addr> : Fuse hash store at addr in otp\n");
+static char stm32key_help_text[] =
+       "read <addr>: Read the hash stored at addr in memory\n"
+       "stm32key fuse [-y] <addr> : Fuse hash stored at addr in OTP\n";
+
+U_BOOT_CMD_WITH_SUBCMDS(stm32key, "Fuse ST Hash key", stm32key_help_text,
+       U_BOOT_SUBCMD_MKENT(read, 2, 0, do_stm32key_read),
+       U_BOOT_SUBCMD_MKENT(fuse, 3, 0, do_stm32key_fuse));