OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

hw/arm: xlnx-zcu102: Disable unsupported FDT firmware nodes

Browse Source 
Disable unsupported FDT firmware nodes if a user passes us
a DTB with nodes enabled that the machine cannot support
due to lack of EL3 or EL2 support.

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Message-id: 20200423121114.4274-5-edgar.iglesias@gmail.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Edgar E. Iglesias 2020-04-23 14:11:14 +02:00 committed by Peter Maydell
parent 4d1ac883a7
commit 6f7b6947a6
1 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
hw/arm/xlnx-zcu102.c
View File

@ -23,6 +23,7 @@
#include "qemu/error-report.h"
#include "qemu/log.h"
#include "sysemu/qtest.h"
#include "sysemu/device_tree.h"
typedef struct XlnxZCU102 {
MachineState parent_obj;
@ -68,6 +69,34 @@ static void zcu102_set_virt(Object *obj, bool value, Error **errp)
s->virt = value;
}
static void zcu102_modify_dtb(const struct arm_boot_info *binfo, void *fdt)
{
XlnxZCU102 *s = container_of(binfo, XlnxZCU102, binfo);
bool method_is_hvc;
char **node_path;
const char *r;
int prop_len;
int i;
/* If EL3 is enabled, we keep all firmware nodes active. */
if (!s->secure) {
node_path = qemu_fdt_node_path(fdt, NULL, "xlnx,zynqmp-firmware",
&error_fatal);
for (i = 0; node_path && node_path[i]; i++) {
r = qemu_fdt_getprop(fdt, node_path[i], "method", &prop_len, NULL);
method_is_hvc = r && !strcmp("hvc", r);
/* Allow HVC based firmware if EL2 is enabled. */
if (method_is_hvc && s->virt) {
continue;
}
qemu_fdt_setprop_string(fdt, node_path[i], "status", "disabled");
}
g_strfreev(node_path);
}
}
static void xlnx_zcu102_init(MachineState *machine)
{
XlnxZCU102 *s = ZCU102_MACHINE(machine);
@ -169,6 +198,7 @@ static void xlnx_zcu102_init(MachineState *machine)
s->binfo.ram_size = ram_size;
s->binfo.loader_start = 0;
s->binfo.modify_dtb = zcu102_modify_dtb;
arm_load_kernel(s->soc.boot_cpu_ptr, machine, &s->binfo);
}