Merge tag 'xilinx-for-v2020.01' of https://gitlab.denx.de/u-boot/custodians/u-boot...
[platform/kernel/u-boot.git] / board / xilinx / zynqmp / cmds.c
index 6712d7b..f53a1b6 100644 (file)
@@ -1,33 +1,48 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * (C) Copyright 2018 Xilinx, Inc.
  * Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com>
- *
- * SPDX-License-Identifier:    GPL-2.0
  */
 
 #include <common.h>
+#include <env.h>
 #include <malloc.h>
+#include <zynqmp_firmware.h>
+#include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/io.h>
 
-static int zynqmp_verify_secure(u8 *key_ptr, u8 *src_ptr, u32 len)
+static int do_zynqmp_verify_secure(cmd_tbl_t *cmdtp, int flag, int argc,
+                                  char * const argv[])
 {
+       u64 src_addr, addr;
+       u32 len, src_lo, src_hi;
+       u8 *key_ptr = NULL;
        int ret;
-       u32 src_lo, src_hi;
        u32 key_lo = 0;
        u32 key_hi = 0;
        u32 ret_payload[PAYLOAD_ARG_CNT];
-       u64 addr;
 
-       if ((ulong)src_ptr != ALIGN((ulong)src_ptr,
-                                   CONFIG_SYS_CACHELINE_SIZE)) {
-               printf("Failed: source address not aligned:%p\n", src_ptr);
+       if (argc < 4)
+               return CMD_RET_USAGE;
+
+       src_addr = simple_strtoull(argv[2], NULL, 16);
+       len = simple_strtoul(argv[3], NULL, 16);
+
+       if (argc == 5)
+               key_ptr = (uint8_t *)(uintptr_t)simple_strtoull(argv[4],
+                                                               NULL, 16);
+
+       if ((ulong)src_addr != ALIGN((ulong)src_addr,
+                                    CONFIG_SYS_CACHELINE_SIZE)) {
+               printf("Failed: source address not aligned:%lx\n",
+                      (ulong)src_addr);
                return -EINVAL;
        }
 
-       src_lo = lower_32_bits((ulong)src_ptr);
-       src_hi = upper_32_bits((ulong)src_ptr);
-       flush_dcache_range((ulong)src_ptr, (ulong)(src_ptr + len));
+       src_lo = lower_32_bits((ulong)src_addr);
+       src_hi = upper_32_bits((ulong)src_addr);
+       flush_dcache_range((ulong)src_addr, (ulong)(src_addr + len));
 
        if (key_ptr) {
                key_lo = lower_32_bits((ulong)key_ptr);
@@ -49,6 +64,79 @@ static int zynqmp_verify_secure(u8 *key_ptr, u8 *src_ptr, u32 len)
        return ret;
 }
 
+static int do_zynqmp_mmio_read(cmd_tbl_t *cmdtp, int flag, int argc,
+                              char * const argv[])
+{
+       u32 read_val, addr;
+       int ret;
+
+       if (argc != cmdtp->maxargs)
+               return CMD_RET_USAGE;
+
+       addr = simple_strtoul(argv[2], NULL, 16);
+
+       ret = zynqmp_mmio_read(addr, &read_val);
+       if (!ret)
+               printf("mmio read value at 0x%x = 0x%x\n",
+                      addr, read_val);
+       else
+               printf("Failed: mmio read\n");
+
+       return ret;
+}
+
+static int do_zynqmp_mmio_write(cmd_tbl_t *cmdtp, int flag, int argc,
+                               char * const argv[])
+{
+       u32 addr, mask, val;
+       int ret;
+
+       if (argc != cmdtp->maxargs)
+               return CMD_RET_USAGE;
+
+       addr = simple_strtoul(argv[2], NULL, 16);
+       mask = simple_strtoul(argv[3], NULL, 16);
+       val = simple_strtoul(argv[4], NULL, 16);
+
+       ret = zynqmp_mmio_write(addr, mask, val);
+       if (ret != 0)
+               printf("Failed: mmio write\n");
+
+       return ret;
+}
+
+#ifdef CONFIG_DEFINE_TCM_OCM_MMAP
+static int do_zynqmp_tcm_init(cmd_tbl_t *cmdtp, int flag, int argc,
+                             char * const argv[])
+{
+       u8 mode;
+
+       if (argc != cmdtp->maxargs)
+               return CMD_RET_USAGE;
+
+       mode = simple_strtoul(argv[2], NULL, 16);
+       if (mode != TCM_LOCK && mode != TCM_SPLIT) {
+               printf("Mode should be either 0(lock)/1(split)\n");
+               return CMD_RET_FAILURE;
+       }
+
+       dcache_disable();
+       tcm_init(mode);
+       dcache_enable();
+
+       return CMD_RET_SUCCESS;
+}
+#endif
+
+static cmd_tbl_t cmd_zynqmp_sub[] = {
+       U_BOOT_CMD_MKENT(secure, 5, 0, do_zynqmp_verify_secure, "", ""),
+       U_BOOT_CMD_MKENT(mmio_read, 3, 0, do_zynqmp_mmio_read, "", ""),
+       U_BOOT_CMD_MKENT(mmio_write, 5, 0, do_zynqmp_mmio_write, "", ""),
+#ifdef CONFIG_DEFINE_TCM_OCM_MMAP
+       U_BOOT_CMD_MKENT(tcminit, 3, 0, do_zynqmp_tcm_init, "", ""),
+#endif
+};
+
 /**
  * do_zynqmp - Handle the "zynqmp" command-line command
  * @cmdtp:     Command data struct pointer
@@ -63,30 +151,18 @@ static int zynqmp_verify_secure(u8 *key_ptr, u8 *src_ptr, u32 len)
 static int do_zynqmp(cmd_tbl_t *cmdtp, int flag, int argc,
                     char *const argv[])
 {
-       u64 src_addr;
-       u32 len;
-       u8 *key_ptr = NULL;
-       u8 *src_ptr;
-       int ret;
+       cmd_tbl_t *c;
 
-       if (argc > 5 || argc < 4 || strncmp(argv[1], "secure", 6))
+       if (argc < 2)
                return CMD_RET_USAGE;
 
-       src_addr = simple_strtoull(argv[2], NULL, 16);
-
-       len = simple_strtoul(argv[3], NULL, 16);
-
-       if (argc > 4)
-               key_ptr = (uint8_t *)(uintptr_t)simple_strtoull(argv[4],
-                                                               NULL, 16);
-
-       src_ptr = (uint8_t *)(uintptr_t)src_addr;
-
-       ret = zynqmp_verify_secure(key_ptr, src_ptr, len);
-       if (ret)
-               return CMD_RET_FAILURE;
+       c = find_cmd_tbl(argv[1], &cmd_zynqmp_sub[0],
+                        ARRAY_SIZE(cmd_zynqmp_sub));
 
-       return CMD_RET_SUCCESS;
+       if (c)
+               return c->cmd(c, flag, argc, argv);
+       else
+               return CMD_RET_USAGE;
 }
 
 /***************************************************/
@@ -95,11 +171,22 @@ static char zynqmp_help_text[] =
        "secure src len [key_addr] - verifies secure images of $len bytes\n"
        "                            long at address $src. Optional key_addr\n"
        "                            can be specified if user key needs to\n"
-       "                            be used for decryption\n";
+       "                            be used for decryption\n"
+       "zynqmp mmio_read address - read from address\n"
+       "zynqmp mmio_write address mask value - write value after masking to\n"
+       "                                       address\n"
+#ifdef CONFIG_DEFINE_TCM_OCM_MMAP
+       "zynqmp tcminit mode - Initialize the TCM with zeros. TCM needs to be\n"
+       "                      initialized before accessing to avoid ECC\n"
+       "                      errors. mode specifies in which mode TCM has\n"
+       "                      to be initialized. Supported modes will be\n"
+       "                      lock(0)/split(1)\n"
+#endif
+       ;
 #endif
 
 U_BOOT_CMD(
        zynqmp, 5, 1, do_zynqmp,
-       "Verify and load secure images",
+       "ZynqMP sub-system",
        zynqmp_help_text
 )