Re: [PATCH] xilinx: versal-net: Add new versalnet loadpdi command

[Michal Simek]

On 5/22/23 15:21, Michal Simek wrote:

From: Algapally Santosh Sagar 

Versal NET loadpdi command is used for loading secure & non-secure
pdi images.

Signed-off-by: Algapally Santosh Sagar 
Signed-off-by: Michal Simek 
---

  board/xilinx/versal-net/Kconfig  |  8 
  board/xilinx/versal-net/Makefile |  1 +
  board/xilinx/versal-net/cmds.c   | 81 
  3 files changed, 90 insertions(+)
  create mode 100644 board/xilinx/versal-net/cmds.c

diff --git a/board/xilinx/versal-net/Kconfig b/board/xilinx/versal-net/Kconfig
index 8f94d2bb399a..2484429d3cb3 100644
--- a/board/xilinx/versal-net/Kconfig
+++ b/board/xilinx/versal-net/Kconfig
@@ -6,4 +6,12 @@
  
  if ARCH_VERSAL_NET
  
+config CMD_VERSAL_NET

+   bool "Enable Versal NET specific commands"
+   default y
+   depends on ZYNQMP_FIRMWARE
+   help
+ Select this to enable Versal NET specific commands.
+ Commands like versalnet loadpdi are enabled by this.
+
  endif
diff --git a/board/xilinx/versal-net/Makefile b/board/xilinx/versal-net/Makefile
index 2008d4e231c6..f9ff07c11c63 100644
--- a/board/xilinx/versal-net/Makefile
+++ b/board/xilinx/versal-net/Makefile
@@ -7,3 +7,4 @@
  #
  
  obj-y	:= board.o

+obj-$(CONFIG_CMD_VERSAL_NET)   += cmds.o
diff --git a/board/xilinx/versal-net/cmds.c b/board/xilinx/versal-net/cmds.c
new file mode 100644
index ..b18a71fe52c0
--- /dev/null
+++ b/board/xilinx/versal-net/cmds.c
@@ -0,0 +1,81 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2023, Advanced Micro Devices, Inc.
+ *
+ * Michal Simek 
+ */
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+/**
+ * do_versalnet_load_pdi - Handle the "versalnet load pdi" command-line command
+ * @cmdtp:  Command data struct pointer
+ * @flag:   Command flag
+ * @argc:   Command-line argument count
+ * @argv:   Array of command-line arguments
+ *
+ * Processes the Versal NET load pdi command
+ *
+ * Return: return 0 on success, Error value if command fails.
+ * CMD_RET_USAGE incase of incorrect/missing parameters.
+ */
+static int do_versalnet_load_pdi(struct cmd_tbl *cmdtp, int flag, int argc,
+char * const argv[])
+{
+   u32 buf_lo, buf_hi;
+   u32 ret_payload[PAYLOAD_ARG_CNT];
+   ulong addr, *pdi_buf;
+   size_t len;
+   int ret;
+
+   if (argc != cmdtp->maxargs) {
+   debug("pdi_load: incorrect parameters passed\n");
+   return CMD_RET_USAGE;
+   }
+
+   addr = simple_strtol(argv[1], NULL, 16);
+   if (!addr) {
+   debug("pdi_load: zero pdi_data address\n");
+   return CMD_RET_USAGE;
+   }
+
+   len = hextoul(argv[2], NULL);
+   if (!len) {
+   debug("pdi_load: zero size\n");
+   return CMD_RET_USAGE;
+   }
+
+   pdi_buf = (ulong *)ALIGN((ulong)addr, ARCH_DMA_MINALIGN);
+   if ((ulong)addr != (ulong)pdi_buf) {
+   memcpy((void *)pdi_buf, (void *)addr, len);
+   debug("Pdi addr:0x%lx aligned to 0x%lx\n",
+ addr, (ulong)pdi_buf);
+   }
+
+   flush_dcache_range((ulong)pdi_buf, (ulong)pdi_buf + len);
+
+   buf_lo = lower_32_bits((ulong)pdi_buf);
+   buf_hi = upper_32_bits((ulong)pdi_buf);
+
+   ret = xilinx_pm_request(VERSAL_PM_LOAD_PDI, VERSAL_PM_PDI_TYPE, buf_lo,
+   buf_hi, 0, ret_payload);
+   if (ret)
+   printf("PDI load failed with err: 0x%08x\n", ret);
+
+   return cmd_process_error(cmdtp, ret);
+}
+
+static char versalnet_help_text[] =
+   "loadpdi addr len - Load pdi image\n"
+   "load pdi image at ddr address 'addr' with pdi image size 'len'\n"
+;
+
+U_BOOT_CMD_WITH_SUBCMDS(versalnet, "Versal NET sub-system", 
versalnet_help_text,
+   U_BOOT_SUBCMD_MKENT(loadpdi, 3, 1,
+   do_versalnet_load_pdi));


Applied.
M

[PATCH] xilinx: versal-net: Add new versalnet loadpdi command

[Michal Simek]

From: Algapally Santosh Sagar 

Versal NET loadpdi command is used for loading secure & non-secure
pdi images.

Signed-off-by: Algapally Santosh Sagar 
Signed-off-by: Michal Simek 
---

 board/xilinx/versal-net/Kconfig  |  8 
 board/xilinx/versal-net/Makefile |  1 +
 board/xilinx/versal-net/cmds.c   | 81 
 3 files changed, 90 insertions(+)
 create mode 100644 board/xilinx/versal-net/cmds.c

diff --git a/board/xilinx/versal-net/Kconfig b/board/xilinx/versal-net/Kconfig
index 8f94d2bb399a..2484429d3cb3 100644
--- a/board/xilinx/versal-net/Kconfig
+++ b/board/xilinx/versal-net/Kconfig
@@ -6,4 +6,12 @@
 
 if ARCH_VERSAL_NET
 
+config CMD_VERSAL_NET
+   bool "Enable Versal NET specific commands"
+   default y
+   depends on ZYNQMP_FIRMWARE
+   help
+ Select this to enable Versal NET specific commands.
+ Commands like versalnet loadpdi are enabled by this.
+
 endif
diff --git a/board/xilinx/versal-net/Makefile b/board/xilinx/versal-net/Makefile
index 2008d4e231c6..f9ff07c11c63 100644
--- a/board/xilinx/versal-net/Makefile
+++ b/board/xilinx/versal-net/Makefile
@@ -7,3 +7,4 @@
 #
 
 obj-y  := board.o
+obj-$(CONFIG_CMD_VERSAL_NET)   += cmds.o
diff --git a/board/xilinx/versal-net/cmds.c b/board/xilinx/versal-net/cmds.c
new file mode 100644
index ..b18a71fe52c0
--- /dev/null
+++ b/board/xilinx/versal-net/cmds.c
@@ -0,0 +1,81 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2023, Advanced Micro Devices, Inc.
+ *
+ * Michal Simek 
+ */
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+/**
+ * do_versalnet_load_pdi - Handle the "versalnet load pdi" command-line command
+ * @cmdtp:  Command data struct pointer
+ * @flag:   Command flag
+ * @argc:   Command-line argument count
+ * @argv:   Array of command-line arguments
+ *
+ * Processes the Versal NET load pdi command
+ *
+ * Return: return 0 on success, Error value if command fails.
+ * CMD_RET_USAGE incase of incorrect/missing parameters.
+ */
+static int do_versalnet_load_pdi(struct cmd_tbl *cmdtp, int flag, int argc,
+char * const argv[])
+{
+   u32 buf_lo, buf_hi;
+   u32 ret_payload[PAYLOAD_ARG_CNT];
+   ulong addr, *pdi_buf;
+   size_t len;
+   int ret;
+
+   if (argc != cmdtp->maxargs) {
+   debug("pdi_load: incorrect parameters passed\n");
+   return CMD_RET_USAGE;
+   }
+
+   addr = simple_strtol(argv[1], NULL, 16);
+   if (!addr) {
+   debug("pdi_load: zero pdi_data address\n");
+   return CMD_RET_USAGE;
+   }
+
+   len = hextoul(argv[2], NULL);
+   if (!len) {
+   debug("pdi_load: zero size\n");
+   return CMD_RET_USAGE;
+   }
+
+   pdi_buf = (ulong *)ALIGN((ulong)addr, ARCH_DMA_MINALIGN);
+   if ((ulong)addr != (ulong)pdi_buf) {
+   memcpy((void *)pdi_buf, (void *)addr, len);
+   debug("Pdi addr:0x%lx aligned to 0x%lx\n",
+ addr, (ulong)pdi_buf);
+   }
+
+   flush_dcache_range((ulong)pdi_buf, (ulong)pdi_buf + len);
+
+   buf_lo = lower_32_bits((ulong)pdi_buf);
+   buf_hi = upper_32_bits((ulong)pdi_buf);
+
+   ret = xilinx_pm_request(VERSAL_PM_LOAD_PDI, VERSAL_PM_PDI_TYPE, buf_lo,
+   buf_hi, 0, ret_payload);
+   if (ret)
+   printf("PDI load failed with err: 0x%08x\n", ret);
+
+   return cmd_process_error(cmdtp, ret);
+}
+
+static char versalnet_help_text[] =
+   "loadpdi addr len - Load pdi image\n"
+   "load pdi image at ddr address 'addr' with pdi image size 'len'\n"
+;
+
+U_BOOT_CMD_WITH_SUBCMDS(versalnet, "Versal NET sub-system", 
versalnet_help_text,
+   U_BOOT_SUBCMD_MKENT(loadpdi, 3, 1,
+   do_versalnet_load_pdi));
-- 
2.36.1