mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-12-05 02:51:00 +00:00
2f6c45eb68
When we try to load a kernel via the QEMU firmware device, we currently "return -1;" if no kernel was specified on the QEMU command line. This leads to the usage output, which is confusing (since nothing on the command line was really wrong), but also somewhat hides the actual error message. Return CMD_RET_FAILURE (1), as it's a proper error, and make the message more clear that this is not only a "warning". This helps to call this command in boot scripts, and to gracefully continue if this doesn't work. Signed-off-by: Andre Przywara <andre.przywara@arm.com>
191 lines
4.7 KiB
C
191 lines
4.7 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* (C) Copyright 2015 Miao Yan <yanmiaobest@gmail.com>
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <command.h>
|
|
#include <env.h>
|
|
#include <errno.h>
|
|
#include <qfw.h>
|
|
#include <dm.h>
|
|
|
|
static struct udevice *qfw_dev;
|
|
|
|
/*
|
|
* 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_cmd_setup_kernel(void *load_addr, void *initrd_addr)
|
|
{
|
|
char *data_addr;
|
|
uint32_t setup_size, kernel_size, cmdline_size, initrd_size;
|
|
|
|
qfw_read_entry(qfw_dev, FW_CFG_SETUP_SIZE, 4, &setup_size);
|
|
qfw_read_entry(qfw_dev, FW_CFG_KERNEL_SIZE, 4, &kernel_size);
|
|
|
|
if (kernel_size == 0) {
|
|
printf("fatal: no kernel available\n");
|
|
return CMD_RET_FAILURE;
|
|
}
|
|
|
|
data_addr = load_addr;
|
|
if (setup_size != 0) {
|
|
qfw_read_entry(qfw_dev, FW_CFG_SETUP_DATA,
|
|
le32_to_cpu(setup_size), data_addr);
|
|
data_addr += le32_to_cpu(setup_size);
|
|
}
|
|
|
|
qfw_read_entry(qfw_dev, FW_CFG_KERNEL_DATA,
|
|
le32_to_cpu(kernel_size), data_addr);
|
|
data_addr += le32_to_cpu(kernel_size);
|
|
env_set_hex("filesize", le32_to_cpu(kernel_size));
|
|
|
|
data_addr = initrd_addr;
|
|
qfw_read_entry(qfw_dev, FW_CFG_INITRD_SIZE, 4, &initrd_size);
|
|
if (initrd_size == 0) {
|
|
printf("warning: no initrd available\n");
|
|
} else {
|
|
qfw_read_entry(qfw_dev, FW_CFG_INITRD_DATA,
|
|
le32_to_cpu(initrd_size), data_addr);
|
|
data_addr += le32_to_cpu(initrd_size);
|
|
env_set_hex("filesize", le32_to_cpu(initrd_size));
|
|
}
|
|
|
|
qfw_read_entry(qfw_dev, FW_CFG_CMDLINE_SIZE, 4, &cmdline_size);
|
|
if (cmdline_size) {
|
|
qfw_read_entry(qfw_dev, 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");
|
|
|
|
return 0;
|
|
}
|
|
|
|
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 = qfw_read_firmware_list(qfw_dev);
|
|
if (ret)
|
|
return ret;
|
|
|
|
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);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int qemu_fwcfg_do_list(struct cmd_tbl *cmdtp, int flag,
|
|
int argc, char *const argv[])
|
|
{
|
|
if (qemu_fwcfg_cmd_list_firmware() < 0)
|
|
return CMD_RET_FAILURE;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int qemu_fwcfg_do_cpus(struct cmd_tbl *cmdtp, int flag,
|
|
int argc, char *const argv[])
|
|
{
|
|
printf("%d cpu(s) online\n", qfw_online_cpus(qfw_dev));
|
|
return 0;
|
|
}
|
|
|
|
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;
|
|
|
|
env = env_get("loadaddr");
|
|
load_addr = env ?
|
|
(void *)hextoul(env, NULL) :
|
|
(void *)CONFIG_SYS_LOAD_ADDR;
|
|
|
|
env = env_get("ramdiskaddr");
|
|
initrd_addr = env ?
|
|
(void *)hextoul(env, NULL) :
|
|
#ifdef CONFIG_RAMDISK_ADDR
|
|
(void *)CONFIG_RAMDISK_ADDR;
|
|
#else
|
|
NULL;
|
|
#endif
|
|
|
|
if (argc == 2) {
|
|
load_addr = (void *)hextoul(argv[0], NULL);
|
|
initrd_addr = (void *)hextoul(argv[1], NULL);
|
|
} else if (argc == 1) {
|
|
load_addr = (void *)hextoul(argv[0], NULL);
|
|
}
|
|
|
|
if (!load_addr || !initrd_addr) {
|
|
printf("missing load or initrd address\n");
|
|
return CMD_RET_FAILURE;
|
|
}
|
|
|
|
return qemu_fwcfg_cmd_setup_kernel(load_addr, initrd_addr);
|
|
}
|
|
|
|
static struct cmd_tbl fwcfg_commands[] = {
|
|
U_BOOT_CMD_MKENT(list, 0, 1, qemu_fwcfg_do_list, "", ""),
|
|
U_BOOT_CMD_MKENT(cpus, 0, 1, qemu_fwcfg_do_cpus, "", ""),
|
|
U_BOOT_CMD_MKENT(load, 2, 1, qemu_fwcfg_do_load, "", ""),
|
|
};
|
|
|
|
static int do_qemu_fw(struct cmd_tbl *cmdtp, int flag, int argc,
|
|
char *const argv[])
|
|
{
|
|
int ret;
|
|
struct cmd_tbl *fwcfg_cmd;
|
|
|
|
ret = qfw_get_dev(&qfw_dev);
|
|
if (ret) {
|
|
printf("QEMU fw_cfg interface not found\n");
|
|
return CMD_RET_USAGE;
|
|
}
|
|
|
|
fwcfg_cmd = find_cmd_tbl(argv[1], fwcfg_commands,
|
|
ARRAY_SIZE(fwcfg_commands));
|
|
argc -= 2;
|
|
argv += 2;
|
|
if (!fwcfg_cmd || argc > fwcfg_cmd->maxargs)
|
|
return CMD_RET_USAGE;
|
|
|
|
ret = fwcfg_cmd->cmd(fwcfg_cmd, flag, argc, argv);
|
|
|
|
return cmd_process_error(fwcfg_cmd, ret);
|
|
}
|
|
|
|
U_BOOT_CMD(
|
|
qfw, 4, 1, do_qemu_fw,
|
|
"QEMU firmware interface",
|
|
"<command>\n"
|
|
" - list : print firmware(s) currently loaded\n"
|
|
" - cpus : print online cpu number\n"
|
|
" - load <kernel addr> <initrd addr> : load kernel and initrd (if any), and setup for zboot\n"
|
|
)
|