qemu: Move qfw kernel setup into a common file

[platform/kernel/u-boot.git] / cmd / qfw.c

diff --git a/cmd/qfw.c b/cmd/qfw.c
index bb57148..ae3c6a7 100644 (file)
--- a/cmd/qfw.c
+++ b/cmd/qfw.c
@@ -8,85 +8,24 @@
 #include <env.h>
 #include <errno.h>
 #include <qfw.h>
+#include <dm.h>
 
-/*
- * This function prepares kernel for zboot. It loads kernel data
- * to 'load_addr', initrd to 'initrd_addr' and kernel command
- * line using qemu fw_cfg interface.
- */
-static int qemu_fwcfg_setup_kernel(void *load_addr, void *initrd_addr)
-{
-       char *data_addr;
-       uint32_t setup_size, kernel_size, cmdline_size, initrd_size;
-
-       qemu_fwcfg_read_entry(FW_CFG_SETUP_SIZE, 4, &setup_size);
-       qemu_fwcfg_read_entry(FW_CFG_KERNEL_SIZE, 4, &kernel_size);
-
-       if (setup_size == 0 || kernel_size == 0) {
-               printf("warning: no kernel available\n");
-               return -1;
-       }
-
-       data_addr = load_addr;
-       qemu_fwcfg_read_entry(FW_CFG_SETUP_DATA,
-                             le32_to_cpu(setup_size), data_addr);
-       data_addr += le32_to_cpu(setup_size);
-
-       qemu_fwcfg_read_entry(FW_CFG_KERNEL_DATA,
-                             le32_to_cpu(kernel_size), data_addr);
-       data_addr += le32_to_cpu(kernel_size);
-
-       data_addr = initrd_addr;
-       qemu_fwcfg_read_entry(FW_CFG_INITRD_SIZE, 4, &initrd_size);
-       if (initrd_size == 0) {
-               printf("warning: no initrd available\n");
-       } else {
-               qemu_fwcfg_read_entry(FW_CFG_INITRD_DATA,
-                                     le32_to_cpu(initrd_size), data_addr);
-               data_addr += le32_to_cpu(initrd_size);
-       }
-
-       qemu_fwcfg_read_entry(FW_CFG_CMDLINE_SIZE, 4, &cmdline_size);
-       if (cmdline_size) {
-               qemu_fwcfg_read_entry(FW_CFG_CMDLINE_DATA,
-                                     le32_to_cpu(cmdline_size), data_addr);
-               /*
-                * if kernel cmdline only contains '\0', (e.g. no -append
-                * when invoking qemu), do not update bootargs
-                */
-               if (*data_addr != '\0') {
-                       if (env_set("bootargs", data_addr) < 0)
-                               printf("warning: unable to change bootargs\n");
-               }
-       }
-
-       printf("loading kernel to address %p size %x", load_addr,
-              le32_to_cpu(kernel_size));
-       if (initrd_size)
-               printf(" initrd %p size %x\n",
-                      initrd_addr,
-                      le32_to_cpu(initrd_size));
-       else
-               printf("\n");
+static struct udevice *qfw_dev;
 
-       return 0;
-}
-
-static int qemu_fwcfg_list_firmware(void)
+static int qemu_fwcfg_cmd_list_firmware(void)
 {
        int ret;
        struct fw_cfg_file_iter iter;
        struct fw_file *file;
 
        /* make sure fw_list is loaded */
-       ret = qemu_fwcfg_read_firmware_list();
+       ret = qfw_read_firmware_list(qfw_dev);
        if (ret)
                return ret;
 
-
-       for (file = qemu_fwcfg_file_iter_init(&iter);
-            !qemu_fwcfg_file_iter_end(&iter);
-            file = qemu_fwcfg_file_iter_next(&iter)) {
+       for (file = qfw_file_iter_init(qfw_dev, &iter);
+            !qfw_file_iter_end(&iter);
+            file = qfw_file_iter_next(&iter)) {
                printf("%-56s\n", file->cfg.name);
        }
 
@@ -96,7 +35,7 @@ static int qemu_fwcfg_list_firmware(void)
 static int qemu_fwcfg_do_list(struct cmd_tbl *cmdtp, int flag,
                              int argc, char *const argv[])
 {
-       if (qemu_fwcfg_list_firmware() < 0)
+       if (qemu_fwcfg_cmd_list_firmware() < 0)
                return CMD_RET_FAILURE;
 
        return 0;
@@ -105,14 +44,7 @@ static int qemu_fwcfg_do_list(struct cmd_tbl *cmdtp, int flag,
 static int qemu_fwcfg_do_cpus(struct cmd_tbl *cmdtp, int flag,
                              int argc, char *const argv[])
 {
-       int ret = qemu_fwcfg_online_cpus();
-       if (ret < 0) {
-               printf("QEMU fw_cfg interface not found\n");
-               return CMD_RET_FAILURE;
-       }
-
-       printf("%d cpu(s) online\n", qemu_fwcfg_online_cpus());
-
+       printf("%d cpu(s) online\n", qfw_online_cpus(qfw_dev));
        return 0;
 }
 
@@ -120,32 +52,28 @@ static int qemu_fwcfg_do_load(struct cmd_tbl *cmdtp, int flag,
                              int argc, char *const argv[])
 {
        char *env;
-       void *load_addr;
-       void *initrd_addr;
+       ulong load_addr;
+       ulong initrd_addr;
 
        env = env_get("loadaddr");
        load_addr = env ?
-               (void *)simple_strtoul(env, NULL, 16) :
-#ifdef CONFIG_LOADADDR
-               (void *)CONFIG_LOADADDR;
-#else
-               NULL;
-#endif
+               hextoul(env, NULL) :
+               CONFIG_SYS_LOAD_ADDR;
 
        env = env_get("ramdiskaddr");
        initrd_addr = env ?
-               (void *)simple_strtoul(env, NULL, 16) :
-#ifdef CONFIG_RAMDISK_ADDR
-               (void *)CONFIG_RAMDISK_ADDR;
+               hextoul(env, NULL) :
+#ifdef CFG_RAMDISK_ADDR
+               CFG_RAMDISK_ADDR;
 #else
-               NULL;
+               0;
 #endif
 
        if (argc == 2) {
-               load_addr = (void *)simple_strtoul(argv[0], NULL, 16);
-               initrd_addr = (void *)simple_strtoul(argv[1], NULL, 16);
+               load_addr = hextoul(argv[0], NULL);
+               initrd_addr = hextoul(argv[1], NULL);
        } else if (argc == 1) {
-               load_addr = (void *)simple_strtoul(argv[0], NULL, 16);
+               load_addr = hextoul(argv[0], NULL);
        }
 
        if (!load_addr || !initrd_addr) {
@@ -153,7 +81,7 @@ static int qemu_fwcfg_do_load(struct cmd_tbl *cmdtp, int flag,
                return CMD_RET_FAILURE;
        }
 
-       return qemu_fwcfg_setup_kernel(load_addr, initrd_addr);
+       return qemu_fwcfg_setup_kernel(qfw_dev, load_addr, initrd_addr);
 }
 
 static struct cmd_tbl fwcfg_commands[] = {
@@ -168,7 +96,8 @@ static int do_qemu_fw(struct cmd_tbl *cmdtp, int flag, int argc,
        int ret;
        struct cmd_tbl *fwcfg_cmd;
 
-       if (!qemu_fwcfg_present()) {
+       ret = qfw_get_dev(&qfw_dev);
+       if (ret) {
                printf("QEMU fw_cfg interface not found\n");
                return CMD_RET_USAGE;
        }