From 48fb2a9deba11ee48dde21c5c1aa93b4d4e1043b Mon Sep 17 00:00:00 2001 From: Julien Grall Date: Mon, 12 Aug 2019 12:23:43 +0100 Subject: [PATCH] xen/arm: setup: Add Xen as boot module before printing all boot modules Since commit f60658c6ae "xen/arm: Stop relocating Xen", the position of Xen in memory is not printed anymore. This can make difficult to debug early code. As Xen is not relocated anymore, we can add Xen as boot module before calling boot_fdt_info(). With that, the function will print Xen module information along with all the other modules. Signed-off-by: Julien Grall Acked-by: Stefano Stabellini --- xen/arch/arm/setup.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 215746a5c3..2c5d1372c0 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -779,18 +779,18 @@ void __init start_xen(unsigned long boot_phys_offset, "Please check your bootloader.\n", fdt_paddr); - fdt_size = boot_fdt_info(device_tree_flattened, fdt_paddr); - - cmdline = boot_fdt_cmdline(device_tree_flattened); - printk("Command line: %s\n", cmdline); - cmdline_parse(cmdline); - /* Register Xen's load address as a boot module. */ xen_bootmodule = add_boot_module(BOOTMOD_XEN, (paddr_t)(uintptr_t)(_start + boot_phys_offset), (paddr_t)(uintptr_t)(_end - _start + 1), false); BUG_ON(!xen_bootmodule); + fdt_size = boot_fdt_info(device_tree_flattened, fdt_paddr); + + cmdline = boot_fdt_cmdline(device_tree_flattened); + printk("Command line: %s\n", cmdline); + cmdline_parse(cmdline); + setup_mm(fdt_paddr, fdt_size); /* Parse the ACPI tables for possible boot-time configuration */ -- 2.30.2