cmd: load: add load command for memory mapped

cp.b is used a lot as a way to load binaries to memory and execute
them, however we may need to integrate this with the efi subsystem to
set it up as a bootdev.

So, introduce a loadm command that will be consistent with the other
loadX commands and will call the efi API's.

ex: loadm $kernel_addr $kernel_addr_r $kernel_size

with this a kernel with CONFIG_EFI_STUB enabled will be loaded and
then subsequently booted with bootefi command.

Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/README b/README
index 9800359e5dfe2748796be515b04a88517ac1efc4..f3304229d8d22e72664fd9f3318379a37631cf5d 100644 (file)
--- a/README
+++ b/README
@@ -2415,6 +2415,7 @@ rarpboot- boot image via network using RARP/TFTP protocol
 diskboot- boot from IDE devicebootd   - boot default, i.e., run 'bootcmd'
 loads  - load S-Record file over serial line
 loadb  - load binary file over serial line (kermit mode)
+loadm   - load binary blob from source address to destination address
 md     - memory display
 mm     - memory modify (auto-incrementing)
 nm     - memory modify (constant address)

diff --git a/cmd/Kconfig b/cmd/Kconfig
index 9a0b7203112d1081b333e7bac1ca28a6688be2b9..dea3729d1327bc735e3e32312987d09bd0fad66c 100644 (file)
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1160,6 +1160,11 @@ config CMD_LOADB
        help
          Load a binary file over serial line.
 
+config CMD_LOADM
+       bool "loadm"
+       help
+         Load a binary over memory mapped.
+
 config CMD_LOADS
        bool "loads"
        default y

diff --git a/cmd/bootefi.c b/cmd/bootefi.c
index 827fcd97dfd840932b13dc48f1017dee1996c33d..37ce659fa123f4b2db90216181f9d090f1fe85cb 100644 (file)
--- a/cmd/bootefi.c
+++ b/cmd/bootefi.c
@@ -34,6 +34,18 @@ static struct efi_device_path *bootefi_device_path;
 static void *image_addr;
 static size_t image_size;
 
+/**
+ * efi_get_image_parameters() - return image parameters
+ *
+ * @img_addr:          address of loaded image in memory
+ * @img_size:          size of loaded image
+ */
+void efi_get_image_parameters(void **img_addr, size_t *img_size)
+{
+       *img_addr = image_addr;
+       *img_size = image_size;
+}
+
 /**
  * efi_clear_bootdev() - clear boot device
  */

diff --git a/cmd/load.c b/cmd/load.c
index 7e4a552d90efc29e5ae61578ca51e0036145bf65..1224a7f85bb37b52126aed10098cb9adec87e920 100644 (file)
--- a/cmd/load.c
+++ b/cmd/load.c
@@ -1063,6 +1063,44 @@ static ulong load_serial_ymodem(ulong offset, int mode)
 
 #endif
 
+#if defined(CONFIG_CMD_LOADM)
+static int do_load_memory_bin(struct cmd_tbl *cmdtp, int flag, int argc,
+                             char *const argv[])
+{
+       ulong   addr, dest, size;
+       void    *src, *dst;
+
+       if (argc != 4)
+               return CMD_RET_USAGE;
+
+       addr = simple_strtoul(argv[1], NULL, 16);
+
+       dest = simple_strtoul(argv[2], NULL, 16);
+
+       size = simple_strtoul(argv[3], NULL, 16);
+
+       if (!size) {
+               printf("loadm: can not load zero bytes\n");
+               return 1;
+       }
+
+       src = map_sysmem(addr, size);
+       dst = map_sysmem(dest, size);
+
+       memcpy(dst, src, size);
+
+       unmap_sysmem(src);
+       unmap_sysmem(dst);
+
+       if (IS_ENABLED(CONFIG_CMD_BOOTEFI))
+               efi_set_bootdev("Mem", "", "", map_sysmem(dest, 0), size);
+
+       printf("loaded bin to memory: size: %lu\n", size);
+
+       return 0;
+}
+#endif
+
 /* -------------------------------------------------------------------- */
 
 #if defined(CONFIG_CMD_LOADS)
@@ -1137,3 +1175,13 @@ U_BOOT_CMD(
 );
 
 #endif /* CONFIG_CMD_LOADB */
+
+#if defined(CONFIG_CMD_LOADM)
+U_BOOT_CMD(
+       loadm, 4, 0,    do_load_memory_bin,
+       "load binary blob from source address to destination address",
+       "[src_addr] [dst_addr] [size]\n"
+       "     - load a binary blob from one memory location to other"
+       " from src_addr to dst_addr by size bytes"
+);
+#endif /* CONFIG_CMD_LOADM */

diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig
index 9d72e39bc20999a6b8c8b0597018eac6cea4d51b..46a9b16ad3ff3cc4ad2f5bf8a607ffb1867aff85 100644 (file)
--- a/configs/sandbox64_defconfig
+++ b/configs/sandbox64_defconfig
@@ -47,6 +47,7 @@ CONFIG_CMD_GPT=y
 CONFIG_CMD_GPT_RENAME=y
 CONFIG_CMD_IDE=y
 CONFIG_CMD_I2C=y
+CONFIG_CMD_LOADM=y
 CONFIG_CMD_OSD=y
 CONFIG_CMD_PCI=y
 CONFIG_CMD_READ=y

diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index be40562cc3f96722686048a3a22eb07174093cb2..86204c7908827cd808a5b74016777e02a556c1b3 100644 (file)
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -67,6 +67,7 @@ CONFIG_CMD_GPT=y
 CONFIG_CMD_GPT_RENAME=y
 CONFIG_CMD_IDE=y
 CONFIG_CMD_I2C=y
+CONFIG_CMD_LOADM=y
 CONFIG_CMD_LSBLK=y
 CONFIG_CMD_MUX=y
 CONFIG_CMD_OSD=y

diff --git a/doc/usage/cmd/loadm.rst b/doc/usage/cmd/loadm.rst
new file mode 100644 (file)
index 0000000..b657114
--- /dev/null
+++ b/doc/usage/cmd/loadm.rst
@@ -0,0 +1,49 @@
+.. SPDX-License-Identifier: GPL-2.0+:
+
+loadm command
+=============
+
+Synopsis
+--------
+
+::
+
+    loadm <src_addr> <dst_addr> <len>
+
+Description
+-----------
+
+The loadm command is used to copy memory content from source address
+to destination address and, if efi is enabled, will setup a "Mem" efi
+boot device.
+
+The number of transferred bytes must be set by bytes parameter
+
+src_addr
+    start address of the memory location to be loaded
+
+dst_addr
+    destination address of the byte stream to be loaded
+
+len
+    number of bytes to be copied in hexadecimal. Can not be 0 (zero).
+
+Example
+-------
+
+::
+
+    => loadm ${kernel_addr} ${kernel_addr_r} ${kernel_size}
+    loaded bin to memory: size: 12582912
+
+Configuration
+-------------
+
+The command is only available if CONFIG_CMD_LOADM=y.
+
+Return value
+------------
+
+The return value $? is set 0 (true) if the loading is succefull, and
+is set to 1 (false) in case of error.
+

diff --git a/doc/usage/index.rst b/doc/usage/index.rst
index 770418434ad98448a088bdb9244d014b8868af5a..8d08ea14b00f770e1116c9700819cd6dd0df7bb2 100644 (file)
--- a/doc/usage/index.rst
+++ b/doc/usage/index.rst
@@ -44,6 +44,7 @@ Shell commands
    cmd/fatload
    cmd/for
    cmd/load
+   cmd/loadm
    cmd/loady
    cmd/mbr
    cmd/md

diff --git a/include/efi_loader.h b/include/efi_loader.h
index c1e00ebac398c4372f3b689e5d7347f22c72e03a..31de191e3df3a2923e7b618af63b1e6e5a5001e1 100644 (file)
--- a/include/efi_loader.h
+++ b/include/efi_loader.h
@@ -591,6 +591,8 @@ efi_status_t efi_load_pe(struct efi_loaded_image_obj *handle,
 void efi_save_gd(void);
 /* Call this to relocate the runtime section to an address space */
 void efi_runtime_relocate(ulong offset, struct efi_mem_desc *map);
+/* Call this to get image parameters */
+void efi_get_image_parameters(void **img_addr, size_t *img_size);
 /* Add a new object to the object list. */
 void efi_add_handle(efi_handle_t obj);
 /* Create handle */

diff --git a/include/test/suites.h b/include/test/suites.h
index ee6858a802a55bec71ba74af2f185ebff6195681..ddb8827fdb15e93f99c3b3c182a25a7f0fcecf1d 100644 (file)
--- a/include/test/suites.h
+++ b/include/test/suites.h
@@ -39,6 +39,7 @@ int do_ut_compression(struct cmd_tbl *cmdtp, int flag, int argc,
 int do_ut_dm(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);
 int do_ut_env(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);
 int do_ut_lib(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);
+int do_ut_loadm(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);
 int do_ut_log(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]);
 int do_ut_mem(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);
 int do_ut_optee(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);

diff --git a/lib/efi_loader/efi_device_path.c b/lib/efi_loader/efi_device_path.c
index 171661b8972728f0babebf8a6de25e62cc4019ab..2493d7432613d368793838fc9585990e09d15659 100644 (file)
--- a/lib/efi_loader/efi_device_path.c
+++ b/lib/efi_loader/efi_device_path.c
@@ -1158,6 +1158,8 @@ efi_status_t efi_dp_from_name(const char *dev, const char *devnr,
 {
        struct blk_desc *desc = NULL;
        struct disk_partition fs_partition;
+       size_t image_size;
+       void *image_addr;
        int part = 0;
        char *filename;
        char *s;
@@ -1173,6 +1175,13 @@ efi_status_t efi_dp_from_name(const char *dev, const char *devnr,
        } else if (!strcmp(dev, "Uart")) {
                if (device)
                        *device = efi_dp_from_uart();
+       } else if (!strcmp(dev, "Mem")) {
+               efi_get_image_parameters(&image_addr, &image_size);
+
+               if (device)
+                       *device = efi_dp_from_mem(EFI_RESERVED_MEMORY_TYPE,
+                                                 (uintptr_t)image_addr,
+                                                 image_size);
        } else {
                part = blk_get_device_part_str(dev, devnr, &desc, &fs_partition,
                                               1);

diff --git a/test/cmd/Makefile b/test/cmd/Makefile
index a59adb1e6d60dd59c97bf1b45de625d3e3a3543f..4b2d7df0d2ef92deae9412467e2c1a69b70c8db1 100644 (file)
--- a/test/cmd/Makefile
+++ b/test/cmd/Makefile
@@ -7,6 +7,7 @@ obj-$(CONFIG_CONSOLE_RECORD) += test_echo.o
 endif
 obj-y += mem.o
 obj-$(CONFIG_CMD_ADDRMAP) += addrmap.o
+obj-$(CONFIG_CMD_LOADM) += loadm.o
 obj-$(CONFIG_CMD_MEM_SEARCH) += mem_search.o
 obj-$(CONFIG_CMD_PINMUX) += pinmux.o
 obj-$(CONFIG_CMD_PWM) += pwm.o

diff --git a/test/cmd/loadm.c b/test/cmd/loadm.c
new file mode 100644 (file)
index 0000000..41e005a
--- /dev/null
+++ b/test/cmd/loadm.c
@@ -0,0 +1,72 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Test for loadm command
+ *
+ * Copyright 2022 ARM Limited
+ * Copyright 2022 Linaro
+ *
+ * Authors:
+ *   Rui Miguel Silva <rui.silva@linaro.org>
+ */
+
+#include <common.h>
+#include <console.h>
+#include <mapmem.h>
+#include <asm/global_data.h>
+#include <dm/test.h>
+#include <test/suites.h>
+#include <test/test.h>
+#include <test/ut.h>
+
+#define BUF_SIZE 0x100
+
+#define LOADM_TEST(_name, _flags)      UNIT_TEST(_name, _flags, loadm_test)
+
+static int loadm_test_params(struct unit_test_state *uts)
+{
+       ut_assertok(console_record_reset_enable());
+       run_command("loadm", 0);
+       ut_assert_nextline("loadm - load binary blob from source address to destination address");
+
+       ut_assertok(console_record_reset_enable());
+       run_command("loadm 0x12345678", 0);
+       ut_assert_nextline("loadm - load binary blob from source address to destination address");
+
+       ut_assertok(console_record_reset_enable());
+       run_command("loadm 0x12345678 0x12345678", 0);
+       ut_assert_nextline("loadm - load binary blob from source address to destination address");
+
+       ut_assertok(console_record_reset_enable());
+       run_command("loadm 0x12345678 0x12345678 0", 0);
+       ut_assert_nextline("loadm: can not load zero bytes");
+
+       return 0;
+}
+LOADM_TEST(loadm_test_params, UT_TESTF_CONSOLE_REC);
+
+static int loadm_test_load (struct unit_test_state *uts)
+{
+       char *buf;
+
+       buf = map_sysmem(0, BUF_SIZE);
+       memset(buf, '\0', BUF_SIZE);
+       memset(buf, 0xaa, BUF_SIZE / 2);
+
+       ut_assertok(console_record_reset_enable());
+       run_command("loadm 0x0 0x80 0x80", 0);
+       ut_assert_nextline("loaded bin to memory: size: 128");
+
+       unmap_sysmem(buf);
+
+       return 0;
+}
+LOADM_TEST(loadm_test_load, UT_TESTF_CONSOLE_REC);
+
+int do_ut_loadm(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
+{
+       struct unit_test *tests = UNIT_TEST_SUITE_START(loadm_test);
+       const int n_ents = UNIT_TEST_SUITE_COUNT(loadm_test);
+
+       return cmd_ut_category("loadm", "loadm_test_", tests, n_ents, argc,
+                              argv);
+}

diff --git a/test/cmd_ut.c b/test/cmd_ut.c
index 67a13ee32b8b8917b60cf04f2bd9b0b356485e22..d70b72678aedbbbb19796817aa7af1aa3a27dfb8 100644 (file)
--- a/test/cmd_ut.c
+++ b/test/cmd_ut.c
@@ -74,6 +74,9 @@ static struct cmd_tbl cmd_ut_sub[] = {
 #ifdef CONFIG_CMD_ADDRMAP
        U_BOOT_CMD_MKENT(addrmap, CONFIG_SYS_MAXARGS, 1, do_ut_addrmap, "", ""),
 #endif
+#ifdef CONFIG_CMD_LOADM
+       U_BOOT_CMD_MKENT(loadm, CONFIG_SYS_MAXARGS, 1, do_ut_loadm, "", ""),
+#endif
 };
 
 static int do_ut_all(struct cmd_tbl *cmdtp, int flag, int argc,
@@ -155,6 +158,9 @@ static char ut_help_text[] =
 #endif
 #ifdef CONFIG_CMD_ADDRMAP
        "ut addrmap - Very basic test of addrmap command\n"
+#endif
+#ifdef CONFIG_CMD_LOADM
+       "ut loadm [test-name]- test of parameters and load memory blob\n"
 #endif
        ;
 #endif /* CONFIG_SYS_LONGHELP */