Allow x86 to unflatten DTs
v4 cover Allow x86 to unflatten DTs
pipeline: https://gitlab.com/xen-project/people/agvallejo/xen/-/pipelines/1880819044
Hi,
There are minor adjustments throughout based on feedback, and I've also dropped the patch that allowed x86 to just pick DOM0LESS_BOOT right now until the rest of the changes to boot a single-dom0 DTB go in. Biggest changes are regarding some confusion with Kconfig.
The idea is to segregate DT processing in two. A basic one, and a full-fledged one. The former would be currently used exclusively by x86, based on the fact that it does not need to discover devices in the DT, while the later would remain largely the same for every other Xen port, because they need all of it anyway for their own boot procedures.
v3 used CONFIG_HAS_DEVICE_TREE as such a discriminator of a full-fledged DT parsing logic. The idea behind v4 is:
* HAS_DEVICE_TREE is renamed to HAS_DEVICE_TREE_DISCOVERY, to clearly show the new interpretation that this Kconfig option exists for platforms that discover devices via DTs.
* DOM0LESS_BOOT stops requiring HAS_DEVICE_TREE, so x86 can pick it
* DOM0LESS_BOOT starts allowing compiling a subset of common/device-tree/
Looked at in a different light:
Full DT support: HAS_DEVICE_TREE_DISCOVERY Basic DT support: DOM0LESS_BOOT || HAS_DEVICE_TREE_DISCOVERY No DT support: !DOM0LESS_BOOT && !HAS_DEVICE_TREE_DISCOVERY
And in table form FTAOD:
| HAS_DEVICE_TREE_DISCOVERY | DOM0LESS_BOOT | Description |
------+---------------------------+---------------+------------------+
| | y | Basic DT support |
x86 + n +---------------+------------------+
| | n | No DT support |
------+---------------------------+---------------+------------------+
arm | | | |
------+ | | |
riscv | y | y/n | Full DT support |
------+ | | |
ppc | | | |
------+---------------------------+---------------+------------------+
Note that HAS_DOM0LESS stays around to hide DOM0LESS_BOOT from ports that don't support dom0less yet (all but arm, atm).
Previous versions
=================
v3: https://lore.kernel.org/xen-devel/[email protected]/
v2: https://lore.kernel.org/xen-devel/[email protected]/
v1: https://lore.kernel.org/xen-devel/[email protected]/
Original cover letter
=====================
This is the aftermath of this discussion:
It's a first round of cleanup and preparation to have a much easier time later when integrating dom0less boot into hyperlaunch.
The refactor on device-tree/ is _fine_ by I'm open to other suggestions to achieve the same thing. In particular, after this series x86 can unflatten the DT host device tree when it has CONFIG_DOM0LESS_BOOT set, which enables the builder to use factored-out functions from dom0less-build.c (not done here).
The diffstat is deceptive because I renamed a large file and then created a new file with the same name. There aren't that many LoC changes.
Alejandro Vallejo (12):
CODING_STYLE: Custom type names must be snake-cased by word.
xen: Rename bootmodule{,s} to boot_module{,s}
x86: Replace arch-specific boot_module with common one
xen: Refactor kernel_info to have a header like boot_domain
x86: Replace arch-specific boot_domain with the common one xen/dt: Move bootfdt functions to xen/bootfdt.h
xen/dt: Move bootinfo functions to a new bootinfo.h xen/dt: Rename bootfdt.c -> bootinfo-fdt.c
xen/dt: Extract helper to map nodes to module kinds
xen: Rename CONFIG_HAS_DEVICE_TREE to CONFIG_HAS_DEVICE_TREE_DISCOVERY xen/dt: ifdef out DEV_DT-related bits from device_tree.{c,h} xen/dt: Remove DOM0LESS_BOOT's requirement on
HAS_DEVICE_TREE_DISCOVERY
CODING_STYLE | 6 + xen/Kconfig.debug | 2 +- xen/arch/arm/Kconfig | 2 +- xen/arch/arm/dom0less-build.c | 8 +- xen/arch/arm/domain_build.c | 21 +- xen/arch/arm/efi/efi-boot.h | 6 +- xen/arch/arm/include/asm/setup.h | 2 +- xen/arch/arm/kernel.c | 10 +- xen/arch/arm/llc-coloring.c | 8 +- xen/arch/arm/mmu/setup.c | 10 +- xen/arch/arm/setup.c | 11 +- xen/arch/ppc/Kconfig | 2 +- xen/arch/riscv/Kconfig | 2 +- xen/arch/riscv/cpufeature.c | 1 + xen/arch/riscv/mm.c | 2 +- xen/arch/riscv/setup.c | 2 +- xen/arch/riscv/smpboot.c | 1 + xen/arch/x86/cpu/microcode/core.c | 7 +- xen/arch/x86/hvm/dom0_build.c | 8 +- xen/arch/x86/include/asm/boot-domain.h | 33 -- xen/arch/x86/include/asm/bootfdt.h | 56 ++ xen/arch/x86/include/asm/bootinfo.h | 57 +-- xen/arch/x86/pv/dom0_build.c | 6 +- xen/arch/x86/setup.c | 55 +- xen/common/Kconfig | 7 +- xen/common/Makefile | 5 +- xen/common/device-tree/Makefile | 7 +- xen/common/device-tree/bootfdt.c | 654 ++---------------------- xen/common/device-tree/bootinfo-fdt.c | 583 +++++++++++++++++++++ xen/common/device-tree/bootinfo.c | 54 +- xen/common/device-tree/device-tree.c | 3 + xen/common/device-tree/dom0less-build.c | 45 +- xen/common/device-tree/domain-build.c | 22 +- xen/common/device-tree/kernel.c | 30 +- xen/common/device-tree/static-evtchn.c | 1 + xen/common/device.c | 4 +- xen/common/efi/boot.c | 2 +- xen/common/sched/Kconfig | 2 +- xen/common/sched/boot-cpupool.c | 1 + xen/drivers/char/ns16550.c | 6 +- xen/drivers/passthrough/Makefile | 2 +- xen/drivers/passthrough/iommu.c | 2 +- xen/include/asm-generic/device.h | 10 +- xen/include/xen/bootfdt.h | 306 ++++------- xen/include/xen/bootinfo.h | 213 ++++++++ xen/include/xen/device_tree.h | 70 +-- xen/include/xen/fdt-domain-build.h | 2 +- xen/include/xen/fdt-kernel.h | 12 +- xen/include/xen/iommu.h | 8 +- xen/include/xsm/dummy.h | 4 +- xen/include/xsm/xsm.h | 12 +- xen/xsm/dummy.c | 2 +- xen/xsm/flask/hooks.c | 6 +- xen/xsm/xsm_core.c | 4 +- xen/xsm/xsm_policy.c | 8 +- 55 files changed, 1228 insertions(+), 1177 deletions(-) delete mode 100644 xen/arch/x86/include/asm/boot-domain.h create mode 100644 xen/arch/x86/include/asm/bootfdt.h create mode 100644 xen/common/device-tree/bootinfo-fdt.c create mode 100644 xen/include/xen/bootinfo.h
base-commit: 12d72d032e169082308efb9d44b9964ef9fa4340
Signature · 1 line
2.43.0
PATCH v4 1/12 CODING_STYLE: Custom type names must be snake-cased by word.
There's the unwritten convention in x86 of splitting type names using underscores. Add such convention to the CODINNG_STYLE to make it common and less unwritten.
---
v4:
* Move new paragraph into a new "Identifiers" section
--- CODING_STYLE | 6 ++++++ 1 file changed, 6 insertions(+)
CODING_STYLE +6 -0
@@ -113,6 +113,12 @@ Braces should be omitted for blocks with a single statement. e.g., if ( condition ) single_statement(); +Identifiers +----------- + +When giving names to identifiers (variables, functions, constants...), separate +words using underscores (for example, use "my_foo" instead of "myfoo"). + Types -----
Signature · 1 line
2.43.0
Re: [PATCH v4 01/12] CODING_STYLE: Custom type names must be snake-cased by word.
Quoted 5 lines · Alejandro Vallejo
There's the unwritten convention in x86 of splitting type names using underscores. Add such convention to the
CODINNG_STYLEto make it common and less unwritten.Signed-off-by Alejandro Vallejo <[email protected]>
Quoted 27 lines
---
v4:
* Move new paragraph into a new "Identifiers" section--- CODING_STYLE | 6 ++++++ 1 file changed, 6 insertions(+)CODING_STYLE +6
-0@@ -113,6 +113,12 @@ Braces should be omitted for blocks with a single statement. e.g., if ( condition ) single_statement(); +Identifiers +----------- + +When giving names to identifiers (variables, functions, constants...), separate +words using underscores (for example, use "my_foo" instead of "myfoo"). + Types -----Signature · 1 line
2.43.0
Re: [PATCH v4 01/12] CODING_STYLE: Custom type names must be snake-cased by word.
In reply to Alejandro VallejoQuoted 3 lines · Alejandro Vallejo
There's the unwritten convention in x86 of splitting type names using underscores. Add such convention to the
CODINNG_STYLEto make it common and less unwritten.
Just curious: How does x86 come into play here? Xen inherited this un- written rule from Linux, afaict.
Jan
Re: [PATCH v4 01/12] CODING_STYLE: Custom type names must be snake-cased by word.
Quoted 9 lines · Jan Beulich
Quoted 3 lines · Alejandro Vallejo
There's the unwritten convention in x86 of splitting type names using underscores. Add such convention to the
CODINNG_STYLEto make it common and less unwritten.Just curious: How does x86 come into play here? Xen inherited this un- written rule from Linux, afaict.
Jan
x86 follows the rule far more strictly than other Xen ports. Even in Linux it's not uncommon to see some words stashed together because they represent a single concept. e.g: "bootmode", "bootram", "bootmod", "bootaddr", etc. Some of them inherited by Xen itself, like "softirq".
But I digress. I mentioned x86 because it's the most traceable use of the rule as written in CODING_STYLE in this patch. When or why you decided to do so is another matter entirely which I very definitely do not know.
If you feel the commit message should be something else, I'm happy for it to be such something else.
Cheers,
Alejandro
PATCH v4 2/12 xen: Rename bootmodule{,s} to boot_module{,s}
In reply to Alejandro Vallejo... in alignment with the new coding style on word splitting for type names.
This aligns its name with the largely duplicate boot_module struct in x86. While there's no equivalent to "struct bootmodules" in x86, changing one and not the other is just confusing. Same with various comments and function names.
Rather than making a long subfield name even longer, remove the _bootmodule suffix in the kernel, initrd and dtb subfields.
Not a functional change.
--- xen/arch/arm/domain_build.c | 4 +- xen/arch/arm/efi/efi-boot.h | 6 +-- xen/arch/arm/kernel.c | 4 +- xen/arch/arm/llc-coloring.c | 8 ++-- xen/arch/arm/mmu/setup.c | 10 ++--- xen/arch/arm/setup.c | 10 ++--- xen/common/device-tree/bootfdt.c | 4 +- xen/common/device-tree/bootinfo.c | 52 ++++++++++++------------- xen/common/device-tree/dom0less-build.c | 25 ++++++------ xen/common/device-tree/domain-build.c | 2 +- xen/common/device-tree/kernel.c | 22 +++++------ xen/include/xen/bootfdt.h | 26 ++++++------- xen/include/xen/fdt-kernel.h | 7 ++-- xen/xsm/xsm_policy.c | 2 +- 14 files changed, 90 insertions(+), 92 deletions(-)
xen/arch/arm/domain_build.c +2 -2
@@ -579,7 +579,7 @@ static int __init write_properties(struct domain *d, struct kernel_info *kinfo,if (dt_node_path_is_equal (node,"/chosen" ) ) { -const struct bootmodule *initrd = kinfo->initrd_bootmodule; +const struct boot_module *initrd = kinfo->initrd;if ( bootargs ) {
@@ -1517,7 +1517,7 @@ int __init make_chosen_node(const struct kernel_info *kinfo) {int res;const char *bootargs =NULL ; -const struct bootmodule *initrd = kinfo->initrd_bootmodule; +const struct boot_module *initrd = kinfo->initrd;void *fdt = kinfo->fdt;dt_dprintk ("Create chosen node\n" );
xen/arch/arm/efi/efi-boot.h +3 -3
@@ -20,7 +20,7 @@ typedef struct { } module_info;/* -* Binaries will be translated into bootmodules, the maximum number for them is +* Binaries will be translated into boot_modules, the maximum number for them is * MAX_MODULES where we should remove a unit for Xen and one for Xen DTB */ #define MAX_UEFI_MODULES (MAX_MODULES - 2)
@@ -602,9 +602,9 @@ static void __init efi_arch_handle_module(const struct file *file,/* * modules_available is decremented here because for each dom0 file added -* from the configuration file, there will be an additional bootmodule, +* from the configuration file, there will be an additional boot_module, * so the number of available slots will be decremented because there is a -* maximum amount of bootmodules that can be loaded. +* maximum amount of boot_modules that can be loaded. */ modules_available--; }
xen/arch/arm/kernel.c +2 -2
@@ -46,7 +46,7 @@ static void __init place_modules(struct kernel_info *info, paddr_t kernbase, paddr_t kernend) {/* Align DTB and initrd size to 2Mb. Linux only requires 4 byte alignment */ -const struct bootmodule *mod = info->initrd_bootmodule; +const struct boot_module *mod = info->initrd;const struct membanks *mem =kernel_info_get_mem (info);const paddr_t initrd_len =ROUNDUP (mod ? mod->size :0 ,MB (2 ));const paddr_t dtb_len =ROUNDUP (fdt_totalsize (info->fdt),MB (2 ));
@@ -175,7 +175,7 @@ static void __init kernel_zimage_load(struct kernel_info *info)* Check if the image is a uImage and setup kernel_info */ int __init kernel_uimage_probe (struct kernel_info *info, -struct bootmodule *mod) +struct boot_module *mod) {struct {__be32 magic;/* Image Header Magic Number */
xen/arch/arm/llc-coloring.c +4 -4
@@ -123,12 +123,12 @@ static paddr_t __init xen_colored_map_size(void)void __init arch_llc_coloring_init (void ) { -struct bootmodule *xen_bootmodule =boot_module_find_by_kind (BOOTMOD_XEN ); +struct boot_module *xen_boot_module =boot_module_find_by_kind (BOOTMOD_XEN ); -BUG_ON (!xen_bootmodule); +BUG_ON (!xen_boot_module); - xen_bootmodule->size =xen_colored_map_size (); - xen_bootmodule->start =get_xen_paddr (xen_bootmodule->size); + xen_boot_module->size =xen_colored_map_size (); + xen_boot_module->start =get_xen_paddr (xen_boot_module->size); }/*
xen/arch/arm/mmu/setup.c +5 -5
@@ -246,7 +246,7 @@ paddr_t __init consider_modules(paddr_t s, paddr_t e,#ifdef CONFIG_STATIC_SHM const struct membanks *shmem =bootinfo_get_shmem ();#endif -const struct bootmodules *mi = &bootinfo.modules; +const struct boot_modules *mi = &bootinfo.modules;int i;int nr;
@@ -273,8 +273,8 @@ paddr_t __init consider_modules(paddr_t s, paddr_t e, }/* -* i is the current bootmodule we are evaluating, across all -* possible kinds of bootmodules. +* i is the current boot_module we are evaluating, across all +* possible kinds of boot_modules. * * When retrieving the corresponding reserved-memory addresses, we * need to index the reserved_mem bank starting from 0, and only counting
@@ -328,8 +328,8 @@ static void __init create_llc_coloring_mappings(void) {lpae_t pte;unsigned int i; -struct bootmodule *xen_bootmodule =boot_module_find_by_kind (BOOTMOD_XEN ); -mfn_t start_mfn =maddr_to_mfn (xen_bootmodule->start), mfn; +struct boot_module *xen_boot_module =boot_module_find_by_kind (BOOTMOD_XEN ); +mfn_t start_mfn =maddr_to_mfn (xen_boot_module->start), mfn; for_each_xen_colored_mfn ( start_mfn, mfn, i ) {
xen/arch/arm/setup.c +5 -5
@@ -206,11 +206,11 @@ static void __init processor_id(void)void __init discard_initial_modules (void ) { -struct bootmodules *mi = &bootinfo.modules; +struct boot_modules *mi = &bootinfo.modules;int i;/* -* When using static heap feature, don't give bootmodules memory back to +* When using static heap feature, don't give boot_modules memory back to * the heap allocator */ if ( using_static_heap )
@@ -303,7 +303,7 @@ void asmlinkage __init start_xen(unsigned long fdt_paddr) {size_t fdt_size;const char *cmdline; -struct bootmodule *xen_bootmodule; +struct boot_module *xen_boot_module;struct domain *d;int rc, i;
@@ -327,10 +327,10 @@ void asmlinkage __init start_xen(unsigned long fdt_paddr) fdt_paddr);/* Register Xen's load address as a boot module. */ - xen_bootmodule =add_boot_module (BOOTMOD_XEN , + xen_boot_module =add_boot_module (BOOTMOD_XEN ,virt_to_maddr (_start), (paddr_t)(uintptr_t)(_end - _start), false); -BUG_ON (!xen_bootmodule); +BUG_ON (!xen_boot_module); fdt_size =boot_fdt_info (device_tree_flattened, fdt_paddr);
xen/common/device-tree/bootfdt.c +2 -2
@@ -314,7 +314,7 @@ static void __init process_multiboot_node(const void *fdt, int node,static int __initdata kind_guess =0 ;const struct fdt_property *prop;const __be32 *cell; -bootmodule_kind kind; +boot_module_kind kind;paddr_t start, size;int len;/* sizeof("/chosen/") + DT_MAX_NAME + '/' + DT_MAX_NAME + '/0' => 92 */
@@ -518,7 +518,7 @@ static void __init early_print_info(void) {const struct membanks *mi =bootinfo_get_mem ();const struct membanks *mem_resv =bootinfo_get_reserved_mem (); -struct bootmodules *mods = &bootinfo.modules; +struct boot_modules *mods = &bootinfo.modules;struct bootcmdlines *cmds = &bootinfo.cmdlines;unsigned int i;
xen/common/device-tree/bootinfo.c +26 -26
120 lines not on this page · raw message
xen/common/device-tree/dom0less-build.c +12 -13
@@ -44,13 +44,13 @@ void __init set_xs_domain(struct domain *d)bool __init is_dom0less_mode (void ) { -struct bootmodules *mods = &bootinfo.modules; -struct bootmodule *mod; +struct boot_modules *mods = &bootinfo.modules; +struct boot_module *mod;unsigned int i;bool dom0found = false;bool domUfound = false; -/* Look into the bootmodules */ +/* Look into the boot_modules */ for ( i =0 ; i < mods->nr_mods ; i++ ) { mod = &mods->module[i];
@@ -374,18 +374,17 @@ static int __init check_partial_fdt(void *pfdt, size_t size)return 0 ; } -static int __init domain_handle_dtb_bootmodule (struct domain *d, -struct kernel_info *kinfo) +static int __init domain_handle_dtb_boot_module (struct domain *d, +struct kernel_info *kinfo) {void *pfdt;int res, node_next; - pfdt =ioremap_cache (kinfo->dtb_bootmodule->start, - kinfo->dtb_bootmodule->size); + pfdt =ioremap_cache (kinfo->dtb->start, kinfo->dtb->size);if ( pfdt ==NULL )return -EFAULT ; - res =check_partial_fdt (pfdt, kinfo->dtb_bootmodule->size); + res =check_partial_fdt (pfdt, kinfo->dtb->size);if ( res <0 ) goto out;
@@ -459,8 +458,8 @@ static int __init prepare_dtb_domU(struct domain *d, struct kernel_info *kinfo) sizecells =GUEST_ROOT_SIZE_CELLS ;/* Account for domU passthrough DT size */ -if ( kinfo->dtb_bootmodule ) - fdt_size += kinfo->dtb_bootmodule->size; +if ( kinfo->dtb ) + fdt_size += kinfo->dtb->size;/* Cap to max DT size if needed */ fdt_size =min (fdt_size,SZ_2M );
@@ -507,13 +506,13 @@ static int __init prepare_dtb_domU(struct domain *d, struct kernel_info *kinfo) goto err;/* -* domain_handle_dtb_bootmodule has to be called before the rest of +* domain_handle_dtb_boot_module has to be called before the rest of * the device tree is generated because it depends on the value of * the field phandle_intc. */ -if ( kinfo->dtb_bootmodule ) +if ( kinfo->dtb ) { - ret =domain_handle_dtb_bootmodule (d, kinfo); + ret =domain_handle_dtb_boot_module (d, kinfo);if ( ret ) goto err; }
xen/common/device-tree/domain-build.c +1 -1
@@ -352,7 +352,7 @@ void __init dtb_load(struct kernel_info *kinfo,void __init initrd_load (struct kernel_info *kinfo,copy_to_guest_phys_cb copy_to_guest) { -const struct bootmodule *mod = kinfo->initrd_bootmodule; +const struct boot_module *mod = kinfo->initrd;paddr_t load_addr = kinfo->initrd_paddr;paddr_t paddr, len;int node;
xen/common/device-tree/kernel.c +11 -11
@@ -21,7 +21,7 @@ static uint32_t __init output_length(char *image, unsigned long image_len)return *(uint32_t *)&image[image_len -4 ]; } -int __init kernel_decompress (struct bootmodule *mod,uint32_t offset) +int __init kernel_decompress (struct boot_module *mod,uint32_t offset) {char *output, *input;char magic[2 ];
@@ -92,7 +92,7 @@ int __init kernel_decompress(struct bootmodule *mod, uint32_t offset)free_domheap_page (pages + i);/* -* When using static heap feature, don't give bootmodules memory back to +* When using static heap feature, don't give boot_modules memory back to * the heap allocator */ if ( using_static_heap )
@@ -118,7 +118,7 @@ int __init kernel_decompress(struct bootmodule *mod, uint32_t offset)int __init kernel_probe (struct kernel_info *info,const struct dt_device_node *domain) { -struct bootmodule *mod =NULL ; +struct boot_module *mod =NULL ;struct bootcmdline *cmd =NULL ;struct dt_device_node *node;u64 kernel_addr, initrd_addr, dtb_addr, size;
@@ -140,8 +140,8 @@ int __init kernel_probe(struct kernel_info *info, mod =boot_module_find_by_kind (BOOTMOD_KERNEL ); - info->kernel_bootmodule = mod; - info->initrd_bootmodule =boot_module_find_by_kind (BOOTMOD_RAMDISK ); + info->kernel = mod; + info->initrd =boot_module_find_by_kind (BOOTMOD_RAMDISK ); cmd =boot_cmdline_find_by_kind (BOOTMOD_KERNEL );if ( cmd )
@@ -162,7 +162,7 @@ int __init kernel_probe(struct kernel_info *info,dt_get_range (&val, node, &kernel_addr, &size); mod =boot_module_find_by_addr_and_kind (BOOTMOD_KERNEL , kernel_addr); - info->kernel_bootmodule = mod; + info->kernel = mod; }else if (dt_device_is_compatible (node,"multiboot,ramdisk" ) ) {
@@ -171,7 +171,7 @@ int __init kernel_probe(struct kernel_info *info, val =dt_get_property (node,"reg" , &len);dt_get_range (&val, node, &initrd_addr, &size); - info->initrd_bootmodule =boot_module_find_by_addr_and_kind ( + info->initrd =boot_module_find_by_addr_and_kind (BOOTMOD_RAMDISK , initrd_addr); }else if (dt_device_is_compatible (node,"multiboot,device-tree" ) )
@@ -183,7 +183,7 @@ int __init kernel_probe(struct kernel_info *info,if ( val ==NULL )continue ;dt_get_range (&val, node, &dtb_addr, &size); - info->dtb_bootmodule =boot_module_find_by_addr_and_kind ( + info->dtb =boot_module_find_by_addr_and_kind (BOOTMOD_GUEST_DTB , dtb_addr); }else
@@ -201,10 +201,10 @@ int __init kernel_probe(struct kernel_info *info, }printk ("Loading %pd kernel from boot module @ %" PRIpaddr"\n" , - info->d, info->kernel_bootmodule->start); -if ( info->initrd_bootmodule ) + info->d, info->kernel->start); +if ( info->initrd )printk ("Loading ramdisk from boot module @ %" PRIpaddr"\n" , - info->initrd_bootmodule->start); + info->initrd->start);/* * uImage isn't really used nowadays thereby leave kernel_uimage_probe()
xen/include/xen/bootfdt.h +13 -13
@@ -23,7 +23,7 @@ typedef enum {BOOTMOD_GUEST_DTB ,BOOTMOD_MICROCODE , BOOTMOD_UNKNOWN -} bootmodule_kind; +} boot_module_kind;enum membank_type {/*
@@ -103,8 +103,8 @@ struct shared_meminfo {* initrd to be compatible with all versions of the multiboot spec. */ #define BOOTMOD_MAX_CMDLINE 1024 -struct bootmodule { -bootmodule_kind kind; +struct boot_module { +boot_module_kind kind;bool domU;paddr_t start;paddr_t size;
@@ -113,16 +113,16 @@ struct bootmodule {/* DT_MAX_NAME is the node name max length according the DT spec */ #define DT_MAX_NAME 41struct bootcmdline { -bootmodule_kind kind; +boot_module_kind kind;bool domU;paddr_t start;char dt_name[DT_MAX_NAME ];char cmdline[BOOTMOD_MAX_CMDLINE ]; }; -struct bootmodules { +struct boot_modules {int nr_mods; -struct bootmodule module[MAX_MODULES ]; +struct boot_module module[MAX_MODULES ]; };struct bootcmdlines {
@@ -134,7 +134,7 @@ struct bootinfo {struct meminfo mem;/* The reserved regions are only used when booting using Device-Tree */ struct meminfo reserved_mem; -struct bootmodules modules; +struct boot_modules modules;struct bootcmdlines cmdlines;#ifdef CONFIG_ACPI struct meminfo acpi;
@@ -176,16 +176,16 @@ bool check_reserved_regions_overlap(paddr_t region_start,paddr_t region_size, bool allow_memreserve_overlap); -struct bootmodule *add_boot_module (bootmodule_kind kind, +struct boot_module *add_boot_module (boot_module_kind kind,paddr_t start,paddr_t size,bool domU); -struct bootmodule *boot_module_find_by_kind (bootmodule_kind kind); -struct bootmodule *boot_module_find_by_addr_and_kind (bootmodule_kind kind, +struct boot_module *boot_module_find_by_kind (boot_module_kind kind); +struct boot_module *boot_module_find_by_addr_and_kind (boot_module_kind kind,paddr_t start);void add_boot_cmdline (const char *name,const char *cmdline, -bootmodule_kind kind,paddr_t start,bool domU); -struct bootcmdline *boot_cmdline_find_by_kind (bootmodule_kind kind); +boot_module_kind kind,paddr_t start,bool domU); +struct bootcmdline *boot_cmdline_find_by_kind (boot_module_kind kind);struct bootcmdline *boot_cmdline_find_by_name (const char *name); -const char *boot_module_kind_as_string (bootmodule_kind kind); +const char *boot_module_kind_as_string (boot_module_kind kind);void populate_boot_allocator (void );
xen/include/xen/fdt-kernel.h +3 -4
@@ -34,7 +34,7 @@ struct kernel_info {paddr_t gnttab_size;/* boot blob load addresses */ -const struct bootmodule *kernel_bootmodule, *initrd_bootmodule, *dtb_bootmodule; +const struct boot_module *kernel, *initrd, *dtb;const char * cmdline;paddr_t dtb_paddr;paddr_t initrd_paddr;
@@ -121,7 +121,7 @@ int kernel_probe(struct kernel_info *info, const struct dt_device_node *domain);*/ void kernel_load (struct kernel_info *info); -int kernel_decompress (struct bootmodule *mod,uint32_t offset); +int kernel_decompress (struct boot_module *mod,uint32_t offset);int kernel_zimage_probe (struct kernel_info *info,paddr_t addr,paddr_t size);
@@ -130,8 +130,7 @@ int kernel_zimage_probe(struct kernel_info *info, paddr_t addr, paddr_t size);* call here just for compatability with Arm code. */ #ifdef CONFIG_ARM -struct bootmodule ; -int kernel_uimage_probe (struct kernel_info *info,struct bootmodule *mod); +int kernel_uimage_probe (struct kernel_info *info,struct boot_module *mod);#endif #endif /* __XEN_FDT_KERNEL_H__ */
xen/xsm/xsm_policy.c +1 -1
@@ -68,7 +68,7 @@ int __init xsm_multiboot_policy_init(#ifdef CONFIG_HAS_DEVICE_TREE int __init xsm_dt_policy_init (void **policy_buffer,size_t *policy_size) { -struct bootmodule *mod =boot_module_find_by_kind (BOOTMOD_XSM ); +struct boot_module *mod =boot_module_find_by_kind (BOOTMOD_XSM );paddr_t paddr, len;if ( !mod || !mod->size )
Signature · 1 line
2.43.0
PATCH v4 3/12 x86: Replace arch-specific boot_module with common one
In reply to Alejandro VallejoThese types resemble each other very closely in layout and intent, and with "struct boot_module" already in common code it makes perfect sense to merge them. In order to do so, add an arch-specific area for x86-specific tidbits, and rename identical fields with conflicting names.
No functional change intended.
--- xen/arch/x86/cpu/microcode/core.c | 7 ++-- xen/arch/x86/hvm/dom0_build.c | 6 ++-- xen/arch/x86/include/asm/bootfdt.h | 50 ++++++++++++++++++++++++++ xen/arch/x86/include/asm/bootinfo.h | 56 +++-------------------------- xen/arch/x86/pv/dom0_build.c | 4 +-- xen/arch/x86/setup.c | 43 +++++++++++----------- xen/include/xen/bootfdt.h | 8 +++++ xen/xsm/xsm_policy.c | 2 +- 8 files changed, 93 insertions(+), 83 deletions(-) create mode 100644 xen/arch/x86/include/asm/bootfdt.h
xen/arch/x86/cpu/microcode/core.c +3 -4
@@ -764,8 +764,7 @@ static int __init early_microcode_load(struct boot_info *bi)struct cpio_data cd;/* Search anything unclaimed or likely to be a CPIO archive. */ -if ( bm->type !=BOOTMOD_UNKNOWN && - bm->type !=BOOTMOD_RAMDISK ) +if ( bm->kind !=BOOTMOD_UNKNOWN && bm->kind !=BOOTMOD_RAMDISK )continue ; size = bm->size;
@@ -815,12 +814,12 @@ static int __init early_microcode_load(struct boot_info *bi)return -ENODEV ; } -if ( bi->mods[idx].type !=BOOTMOD_UNKNOWN ) +if ( bi->mods[idx].kind !=BOOTMOD_UNKNOWN ) {printk (XENLOG_WARNING "Microcode: Chosen module %d already used\n" , idx);return -ENODEV ; } - bi->mods[idx].type =BOOTMOD_MICROCODE ; + bi->mods[idx].kind =BOOTMOD_MICROCODE ; size = bi->mods[idx].size; data =bootstrap_map_bm (&bi->mods[idx]);
xen/arch/x86/hvm/dom0_build.c +3 -3
@@ -650,7 +650,7 @@ static int __init pvh_load_kernel(struct boot_module *image = bd->kernel;struct boot_module *initrd = bd->module;void *image_base =bootstrap_map_bm (image); -void *image_start = image_base + image->headroom; +void *image_start = image_base + image->arch.headroom;unsigned long image_len = image->size;unsigned long initrd_len = initrd ? initrd->size :0 ;size_t cmdline_len = bd->cmdline ?strlen (bd->cmdline) +1 :0 ;
@@ -721,9 +721,9 @@ static int __init pvh_load_kernel( {size_t initrd_space =elf_round_up (&elf, initrd_len); -if ( initrd->cmdline_pa ) +if ( initrd->arch.cmdline_pa ) { - initrd_cmdline =__va (initrd->cmdline_pa); + initrd_cmdline =__va (initrd->arch.cmdline_pa);if ( !*initrd_cmdline ) initrd_cmdline =NULL ; }
xen/arch/x86/include/asm/bootfdt.h new file +50 -0
50 lines not on this page · raw message
xen/arch/x86/include/asm/bootinfo.h +4 -52
81 lines not on this page · raw message
xen/arch/x86/pv/dom0_build.c +2 -2
@@ -422,7 +422,7 @@ static int __init dom0_construct(const struct boot_domain *bd) image_base =bootstrap_map_bm (image); image_len = image->size; - image_start = image_base + image->headroom; + image_start = image_base + image->arch.headroom; d->max_pages = ~0U ;
@@ -659,7 +659,7 @@ static int __init dom0_construct(const struct boot_domain *bd)* pages. Tell the boot_module handling that we've freed it, so the * memory is left alone. */ - initrd->released = true; + initrd->arch.released = true; } iommu_memory_setup(d, "initrd", mfn_to_page(_mfn(initrd_mfn)),
xen/arch/x86/setup.c +22 -21
134 lines not on this page · raw message
xen/include/xen/bootfdt.h +8 -0
@@ -7,6 +7,10 @@#include <xen/macros.h> #include <xen/xmalloc.h> +#if __has_include(<asm/bootfdt.h>) +#include <asm/bootfdt.h> +#endif +#define MIN_FDT_ALIGN 8#define NR_MEM_BANKS 256
@@ -108,6 +112,10 @@ struct boot_module {bool domU;paddr_t start;paddr_t size; + +#if __has_include(<asm/bootfdt.h>) +struct arch_boot_module arch; +#endif };/* DT_MAX_NAME is the node name max length according the DT spec */
xen/xsm/xsm_policy.c +1 -1
@@ -53,7 +53,7 @@ int __init xsm_multiboot_policy_init(printk ("Policy len %#lx, start at %p.\n" , _policy_len,_policy_start); - bm->type =BOOTMOD_XSM_POLICY ; + bm->kind =BOOTMOD_XSM ;break ; }
Signature · 1 line
2.43.0
Re: [PATCH v4 03/12] x86: Replace arch-specific boot_module with common one
Quoted 9 lines · Alejandro Vallejo
These types resemble each other very closely in layout and intent, and with "struct
boot_module" already in common code it makes perfect sense to merge them. In order to do so, add an arch-specific area for x86-specific tidbits, and rename identical fields with conflicting names.No functional change intended.
Signed-off-by Alejandro Vallejo <[email protected]>
PATCH v4 4/12 xen: Refactor kernel_info to have a header like boot_domain
In reply to Alejandro VallejoCreate a struct header within kernel_info with the contents common to kernel_info and boot_domain, and define that header in common code. This enables x86 to use that header as-is and drop x86's boot_domain.
Not a functional change.
--- xen/arch/arm/dom0less-build.c | 8 ++++---- xen/arch/arm/domain_build.c | 20 ++++++++++---------- xen/arch/arm/kernel.c | 8 ++++---- xen/common/device-tree/dom0less-build.c | 18 +++++++++--------- xen/common/device-tree/domain-build.c | 20 ++++++++++---------- xen/common/device-tree/kernel.c | 20 ++++++++++---------- xen/include/xen/bootfdt.h | 10 ++++++++++ xen/include/xen/fdt-kernel.h | 5 ++--- 8 files changed, 59 insertions(+), 50 deletions(-)
xen/arch/arm/dom0less-build.c +4 -4
@@ -32,7 +32,7 @@ static int __init make_gicv2_domU_node(struct kernel_info *kinfo)int res =0 ;__be32 reg[(GUEST_ROOT_ADDRESS_CELLS +GUEST_ROOT_SIZE_CELLS ) *2 ];__be32 *cells; -const struct domain *d = kinfo->d; +const struct domain *d = kinfo->hdr.d; res =domain_fdt_begin_node (fdt,"interrupt-controller" ,vgic_dist_base (&d->arch.vgic));
@@ -85,7 +85,7 @@ static int __init make_gicv3_domU_node(struct kernel_info *kinfo)void *fdt = kinfo->fdt;int res =0 ;__be32 *reg, *cells; -const struct domain *d = kinfo->d; +const struct domain *d = kinfo->hdr.d;unsigned int i, len =0 ; res = domain_fdt_begin_node(fdt, "interrupt-controller",
@@ -152,7 +152,7 @@ static int __init make_gicv3_domU_node(struct kernel_info *kinfo)int __init make_intc_domU_node (struct kernel_info *kinfo) { -switch ( kinfo->d->arch.vgic.version ) +switch ( kinfo->hdr.d->arch.vgic.version ) {#ifdef CONFIG_GICV3 case GIC_V3 :
@@ -175,7 +175,7 @@ static int __init make_vpl011_uart_node(struct kernel_info *kinfo)gic_interrupt_t intr;__be32 reg[GUEST_ROOT_ADDRESS_CELLS +GUEST_ROOT_SIZE_CELLS ];__be32 *cells; -struct domain *d = kinfo->d; +struct domain *d = kinfo->hdr.d; res =domain_fdt_begin_node (fdt,"sbsa-uart" , d->arch.vpl011.base_addr);if ( res )
xen/arch/arm/domain_build.c +10 -10
@@ -464,8 +464,8 @@ static int __init write_properties(struct domain *d, struct kernel_info *kinfo,int had_dom0_bootargs =0 ;struct dt_device_node *iommu_node; -if ( kinfo->cmdline && kinfo->cmdline[0 ] ) - bootargs = &kinfo->cmdline[0 ]; +if ( kinfo->hdr.cmdline && kinfo->hdr.cmdline[0 ] ) + bootargs = &kinfo->hdr.cmdline[0 ];/* * We always skip the IOMMU device when creating DT for hwdom if there is
@@ -579,7 +579,7 @@ static int __init write_properties(struct domain *d, struct kernel_info *kinfo,if (dt_node_path_is_equal (node,"/chosen" ) ) { -const struct boot_module *initrd = kinfo->initrd; +const struct boot_module *initrd = kinfo->hdr.initrd;if ( bootargs ) {
@@ -1456,7 +1456,7 @@ int __init make_timer_node(const struct kernel_info *kinfo)if ( res )return res; -if ( !is_64bit_domain (kinfo->d) ) +if ( !is_64bit_domain (kinfo->hdr.d) ) res =fdt_property_string (fdt,"compatible" ,"arm,armv7-timer" );else res =fdt_property_string (fdt,"compatible" ,"arm,armv8-timer" );
@@ -1468,7 +1468,7 @@ int __init make_timer_node(const struct kernel_info *kinfo)* It always exposes an active-low level-sensitive interrupt. */ -if (is_hardware_domain (kinfo->d) ) +if (is_hardware_domain (kinfo->hdr.d) ) { irq[TIMER_PHYS_SECURE_PPI ] =timer_get_irq (TIMER_PHYS_SECURE_PPI ); irq[TIMER_PHYS_NONSECURE_PPI] =
@@ -1517,7 +1517,7 @@ int __init make_chosen_node(const struct kernel_info *kinfo) {int res;const char *bootargs =NULL ; -const struct boot_module *initrd = kinfo->initrd; +const struct boot_module *initrd = kinfo->hdr.initrd;void *fdt = kinfo->fdt;dt_dprintk ("Create chosen node\n" );
@@ -1525,9 +1525,9 @@ int __init make_chosen_node(const struct kernel_info *kinfo)if ( res )return res; -if ( kinfo->cmdline && kinfo->cmdline[0 ] ) +if ( kinfo->hdr.cmdline && kinfo->hdr.cmdline[0 ] ) { - bootargs = &kinfo->cmdline[0 ]; + bootargs = &kinfo->hdr.cmdline[0 ]; res =fdt_property (fdt,"bootargs" , bootargs,strlen (bootargs) +1 );if ( res )return res;
@@ -1976,7 +1976,7 @@ static int __init construct_dom0(struct domain *d) d->max_pages = dom0_mem >>PAGE_SHIFT ; kinfo.unassigned_mem = dom0_mem; - kinfo.d = d; + kinfo.hdr.d = d; rc =kernel_probe (&kinfo,NULL );if ( rc <0 )
@@ -1988,7 +1988,7 @@ static int __init construct_dom0(struct domain *d)int __init construct_hwdom (struct kernel_info *kinfo,const struct dt_device_node *node) { -struct domain *d = kinfo->d; +struct domain *d = kinfo->hdr.d;int rc;iommu_hwdom_init (d);
xen/arch/arm/kernel.c +4 -4
@@ -46,7 +46,7 @@ static void __init place_modules(struct kernel_info *info, paddr_t kernbase, paddr_t kernend) {/* Align DTB and initrd size to 2Mb. Linux only requires 4 byte alignment */ -const struct boot_module *mod = info->initrd; +const struct boot_module *mod = info->hdr.initrd;const struct membanks *mem =kernel_info_get_mem (info);const paddr_t initrd_len =ROUNDUP (mod ? mod->size :0 ,MB (2 ));const paddr_t dtb_len =ROUNDUP (fdt_totalsize (info->fdt),MB (2 ));
@@ -152,12 +152,12 @@ static void __init kernel_zimage_load(struct kernel_info *info) kernel =ioremap_wc (paddr, len);if ( !kernel ) -panic ("Unable to map the %pd kernel\n" , info->d); +panic ("Unable to map the %pd kernel\n" , info->hdr.d); - rc =copy_to_guest_phys_flush_dcache (info->d, load_addr, + rc =copy_to_guest_phys_flush_dcache (info->hdr.d, load_addr, kernel, len);if ( rc !=0 ) -panic ("Unable to copy the kernel in the %pd memory\n" , info->d); +panic ("Unable to copy the kernel in the %pd memory\n" , info->hdr.d);iounmap (kernel); }
xen/common/device-tree/dom0less-build.c +9 -9
@@ -167,18 +167,18 @@ static int __init handle_passthrough_prop(struct kernel_info *kinfo,return -EINVAL ; } - res =iomem_permit_access (kinfo->d,paddr_to_pfn (mstart), + res =iomem_permit_access (kinfo->hdr.d,paddr_to_pfn (mstart),paddr_to_pfn (PAGE_ALIGN (mstart + size -1 )));if ( res ) {printk (XENLOG_ERR "Unable to permit to dom%d access to" " 0x%" PRIpaddr" - 0x%" PRIpaddr"\n" , - kinfo->d->domain_id, + kinfo->hdr.d->domain_id, mstart &PAGE_MASK ,PAGE_ALIGN (mstart + size) -1 );return res; } - res = map_regions_p2mt(kinfo->d, + res = map_regions_p2mt(kinfo->hdr.d, gaddr_to_gfn(gstart), PFN_DOWN(size), maddr_to_mfn(mstart),
@@ -217,7 +217,7 @@ static int __init handle_passthrough_prop(struct kernel_info *kinfo,return -EINVAL ; } - res =map_device_irqs_to_domain (kinfo->d, node, true,NULL ); + res =map_device_irqs_to_domain (kinfo->hdr.d, node, true,NULL );if ( res <0 )return res;
@@ -229,7 +229,7 @@ static int __init handle_passthrough_prop(struct kernel_info *kinfo,if ( xen_force && !dt_device_is_protected (node) )return 0 ; -return iommu_assign_dt_device (kinfo->d, node); +return iommu_assign_dt_device (kinfo->hdr.d, node); } static int __init handle_prop_pfdt(struct kernel_info *kinfo,
@@ -296,14 +296,14 @@ static int __init handle_prop_pfdt(struct kernel_info *kinfo, address_cells, size_cells);if ( res <0 ) { -printk (XENLOG_ERR "Failed to assign device to %pd\n" , kinfo->d); +printk (XENLOG_ERR "Failed to assign device to %pd\n" , kinfo->hdr.d);return res; } }else if ( (xen_path && !xen_reg) || (xen_reg && !xen_path && !xen_force) ) {printk (XENLOG_ERR "xen,reg or xen,path missing for %pd\n" , - kinfo->d); + kinfo->hdr.d);return -EINVAL ; }
@@ -605,7 +605,7 @@ static int __init alloc_xenstore_page(struct domain *d)static int __init alloc_xenstore_params (struct kernel_info *kinfo) { -struct domain *d = kinfo->d; +struct domain *d = kinfo->hdr.d;int rc =0 ;#ifdef CONFIG_HVM
@@ -773,7 +773,7 @@ static int __init construct_domU(struct domain *d, d->max_pages = ((paddr_t )mem *SZ_1K ) >>PAGE_SHIFT ; - kinfo.d = d; + kinfo.hdr.d = d; rc =kernel_probe (&kinfo, node);if ( rc <0 )
xen/common/device-tree/domain-build.c +10 -10
@@ -76,7 +76,7 @@ bool __init allocate_bank_memory(struct kernel_info *kinfo, gfn_t sgfn, paddr_t tot_size) {struct membanks *mem =kernel_info_get_mem (kinfo); -struct domain *d = kinfo->d; +struct domain *d = kinfo->hdr.d;struct membank *bank;/*
@@ -170,7 +170,7 @@ int __init find_unallocated_memory(const struct kernel_info *kinfo,unsigned int i, j;int res; -ASSERT (domain_use_host_layout (kinfo->d)); +ASSERT (domain_use_host_layout (kinfo->hdr.d)); unalloc_mem =rangeset_new (NULL ,NULL ,0 );if ( !unalloc_mem )
@@ -336,23 +336,23 @@ void __init dtb_load(struct kernel_info *kinfo,unsigned long left;printk ("Loading %pd DTB to 0x%" PRIpaddr"-0x%" PRIpaddr"\n" , - kinfo->d, kinfo->dtb_paddr, + kinfo->hdr.d, kinfo->dtb_paddr, kinfo->dtb_paddr +fdt_totalsize (kinfo->fdt)); - left =copy_to_guest (kinfo->d, kinfo->dtb_paddr, + left =copy_to_guest (kinfo->hdr.d, kinfo->dtb_paddr, kinfo->fdt,fdt_totalsize (kinfo->fdt));if ( left !=0 )panic ("Unable to copy the DTB to %pd memory (left = %lu bytes)\n" , - kinfo->d, left); + kinfo->hdr.d, left);xfree (kinfo->fdt); }void __init initrd_load (struct kernel_info *kinfo,copy_to_guest_phys_cb copy_to_guest) { -const struct boot_module *mod = kinfo->initrd; +const struct boot_module *mod = kinfo->hdr.initrd;paddr_t load_addr = kinfo->initrd_paddr;paddr_t paddr, len;int node;
@@ -368,7 +368,7 @@ void __init initrd_load(struct kernel_info *kinfo, len = mod->size;printk ("Loading %pd initrd from %" PRIpaddr" to 0x%" PRIpaddr"-0x%" PRIpaddr"\n" , - kinfo->d, paddr, load_addr, load_addr + len); + kinfo->hdr.d, paddr, load_addr, load_addr + len);/* Fix up linux,initrd-start and linux,initrd-end in /chosen */ node =fdt_path_offset (kinfo->fdt,"/chosen" );
@@ -391,12 +391,12 @@ void __init initrd_load(struct kernel_info *kinfo, initrd =ioremap_wc (paddr, len);if ( !initrd ) -panic ("Unable to map the %pd initrd\n" , kinfo->d); +panic ("Unable to map the %pd initrd\n" , kinfo->hdr.d); - res =copy_to_guest (kinfo->d, load_addr, + res =copy_to_guest (kinfo->hdr.d, load_addr, initrd, len);if ( res !=0 ) -panic ("Unable to copy the initrd in the %pd memory\n" , kinfo->d); +panic ("Unable to copy the initrd in the %pd memory\n" , kinfo->hdr.d);iounmap (initrd); }
xen/common/device-tree/kernel.c +10 -10
@@ -136,16 +136,16 @@ int __init kernel_probe(struct kernel_info *info,/* domain is NULL only for the hardware domain */ if ( domain ==NULL ) { -ASSERT (is_hardware_domain (info->d)); +ASSERT (is_hardware_domain (info->hdr.d)); mod =boot_module_find_by_kind (BOOTMOD_KERNEL ); - info->kernel = mod; - info->initrd =boot_module_find_by_kind (BOOTMOD_RAMDISK ); + info->hdr.kernel = mod; + info->hdr.initrd =boot_module_find_by_kind (BOOTMOD_RAMDISK ); cmd =boot_cmdline_find_by_kind (BOOTMOD_KERNEL );if ( cmd ) - info->cmdline = &cmd->cmdline[0 ]; + info->hdr.cmdline = &cmd->cmdline[0 ]; }else {
@@ -162,7 +162,7 @@ int __init kernel_probe(struct kernel_info *info,dt_get_range (&val, node, &kernel_addr, &size); mod =boot_module_find_by_addr_and_kind (BOOTMOD_KERNEL , kernel_addr); - info->kernel = mod; + info->hdr.kernel = mod; }else if (dt_device_is_compatible (node,"multiboot,ramdisk" ) ) {
@@ -171,7 +171,7 @@ int __init kernel_probe(struct kernel_info *info, val =dt_get_property (node,"reg" , &len);dt_get_range (&val, node, &initrd_addr, &size); - info->initrd =boot_module_find_by_addr_and_kind ( + info->hdr.initrd =boot_module_find_by_addr_and_kind (BOOTMOD_RAMDISK , initrd_addr); }else if (dt_device_is_compatible (node,"multiboot,device-tree" ) )
@@ -192,7 +192,7 @@ int __init kernel_probe(struct kernel_info *info, name =dt_node_name (domain); cmd =boot_cmdline_find_by_name (name);if ( cmd ) - info->cmdline = &cmd->cmdline[0 ]; + info->hdr.cmdline = &cmd->cmdline[0 ]; }if ( !mod || !mod->size ) {
@@ -201,10 +201,10 @@ int __init kernel_probe(struct kernel_info *info, }printk ("Loading %pd kernel from boot module @ %" PRIpaddr"\n" , - info->d, info->kernel->start); -if ( info->initrd ) + info->hdr.d, info->hdr.kernel->start); +if ( info->hdr.initrd )printk ("Loading ramdisk from boot module @ %" PRIpaddr"\n" , - info->initrd->start); + info->hdr.initrd->start);/* * uImage isn't really used nowadays thereby leave kernel_uimage_probe()
xen/include/xen/bootfdt.h +10 -0
@@ -100,6 +100,16 @@ struct shared_meminfo {struct shmem_membank_extra extra[NR_SHMEM_BANKS ]; }; + +struct boot_domain { +struct domain *d; + +struct boot_module *kernel; +struct boot_module *initrd; + +const char * cmdline; +}; +/* * The domU flag is set for kernels and ramdisks of "xen,domain" nodes. * The purpose of the domU flag is to avoid getting confused in
xen/include/xen/fdt-kernel.h +2 -3
@@ -16,7 +16,7 @@#endif struct kernel_info { -struct domain *d; +struct boot_domain hdr;void *fdt;/* flat device tree */ paddr_t unassigned_mem;/* RAM not (yet) assigned to a bank */
@@ -34,8 +34,7 @@ struct kernel_info {paddr_t gnttab_size;/* boot blob load addresses */ -const struct boot_module *kernel, *initrd, *dtb; -const char * cmdline; +const struct boot_module *dtb;paddr_t dtb_paddr;paddr_t initrd_paddr;
Signature · 1 line
2.43.0
PATCH v4 5/12 x86: Replace arch-specific boot_domain with the common one
In reply to Alejandro VallejoAdd the single arch-specific field in an "arch" subfield defined in asm/bootfdt.h.
No functional change intended.
--- xen/arch/x86/hvm/dom0_build.c | 2 +- xen/arch/x86/include/asm/boot-domain.h | 33 -------------------------- xen/arch/x86/include/asm/bootfdt.h | 6 +++++ xen/arch/x86/include/asm/bootinfo.h | 1 - xen/arch/x86/pv/dom0_build.c | 2 +- xen/arch/x86/setup.c | 12 ++++++---- xen/include/xen/bootfdt.h | 4 ++++ 7 files changed, 19 insertions(+), 41 deletions(-) delete mode 100644 xen/arch/x86/include/asm/boot-domain.h
xen/arch/x86/hvm/dom0_build.c +1 -1
@@ -648,7 +648,7 @@ static int __init pvh_load_kernel( {struct domain *d = bd->d;struct boot_module *image = bd->kernel; -struct boot_module *initrd = bd->module; +struct boot_module *initrd = bd->initrd;void *image_base =bootstrap_map_bm (image);void *image_start = image_base + image->arch.headroom;unsigned long image_len = image->size;
xen/arch/x86/include/asm/boot-domain.h deleted +0 -33
@@ -1,33 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ -/* -* Copyright (c) 2024 Apertus Solutions, LLC -* Author: Daniel P. Smith <[email protected]> -* Copyright (c) 2024 Christopher Clark <[email protected]> -*/ - -#ifndef __XEN_X86_BOOTDOMAIN_H__ -#define __XEN_X86_BOOTDOMAIN_H__ - -#include <public/xen.h> - -struct boot_domain { -domid_t domid; - -struct boot_module *kernel; -struct boot_module *module; -const char *cmdline; - -struct domain *d; -}; - -#endif - -/* -* Local variables: -* mode: C -* c-file-style: "BSD" -* c-basic-offset: 4 -* tab-width: 4 -* indent-tabs-mode: nil -* End: -*/
xen/arch/x86/include/asm/bootfdt.h +6 -0
@@ -3,6 +3,12 @@#define X86_BOOTFDT_H #include <xen/types.h> +#include <public/xen.h> + +struct arch_boot_domain +{ +domid_t domid; +};struct arch_boot_module {
xen/arch/x86/include/asm/bootinfo.h +0 -1
@@ -12,7 +12,6 @@#include <xen/init.h> #include <xen/multiboot.h> #include <xen/types.h> -#include <asm/boot-domain.h> /* Max number of boot modules a bootloader can provide in addition to Xen */ #define MAX_NR_BOOTMODS 63
xen/arch/x86/pv/dom0_build.c +1 -1
@@ -375,7 +375,7 @@ static int __init dom0_construct(const struct boot_domain *bd)struct vcpu *v = d->vcpu[0 ];struct boot_module *image = bd->kernel; -struct boot_module *initrd = bd->module; +struct boot_module *initrd = bd->initrd;void *image_base;unsigned long image_len;void *image_start;
xen/arch/x86/setup.c +7 -5
@@ -297,7 +297,9 @@ static const char *cmdline_cook(const char *p, const char *loader_name);struct boot_info __initdata xen_boot_info = { .loader ="unknown" , .cmdline ="" , - .domains = { [0 ...MAX_NR_BOOTDOMS -1 ] = { .domid =DOMID_INVALID } }, + .domains = { [0 ...MAX_NR_BOOTDOMS -1 ] = { + .arch.domid =DOMID_INVALID + }},/* * There's a MAX_NR_BOOTMODS-th entry in the array. It's not off by one. *
@@ -1045,11 +1047,11 @@ static struct domain *__init create_dom0(struct boot_info *bi) dom0_cfg.flags |= XEN_DOMCTL_CDF_iommu;/* Create initial domain. Not d0 for pvshim. */ - bd->domid =get_initial_domain_id (); - d =domain_create (bd->domid, &dom0_cfg, + bd->arch.domid =get_initial_domain_id (); + d =domain_create (bd->arch.domid, &dom0_cfg, pv_shim ?0 : CDF_privileged | CDF_hardware);if (IS_ERR (d) ) -panic ("Error creating d%u: %ld\n" , bd->domid,PTR_ERR (d)); +panic ("Error creating d%u: %ld\n" , bd->arch.domid,PTR_ERR (d));init_dom0_cpuid_policy (d);
@@ -2168,7 +2170,7 @@ void asmlinkage __init noreturn __start_xen(void)if ( initrdidx <MAX_NR_BOOTMODS ) { bi->mods[initrdidx].kind =BOOTMOD_RAMDISK ; - bi->domains[0 ].module = &bi->mods[initrdidx]; + bi->domains[0 ].initrd = &bi->mods[initrdidx];if (first_boot_module_index (bi,BOOTMOD_UNKNOWN ) <MAX_NR_BOOTMODS ) printk(XENLOG_WARNING "Multiple initrd candidates, picking module #%u\n",
xen/include/xen/bootfdt.h +4 -0
@@ -108,6 +108,10 @@ struct boot_domain {struct boot_module *initrd;const char * cmdline; + +#if __has_include(<asm/bootfdt.h>) +struct arch_boot_domain arch; +#endif };/*
Signature · 1 line
2.43.0
PATCH v4 6/12 xen/dt: Move bootfdt functions to xen/bootfdt.h
In reply to Alejandro VallejoPart of an unpicking process to extract bootfdt contents independent of bootinfo to a separate file for x86 to take.
Move functions required for early FDT parsing from device_tree.h and arm's setup.h onto bootfdt.h
Declaration motion only. Not a functional change.
---
v4:
* Remove bootfdt.h include from device_tree.h
(move dt_read_paddr and fix up
static-evtchn.c +
device-tree.c +
boot-cpupool.c +
riscv/smpboot.c +
riscv/cpufeature.c)
--- xen/arch/riscv/cpufeature.c | 1 + xen/arch/riscv/smpboot.c | 1 + xen/common/device-tree/device-tree.c | 1 + xen/common/device-tree/static-evtchn.c | 1 + xen/common/sched/boot-cpupool.c | 1 + xen/include/xen/bootfdt.h | 91 ++++++++++++++++++++++++++ xen/include/xen/device_tree.h | 66 ------------------- 7 files changed, 96 insertions(+), 66 deletions(-)
xen/arch/riscv/cpufeature.c +1 -0
@@ -8,6 +8,7 @@*/ #include <xen/bitmap.h> +#include <xen/bootfdt.h> #include <xen/ctype.h> #include <xen/device_tree.h> #include <xen/errno.h>
xen/arch/riscv/smpboot.c +1 -0
@@ -1,3 +1,4 @@ +#include <xen/bootfdt.h> #include <xen/cpumask.h> #include <xen/device_tree.h> #include <xen/errno.h>
xen/common/device-tree/device-tree.c +1 -0
@@ -7,6 +7,7 @@* [email protected] */ +#include <xen/bootfdt.h> #include <xen/types.h> #include <xen/init.h> #include <xen/guest_access.h>
xen/common/device-tree/static-evtchn.c +1 -0
@@ -1,5 +1,6 @@/* SPDX-License-Identifier: GPL-2.0-only */ +#include <xen/bootfdt.h> #include <xen/event.h> #include <xen/static-evtchn.h>
xen/common/sched/boot-cpupool.c +1 -0
@@ -7,6 +7,7 @@* Copyright (C) 2022 Arm Ltd. */ +#include <xen/bootfdt.h> #include <xen/acpi.h> #include <xen/sched.h>
xen/include/xen/bootfdt.h +91 -0
111 lines not on this page · raw message
xen/include/xen/device_tree.h +0 -66
104 lines not on this page · raw message
Signature · 1 line
2.43.0
Re: [PATCH v4 06/12] xen/dt: Move bootfdt functions to xen/bootfdt.h
Quoted 247 lines · Alejandro Vallejo
Part of an unpicking process to extract bootfdt contents independent of bootinfo to a separate file for x86 to take.
Move functions required for early FDT parsing from
device_tree.hand arm'ssetup.hontobootfdt.hDeclaration motion only. Not a functional change.
Signed-off-by Alejandro Vallejo <[email protected]>---
v4:
* Removebootfdt.hinclude fromdevice_tree.h
(movedt_read_paddrand fix up
static-evtchn.c+
device-tree.c+
boot-cpupool.c+
riscv/smpboot.c+
riscv/cpufeature.c)--- xen/arch/riscv/cpufeature.c | 1 + xen/arch/riscv/smpboot.c | 1 + xen/common/device-tree/device-tree.c | 1 + xen/common/device-tree/static-evtchn.c | 1 + xen/common/sched/boot-cpupool.c | 1 + xen/include/xen/bootfdt.h | 91 ++++++++++++++++++++++++++ xen/include/xen/device_tree.h | 66 ------------------- 7 files changed, 96 insertions(+), 66 deletions(-)xen/arch/riscv/cpufeature.c +1
-0@@ -8,6 +8,7 @@*/ #include <xen/bitmap.h> +#include <xen/bootfdt.h> #include <xen/ctype.h> #include <xen/device_tree.h> #include <xen/errno.h> xen/arch/riscv/smpboot.c +1
-0@@ -1,3 +1,4 @@ +#include <xen/bootfdt.h> #include <xen/cpumask.h> #include <xen/device_tree.h> #include <xen/errno.h> xen/common/device-tree/device-tree.c +1
-0@@ -7,6 +7,7 @@* [email protected] */ +#include <xen/bootfdt.h> #include <xen/types.h> #include <xen/init.h> #include <xen/guest_access.h> xen/common/device-tree/static-evtchn.c +1
-0@@ -1,5 +1,6 @@/* SPDX-License-Identifier: GPL-2.0-only */ +#include <xen/bootfdt.h> #include <xen/event.h> #include <xen/static-evtchn.h> xen/common/sched/boot-cpupool.c +1
-0@@ -7,6 +7,7 @@* Copyright (C) 2022 Arm Ltd. */ +#include <xen/bootfdt.h> #include <xen/acpi.h> #include <xen/sched.h> xen/include/xen/bootfdt.h +91
-0@@ -2,8 +2,11 @@#ifndef XEN_BOOTFDT_H #define XEN_BOOTFDT_H +#include <xen/byteorder.h> +#include <xen/bug.h> #include <xen/types.h> #include <xen/kernel.h> +#include <xen/lib.h> #include <xen/macros.h> #include <xen/xmalloc.h> @@ -16,8 +19,80 @@#define NR_MEM_BANKS 256#define NR_SHMEM_BANKS 32 +/* Default #address and #size cells */ +#define DT_ROOT_NODE_ADDR_CELLS_DEFAULT 2 +#define DT_ROOT_NODE_SIZE_CELLS_DEFAULT 1 +#define MAX_MODULES 32/* Current maximum useful modules */ +#define DEVICE_TREE_MAX_DEPTH 16 + +/* Helper to read a big number; size is in cells (not bytes) */ +static inline u64 dt_read_number (const __be32 *cell,int size) +{ +u64 r =0 ; + +while ( size-- ) + r = (r <<32 ) |be32_to_cpu (*(cell++)); +return r; +} + +/* Wrapper for dt_read_number() to return paddr_t (instead of uint64_t) */ +static inline paddr_t dt_read_paddr (const __be32 *cell,int size) +{ +uint64_t dt_r; +paddr_t r; + +/* +* dt_read_number will return uint64_t whereas paddr_t may not be 64-bit. +* Thus, there is an implicit cast from uint64_t to paddr_t. +*/ + dt_r =dt_read_number (cell, size); + +if ( dt_r != (paddr_t )dt_r ) + { +printk ("Physical address greater than max width supported\n" ); +WARN (); + } + +/* +* Xen will truncate the address/size if it is greater than the maximum +* supported width and it will give an appropriate warning. +*/ + r = dt_r; + +return r; +} + +static inline u64 dt_next_cell (int s,const __be32 **cellp) +{ +const __be32 *p = *cellp; + + *cellp = p + s; +return dt_read_number (p, s); +} + +typedef int (*device_tree_node_func )(const void *fdt, +int node,const char *name,int depth, +u32 address_cells,u32 size_cells, +void *data); + +/** +* device_tree_for_each_node - iterate over all device tree sub-nodes +* @fdt: flat device tree. +* @node: parent node to start the search from +* @func: function to call for each sub-node. +* @data: data to pass to @func. +* +* Any nodes nested at DEVICE_TREE_MAX_DEPTH or deeper are ignored. +* +* Returns 0 if all nodes were iterated over successfully. If @func +* returns a value different from 0, that value is returned immediately. +*/ +int device_tree_for_each_node (const void *fdt,int node, +device_tree_node_func func, +void *data); + typedef enum { BOOTMOD_XEN, BOOTMOD_FDT,@@ -260,4 +335,20 @@ static inline struct membanks *membanks_xzalloc(unsigned int nr, return banks; } +/* +* Interpret the property `prop_name` of `node` as a u32. +* +* Returns the property value on success; otherwise returns `dflt`. +*/ +u32 device_tree_get_u32 (const void *fdt,int node, +const char *prop_name,u32 dflt); + +/* +* Interpret the property `prop_name` of `node` as a "reg". +* +* Returns outputs in `start` and `size`. +*/ +void device_tree_get_reg (const __be32 **cell,uint32_t address_cells, +uint32_t size_cells,paddr_t *start,paddr_t *size); +#endif /* XEN_BOOTFDT_H */ xen/include/xen/device_tree.h +0
-15@@ -22,8 +22,6 @@#include <xen/list.h> #include <xen/rwlock.h> -#define DEVICE_TREE_MAX_DEPTH 16 -/* * Struct used for matching a device */ @@ -164,17 +162,8 @@ struct dt_raw_irq {u32 specifier[DT_MAX_IRQ_SPEC ]; }; -typedef int (*device_tree_node_func )(const void *fdt, -int node,const char *name,int depth, -u32 address_cells,u32 size_cells, -void *data); -extern const void *device_tree_flattened; -int device_tree_for_each_node (const void *fdt,int node, -device_tree_node_func func, -void *data); -/** * dt_unflatten_host_device_tree - Unflatten the host device tree * @@ -245,10 +234,6 @@ void intc_dt_preinit(void);#define dt_node_cmp (s1, s2) strcasecmp((s1), (s2))#define dt_compat_cmp (s1, s2) strcasecmp((s1), (s2)) -/* Default #address and #size cells */ -#define DT_ROOT_NODE_ADDR_CELLS_DEFAULT 2 -#define DT_ROOT_NODE_SIZE_CELLS_DEFAULT 1 -#define dt_for_each_property_node (dn, pp) \ for ( pp = (dn)->properties; (pp) != NULL; pp = (pp)->next )@@ -258,43 +243,6 @@ void intc_dt_preinit(void);#define dt_for_each_child_node (dt, dn) \ for ( dn = (dt)->child; (dn) != NULL; dn = (dn)->sibling )
xen/include/xen/device_tree.h void intc_dt_preinit(void); · line 269
Quoted 10 lines
xen/include/xen/device_tree.h +0
-9-/* Helper to read a big number; size is in cells (not bytes) */ -static inline u64 dt_read_number (const __be32 *cell,int size) -{ -u64 r =0 ; - -while ( size-- ) - r = (r <<32 ) |be32_to_cpu (*(cell++)); -return r; -}
I committed your other patch so this doesn't apply any longer.
Other than that:
PATCH v4 7/12 xen/dt: Move bootinfo functions to a new bootinfo.h
In reply to Alejandro VallejoPart of an unpicking process to extract bootfdt contents independent of bootinfo to a separate file for x86 to take.
With this, bootfdt.h can be cleanly included from x86. A later patch extracts the definitions so the functions may be called too.
Not a functional change.
---
v4:
* Replace bootfdt.h in arm/setup.h with bootinfo.h
--- xen/arch/arm/domain_build.c | 1 + xen/arch/arm/include/asm/setup.h | 2 +- xen/arch/arm/setup.c | 1 + xen/arch/riscv/mm.c | 2 +- xen/arch/riscv/setup.c | 2 +- xen/common/device-tree/bootfdt.c | 2 +- xen/common/device-tree/bootinfo.c | 2 +- xen/common/device-tree/dom0less-build.c | 2 +- xen/common/device-tree/domain-build.c | 2 +- xen/common/device-tree/kernel.c | 2 +- xen/include/xen/bootfdt.h | 208 ----------------------- xen/include/xen/bootinfo.h | 213 ++++++++++++++++++++++++ xen/include/xen/fdt-domain-build.h | 2 +- xen/include/xen/fdt-kernel.h | 2 +- 14 files changed, 225 insertions(+), 218 deletions(-) create mode 100644 xen/include/xen/bootinfo.h
xen/arch/arm/domain_build.c +1 -0
@@ -1,5 +1,6 @@/* SPDX-License-Identifier: GPL-2.0-only */ #include <xen/init.h> +#include <xen/bootinfo.h> #include <xen/compile.h> #include <xen/fdt-domain-build.h> #include <xen/fdt-kernel.h>
xen/arch/arm/include/asm/setup.h +1 -1
@@ -3,7 +3,7 @@#include <public/version.h> #include <asm/p2m.h> -#include <xen/bootfdt.h> +#include <xen/bootinfo.h> #include <xen/device_tree.h> #if defined(CONFIG_MMU )
xen/arch/arm/setup.c +1 -0
@@ -8,6 +8,7 @@* Copyright (c) 2011 Citrix Systems. */ +#include <xen/bootinfo.h> #include <xen/compile.h> #include <xen/device_tree.h> #include <xen/domain_page.h>
xen/arch/riscv/mm.c +1 -1
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0-only */ -#include <xen/bootfdt.h> +#include <xen/bootinfo.h> #include <xen/bug.h> #include <xen/compiler.h> #include <xen/domain_page.h>
xen/arch/riscv/setup.c +1 -1
@@ -2,7 +2,7 @@#include <xen/acpi.h> #include <xen/bug.h> -#include <xen/bootfdt.h> +#include <xen/bootinfo.h> #include <xen/compile.h> #include <xen/device_tree.h> #include <xen/init.h>
xen/common/device-tree/bootfdt.c +1 -1
@@ -5,7 +5,7 @@* Copyright (C) 2012-2014 Citrix Systems, Inc. */ -#include <xen/bootfdt.h> +#include <xen/bootinfo.h> #include <xen/device_tree.h> #include <xen/efi.h> #include <xen/init.h>
xen/common/device-tree/bootinfo.c +1 -1
@@ -10,7 +10,7 @@*/ #include <xen/acpi.h> -#include <xen/bootfdt.h> +#include <xen/bootinfo.h> #include <xen/bug.h> #include <xen/device_tree.h> #include <xen/init.h>
xen/common/device-tree/dom0less-build.c +1 -1
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0-only */ -#include <xen/bootfdt.h> +#include <xen/bootinfo.h> #include <xen/device_tree.h> #include <xen/domain.h> #include <xen/domain_page.h>
xen/common/device-tree/domain-build.c +1 -1
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0-only */ -#include <xen/bootfdt.h> +#include <xen/bootinfo.h> #include <xen/fdt-domain-build.h> #include <xen/init.h> #include <xen/lib.h>
xen/common/device-tree/kernel.c +1 -1
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0-only */ -#include <xen/bootfdt.h> +#include <xen/bootinfo.h> #include <xen/device_tree.h> #include <xen/fdt-kernel.h> #include <xen/errno.h>
xen/include/xen/bootfdt.h +0 -208
237 lines not on this page · raw message
xen/include/xen/bootinfo.h new file +213 -0
213 lines not on this page · raw message
xen/include/xen/fdt-domain-build.h +1 -1
@@ -3,7 +3,7 @@#ifndef __XEN_FDT_DOMAIN_BUILD_H__#define __XEN_FDT_DOMAIN_BUILD_H__ -#include <xen/bootfdt.h> +#include <xen/bootinfo.h> #include <xen/device_tree.h> #include <xen/fdt-kernel.h> #include <xen/mm.h>
xen/include/xen/fdt-kernel.h +1 -1
@@ -7,7 +7,7 @@#ifndef __XEN_FDT_KERNEL_H__#define __XEN_FDT_KERNEL_H__ -#include <xen/bootfdt.h> +#include <xen/bootinfo.h> #include <xen/device_tree.h> #include <xen/types.h>
Signature · 1 line
2.43.0
PATCH v4 8/12 xen/dt: Rename bootfdt.c -> bootinfo-fdt.c
In reply to Alejandro VallejoThis file will eventually contain bootfdt helpers that make heavy use of bootinfo. To simplify git history do the rename here explicitly. A later patch extracts bootinfo-independent helpers into bootfdt.c.
Doing so here would needlessly pollute the diffs.
Not a functional change.
--- xen/common/device-tree/Makefile | 1 + xen/common/device-tree/bootfdt.c | 646 +------------------------- xen/common/device-tree/bootinfo-fdt.c | 597 ++++++++++++++++++++++++ 3 files changed, 619 insertions(+), 625 deletions(-) create mode 100644 xen/common/device-tree/bootinfo-fdt.c
xen/common/device-tree/Makefile +1 -0
@@ -1,4 +1,5 @@ obj-y += bootfdt.init.o +obj-y += bootinfo-fdt.init.o obj-y += bootinfo.init.o obj-y += device-tree.o obj-$(CONFIG_DOMAIN_BUILD_HELPERS) += domain-build.init.o
xen/common/device-tree/bootfdt.c +21 -625
674 lines not on this page · raw message
xen/common/device-tree/bootinfo-fdt.c new file +597 -0
597 lines not on this page · raw message
Signature · 1 line
2.43.0
PATCH v4 9/12 xen/dt: Extract helper to map nodes to module kinds
In reply to Alejandro VallejoThis will be required later by x86 code in order to do early identification of boot modules when booting off a DTB.
Not a functional change.
--- xen/common/device-tree/bootfdt.c | 18 ++++++++++++++++++ xen/common/device-tree/bootinfo-fdt.c | 16 +--------------- xen/include/xen/bootfdt.h | 7 +++++++ 3 files changed, 26 insertions(+), 15 deletions(-)
xen/common/device-tree/bootfdt.c +18 -0
@@ -4,6 +4,24 @@#include <xen/lib.h> #include <xen/libfdt/libfdt.h> +boot_module_kind __init fdt_node_to_kind (const void *fdt,int node) +{ +if (fdt_node_check_compatible (fdt, node,"xen,linux-zimage" ) ==0 || +fdt_node_check_compatible (fdt, node,"multiboot,kernel" ) ==0 ) +return BOOTMOD_KERNEL ; +if (fdt_node_check_compatible (fdt, node,"xen,linux-initrd" ) ==0 || +fdt_node_check_compatible (fdt, node,"multiboot,ramdisk" ) ==0 ) +return BOOTMOD_RAMDISK ; +if (fdt_node_check_compatible (fdt, node,"xen,xsm-policy" ) ==0 ) +return BOOTMOD_XSM ; +if (fdt_node_check_compatible (fdt, node,"multiboot,device-tree" ) ==0 ) +return BOOTMOD_GUEST_DTB ; +if (fdt_node_check_compatible (fdt, node,"multiboot,microcode" ) ==0 ) +return BOOTMOD_MICROCODE ; + +return BOOTMOD_UNKNOWN ; +} +u32 __init device_tree_get_u32 (const void *fdt,int node,const char *prop_name,u32 dflt) {
xen/common/device-tree/bootinfo-fdt.c +1 -15
@@ -236,21 +236,7 @@ static void __init process_multiboot_node(const void *fdt, int node, cell = (const __be32 *)prop->data;device_tree_get_reg (&cell, address_cells, size_cells, &start, &size); - -if (fdt_node_check_compatible (fdt, node,"xen,linux-zimage" ) ==0 || -fdt_node_check_compatible (fdt, node,"multiboot,kernel" ) ==0 ) - kind =BOOTMOD_KERNEL ; -else if (fdt_node_check_compatible (fdt, node,"xen,linux-initrd" ) ==0 || -fdt_node_check_compatible (fdt, node,"multiboot,ramdisk" ) ==0 ) - kind =BOOTMOD_RAMDISK ; -else if (fdt_node_check_compatible (fdt, node,"xen,xsm-policy" ) ==0 ) - kind =BOOTMOD_XSM ; -else if (fdt_node_check_compatible (fdt, node,"multiboot,device-tree" ) ==0 ) - kind =BOOTMOD_GUEST_DTB ; -else if (fdt_node_check_compatible (fdt, node,"multiboot,microcode" ) ==0 ) - kind =BOOTMOD_MICROCODE ; -else - kind =BOOTMOD_UNKNOWN ; + kind =fdt_node_to_kind (fdt, node);/** * Guess the kind of these first two unknowns respectively:
xen/include/xen/bootfdt.h +7 -0
@@ -143,4 +143,11 @@ u32 device_tree_get_u32(const void *fdt, int node,void device_tree_get_reg (const __be32 **cell,uint32_t address_cells,uint32_t size_cells,paddr_t *start,paddr_t *size); +/* +* Probe an FDT node thought to be a boot module to identify its kind. +* +* If correctly identified, returns the detected kind, otherwise BOOTMOD_UNKNOWN +*/ +boot_module_kind fdt_node_to_kind (const void *fdt,int node); +#endif /* XEN_BOOTFDT_H */
Signature · 1 line
2.43.0
PATCH v4 10/12 xen: Rename CONFIG_HAS_DEVICE_TREE to CONFIG_HAS_DEVICE_TREE_DISCOVERY
In reply to Alejandro VallejoMoving forward the idea is for there to be:
1. Basic DT support: used by dom0less/hyperlaunch.
2. Full DT support: used for device discovery and HW setup.
Rename HAS_DEVICE_TREE to HAS_DEVICE_TREE_DISCOVERY to describe (2), while DOM0LESS_BOOT is left to describe (1).
--- xen/Kconfig.debug | 2 +- xen/arch/arm/Kconfig | 2 +- xen/arch/ppc/Kconfig | 2 +- xen/arch/riscv/Kconfig | 2 +- xen/common/Kconfig | 6 +++--- xen/common/Makefile | 4 ++-- xen/common/device.c | 4 ++-- xen/common/efi/boot.c | 2 +- xen/common/sched/Kconfig | 2 +- xen/drivers/char/ns16550.c | 6 +++--- xen/drivers/passthrough/Makefile | 2 +- xen/drivers/passthrough/iommu.c | 2 +- xen/include/asm-generic/device.h | 10 +++++----- xen/include/xen/iommu.h | 8 ++++---- xen/include/xsm/dummy.h | 4 ++-- xen/include/xsm/xsm.h | 12 ++++++------ xen/xsm/dummy.c | 2 +- xen/xsm/flask/hooks.c | 6 +++--- xen/xsm/xsm_core.c | 4 ++-- xen/xsm/xsm_policy.c | 4 ++-- 20 files changed, 43 insertions(+), 43 deletions(-)
xen/Kconfig.debug +1 -1
@@ -92,7 +92,7 @@ config VERBOSE_DEBUG config DEVICE_TREE_DEBUG bool "Device tree debug messages" - depends on HAS_DEVICE_TREE + depends on HAS_DEVICE_TREE_DISCOVERY help Device tree parsing and DOM0 device tree building messages are logged in the Xen ring buffer.
xen/arch/arm/Kconfig +1 -1
@@ -15,7 +15,7 @@ config ARM select FUNCTION_ALIGNMENT_4B select GENERIC_UART_INIT select HAS_ALTERNATIVE if HAS_VMAP - select HAS_DEVICE_TREE + select HAS_DEVICE_TREE_DISCOVERY select HAS_DOM0LESS select HAS_GRANT_CACHE_FLUSH if GRANT_TABLE select HAS_STACK_PROTECTOR
xen/arch/ppc/Kconfig +1 -1
@@ -1,7 +1,7 @@ config PPC def_bool y select FUNCTION_ALIGNMENT_4B - select HAS_DEVICE_TREE + select HAS_DEVICE_TREE_DISCOVERY select HAS_UBSAN select HAS_VMAP
xen/arch/riscv/Kconfig +1 -1
@@ -2,7 +2,7 @@ config RISCV def_bool y select FUNCTION_ALIGNMENT_16B select GENERIC_BUG_FRAME - select HAS_DEVICE_TREE + select HAS_DEVICE_TREE_DISCOVERY select HAS_PMAP select HAS_UBSAN select HAS_VMAP
xen/common/Kconfig +3 -3
@@ -14,7 +14,7 @@ config CORE_PARKING config DOM0LESS_BOOT bool "Dom0less boot support" if EXPERT - depends on HAS_DOM0LESS && HAS_DEVICE_TREE && DOMAIN_BUILD_HELPERS + depends on HAS_DOM0LESS && HAS_DEVICE_TREE_DISCOVERY && DOMAIN_BUILD_HELPERS default y help Dom0less boot support enables Xen to create and start domU guests during
@@ -85,7 +85,7 @@ config HAS_ALTERNATIVE config HAS_COMPAT bool -config HAS_DEVICE_TREE +config HAS_DEVICE_TREE_DISCOVERY bool select LIBFDT
@@ -553,7 +553,7 @@ config DOM0_MEM config DTB_FILE string "Absolute path to device tree blob" - depends on HAS_DEVICE_TREE + depends on HAS_DEVICE_TREE_DISCOVERY help When using a bootloader that has no device tree support or when there is no bootloader at all, use this option to specify the absolute path
xen/common/Makefile +2 -2
@@ -6,9 +6,9 @@ obj-$(CONFIG_HYPFS_CONFIG) += config_data.o obj-$(CONFIG_CORE_PARKING) += core_parking.o obj-y += cpu.o obj-$(CONFIG_DEBUG_TRACE) += debugtrace.o -obj-$(CONFIG_HAS_DEVICE_TREE) += device.o +obj-$(CONFIG_HAS_DEVICE_TREE_DISCOVERY) += device.o obj-$(filter-out $(CONFIG_X86),$(CONFIG_ACPI)) += device.o -obj-$(CONFIG_HAS_DEVICE_TREE) += device-tree/ +obj-$(CONFIG_HAS_DEVICE_TREE_DISCOVERY) += device-tree/ obj-$(CONFIG_IOREQ_SERVER) += dm.o obj-y += domain.o obj-y += event_2l.o
xen/common/device.c +2 -2
@@ -11,7 +11,7 @@#include <asm/device.h> -#ifdef CONFIG_HAS_DEVICE_TREE +#ifdef CONFIG_HAS_DEVICE_TREE_DISCOVERY extern const struct device_desc _sdevice[], _edevice[];
@@ -56,7 +56,7 @@ enum device_class device_get_class(const struct dt_device_node *dev) return DEVICE_UNKNOWN; } -#endif +#endif /* CONFIG_HAS_DEVICE_TREE_DISCOVERY */ #ifdef CONFIG_ACPI
xen/common/efi/boot.c +1 -1
@@ -601,7 +601,7 @@ static int __init __maybe_unused set_color(uint32_t mask, int bpp,return max (*pos + *sz, bpp); } -#ifndef CONFIG_HAS_DEVICE_TREE +#ifndef CONFIG_HAS_DEVICE_TREE_DISCOVERY static int __init efi_check_dt_boot (const EFI_LOADED_IMAGE *loaded_image) {return 0 ;
xen/common/sched/Kconfig +1 -1
@@ -67,7 +67,7 @@ endmenu config BOOT_TIME_CPUPOOLS bool "Create cpupools at boot time" - depends on HAS_DEVICE_TREE + depends on HAS_DEVICE_TREE_DISCOVERY help Creates cpupools during boot time and assigns cpus to them. Cpupools options can be specified in the device tree.
xen/drivers/char/ns16550.c +3 -3
@@ -34,7 +34,7 @@#include <xen/8250-uart.h> #include <xen/vmap.h> #include <asm/io.h> -#ifdef CONFIG_HAS_DEVICE_TREE +#ifdef CONFIG_HAS_DEVICE_TREE_DISCOVERY #include <asm/device.h> #endif #ifdef CONFIG_X86
@@ -1754,7 +1754,7 @@ void __init ns16550_init(int index, struct ns16550_defaults *defaults)#endif /* CONFIG_X86 */ -#ifdef CONFIG_HAS_DEVICE_TREE +#ifdef CONFIG_HAS_DEVICE_TREE_DISCOVERY static int __init ns16550_uart_dt_init (struct dt_device_node *dev,const void *data) {
@@ -1833,7 +1833,7 @@ DT_DEVICE_START(ns16550, "NS16550 UART", DEVICE_SERIAL) .init = ns16550_uart_dt_init, DT_DEVICE_END -#endif /* HAS_DEVICE_TREE */ +#endif /* HAS_DEVICE_TREE_DISCOVERY */ #if defined(CONFIG_ACPI ) && defined(CONFIG_ARM )#include <xen/acpi.h>
xen/drivers/passthrough/Makefile +1 -1
@@ -5,6 +5,6 @@ obj-$(CONFIG_ARM) += arm/ obj-y += iommu.o obj-$(CONFIG_HAS_PCI) += pci.o -obj-$(CONFIG_HAS_DEVICE_TREE) += device_tree.o +obj-$(CONFIG_HAS_DEVICE_TREE_DISCOVERY) += device_tree.o obj-$(CONFIG_HAS_PCI) += ats.o obj-$(CONFIG_HAS_PCI_MSI) += msi.o
xen/drivers/passthrough/iommu.c +1 -1
@@ -638,7 +638,7 @@ int iommu_do_domctl( ret =iommu_do_pci_domctl (domctl, d, u_domctl);#endif -#ifdef CONFIG_HAS_DEVICE_TREE +#ifdef CONFIG_HAS_DEVICE_TREE_DISCOVERY if ( ret == -ENODEV ) ret =iommu_do_dt_domctl (domctl, d, u_domctl);#endif
xen/include/asm-generic/device.h +5 -5
@@ -6,7 +6,7 @@enum device_type { -#ifdef CONFIG_HAS_DEVICE_TREE +#ifdef CONFIG_HAS_DEVICE_TREE_DISCOVERY DEV_DT ,#endif DEV_PCI
@@ -26,7 +26,7 @@ enum device_classstruct device {enum device_type type; -#ifdef CONFIG_HAS_DEVICE_TREE +#ifdef CONFIG_HAS_DEVICE_TREE_DISCOVERY struct dt_device_node *of_node;/* Used by drivers imported from Linux */ #endif #ifdef CONFIG_HAS_PASSTHROUGH
@@ -37,7 +37,7 @@ struct devicetypedef struct device device_t ; -#ifdef CONFIG_HAS_DEVICE_TREE +#ifdef CONFIG_HAS_DEVICE_TREE_DISCOVERY #include <xen/device_tree.h>
@@ -87,9 +87,9 @@ struct device_desc { int (*init)(struct dt_device_node *dev, const void *data); }; -#else /* !CONFIG_HAS_DEVICE_TREE */ +#else /* !CONFIG_HAS_DEVICE_TREE_DISCOVERY */ #define dev_is_dt (dev) ((void)(dev), false) -#endif /* CONFIG_HAS_DEVICE_TREE */ +#endif /* CONFIG_HAS_DEVICE_TREE_DISCOVERY */ #define dev_is_pci (dev) ((dev)->type == DEV_PCI)
xen/include/xen/iommu.h +4 -4
@@ -230,7 +230,7 @@ struct msi_msg;#define PT_IRQ_TIME_OUT MILLISECS(8)#endif /* HAS_PCI */ -#ifdef CONFIG_HAS_DEVICE_TREE +#ifdef CONFIG_HAS_DEVICE_TREE_DISCOVERY #include <xen/device_tree.h> #ifdef CONFIG_HAS_PASSTHROUGH
@@ -288,7 +288,7 @@ static inline int iommu_release_dt_devices(struct domain *d)#endif /* HAS_PASSTHROUGH */ -#endif /* HAS_DEVICE_TREE */ +#endif /* HAS_DEVICE_TREE_DISCOVERY */ struct page_info ;
@@ -355,7 +355,7 @@ struct iommu_ops {int (*get_reserved_device_memory)(iommu_grdm_t *func,void *ctxt);void (*dump_page_tables)(struct domain *d); -#ifdef CONFIG_HAS_DEVICE_TREE +#ifdef CONFIG_HAS_DEVICE_TREE_DISCOVERY /* * All IOMMU drivers which support generic IOMMU DT bindings should use * this callback. This is a way for the framework to provide the driver
@@ -403,7 +403,7 @@ struct domain_iommu {/* iommu_ops */ const struct iommu_ops *platform_ops; -#ifdef CONFIG_HAS_DEVICE_TREE +#ifdef CONFIG_HAS_DEVICE_TREE_DISCOVERY /* List of DT devices assigned to this domain */ struct list_head dt_devices;#endif
xen/include/xsm/dummy.h +2 -2
@@ -423,7 +423,7 @@ static XSM_INLINE int cf_check xsm_deassign_device(#endif /* HAS_PASSTHROUGH && HAS_PCI */ -#if defined(CONFIG_HAS_PASSTHROUGH ) && defined(CONFIG_HAS_DEVICE_TREE ) +#if defined(CONFIG_HAS_PASSTHROUGH ) && defined(CONFIG_HAS_DEVICE_TREE_DISCOVERY ) static XSM_INLINE int cf_check xsm_assign_dtdevice( XSM_DEFAULT_ARG struct domain *d, const char *dtpath) {
@@ -438,7 +438,7 @@ static XSM_INLINE int cf_check xsm_deassign_dtdevice(return xsm_default_action (action, current->domain, d); } -#endif /* HAS_PASSTHROUGH && HAS_DEVICE_TREE */ +#endif /* HAS_PASSTHROUGH && HAS_DEVICE_TREE_DISCOVERY */ static XSM_INLINE int cf_check xsm_resource_plug_core(XSM_DEFAULT_VOID) {
xen/include/xsm/xsm.h +6 -6
@@ -125,7 +125,7 @@ struct xsm_ops {int (*deassign_device)(struct domain *d,uint32_t machine_bdf);#endif -#if defined(CONFIG_HAS_PASSTHROUGH ) && defined(CONFIG_HAS_DEVICE_TREE ) +#if defined(CONFIG_HAS_PASSTHROUGH ) && defined(CONFIG_HAS_DEVICE_TREE_DISCOVERY )int (*assign_dtdevice)(struct domain *d,const char *dtpath);int (*deassign_dtdevice)(struct domain *d,const char *dtpath);#endif
@@ -535,7 +535,7 @@ static inline int xsm_deassign_device( }#endif /* HAS_PASSTHROUGH && HAS_PCI) */ -#if defined(CONFIG_HAS_PASSTHROUGH ) && defined(CONFIG_HAS_DEVICE_TREE ) +#if defined(CONFIG_HAS_PASSTHROUGH ) && defined(CONFIG_HAS_DEVICE_TREE_DISCOVERY )static inline int xsm_assign_dtdevice (xsm_default_t def,struct domain *d,const char *dtpath) {
@@ -548,7 +548,7 @@ static inline int xsm_deassign_dtdevice( return alternative_call(xsm_ops.deassign_dtdevice, d, dtpath); } -#endif /* HAS_PASSTHROUGH && HAS_DEVICE_TREE */ +#endif /* HAS_PASSTHROUGH && HAS_DEVICE_TREE_DISCOVERY */ static inline int xsm_resource_plug_pci (xsm_default_t def,uint32_t machine_bdf) {
@@ -789,7 +789,7 @@ int xsm_multiboot_policy_init( struct boot_info *bi, void **policy_buffer, size_t *policy_size);#endif -#ifdef CONFIG_HAS_DEVICE_TREE +#ifdef CONFIG_HAS_DEVICE_TREE_DISCOVERY /* * Initialize XSM *
@@ -839,7 +839,7 @@ static inline int xsm_multiboot_init(struct boot_info *bi) }#endif -#ifdef CONFIG_HAS_DEVICE_TREE +#ifdef CONFIG_HAS_DEVICE_TREE_DISCOVERY static inline int xsm_dt_init (void ) {return 0 ;
@@ -849,7 +849,7 @@ static inline bool has_xsm_magic(paddr_t start) {return false; } -#endif /* CONFIG_HAS_DEVICE_TREE */ +#endif /* CONFIG_HAS_DEVICE_TREE_DISCOVERY */ #endif /* CONFIG_XSM */
xen/xsm/dummy.c +1 -1
@@ -81,7 +81,7 @@ static const struct xsm_ops __initconst_cf_clobber dummy_ops = { .deassign_device = xsm_deassign_device,#endif -#if defined(CONFIG_HAS_PASSTHROUGH ) && defined(CONFIG_HAS_DEVICE_TREE ) +#if defined(CONFIG_HAS_PASSTHROUGH ) && defined(CONFIG_HAS_DEVICE_TREE_DISCOVERY ) .assign_dtdevice = xsm_assign_dtdevice, .deassign_dtdevice = xsm_deassign_dtdevice,#endif
xen/xsm/flask/hooks.c +3 -3
@@ -1456,7 +1456,7 @@ static int cf_check flask_deassign_device( }#endif /* HAS_PASSTHROUGH && HAS_PCI */ -#if defined(CONFIG_HAS_PASSTHROUGH ) && defined(CONFIG_HAS_DEVICE_TREE ) +#if defined(CONFIG_HAS_PASSTHROUGH ) && defined(CONFIG_HAS_DEVICE_TREE_DISCOVERY )static int flask_test_assign_dtdevice (const char *dtpath) {uint32_t rsid;
@@ -1517,7 +1517,7 @@ static int cf_check flask_deassign_dtdevice(return avc_current_has_perm (rsid,SECCLASS_RESOURCE ,RESOURCE__REMOVE_DEVICE ,NULL ); } -#endif /* HAS_PASSTHROUGH && HAS_DEVICE_TREE */ +#endif /* HAS_PASSTHROUGH && HAS_DEVICE_TREE_DISCOVERY */ static int cf_check flask_platform_op(uint32_t op) {
@@ -1981,7 +1981,7 @@ static const struct xsm_ops __initconst_cf_clobber flask_ops = { .deassign_device = flask_deassign_device,#endif -#if defined(CONFIG_HAS_PASSTHROUGH ) && defined(CONFIG_HAS_DEVICE_TREE ) +#if defined(CONFIG_HAS_PASSTHROUGH ) && defined(CONFIG_HAS_DEVICE_TREE_DISCOVERY ) .assign_dtdevice = flask_assign_dtdevice, .deassign_dtdevice = flask_deassign_dtdevice,#endif
xen/xsm/xsm_core.c +2 -2
@@ -25,7 +25,7 @@#include <asm/setup.h> #endif -#ifdef CONFIG_HAS_DEVICE_TREE +#ifdef CONFIG_HAS_DEVICE_TREE_DISCOVERY #include <asm/setup.h> #endif
@@ -166,7 +166,7 @@ int __init xsm_multiboot_init(struct boot_info *bi) }#endif -#ifdef CONFIG_HAS_DEVICE_TREE +#ifdef CONFIG_HAS_DEVICE_TREE_DISCOVERY int __init xsm_dt_init (void ) {int ret =0 ;
xen/xsm/xsm_policy.c +2 -2
@@ -24,7 +24,7 @@#include <asm/setup.h> #endif #include <xen/bitops.h> -#ifdef CONFIG_HAS_DEVICE_TREE +#ifdef CONFIG_HAS_DEVICE_TREE_DISCOVERY # include <asm/setup.h> # include <xen/device_tree.h> #endif
@@ -65,7 +65,7 @@ int __init xsm_multiboot_policy_init( }#endif -#ifdef CONFIG_HAS_DEVICE_TREE +#ifdef CONFIG_HAS_DEVICE_TREE_DISCOVERY int __init xsm_dt_policy_init (void **policy_buffer,size_t *policy_size) {struct boot_module *mod =boot_module_find_by_kind (BOOTMOD_XSM );
Signature · 1 line
2.43.0
Re: [PATCH v4 10/12] xen: Rename CONFIG_HAS_DEVICE_TREE to CONFIG_HAS_DEVICE_TREE_DISCOVERY
Quoted 8 lines · Alejandro Vallejo
Moving forward the idea is for there to be:
1. Basic DT support: used by dom0less/hyperlaunch.
2. Full DT support: used for device discovery and HW setup.Rename
HAS_DEVICE_TREEtoHAS_DEVICE_TREE_DISCOVERYto describe (2), whileDOM0LESS_BOOTis left to describe (1).Signed-off-by Alejandro Vallejo <[email protected]>
This patch is a plain HAS_DEVICE_TREE -> HAS_DEVICE_TREE_DISCOVERY search and replace. It looks consistent and correct.
I am not sure others will be happy with the name DOM0LESS_BOOT for (1) but if not the part of the commit message mentioning DOM0LESS_BOOT should be changed. Aside from that:
Re: [PATCH v4 10/12] xen: Rename CONFIG_HAS_DEVICE_TREE to CONFIG_HAS_DEVICE_TREE_DISCOVERY
In reply to Alejandro VallejoQuoted 6 lines · Alejandro Vallejo
Moving forward the idea is for there to be:
1. Basic DT support: used by dom0less/hyperlaunch.
2. Full DT support: used for device discovery and HW setup.Rename
HAS_DEVICE_TREEtoHAS_DEVICE_TREE_DISCOVERYto describe (2), whileDOM0LESS_BOOTis left to describe (1).
Considering hyperlaunch this feels wrong to me. Did you consider splitting HAS_DEVICE_TREE into HAS_DEVICE_TREE_PARSE and HAS_DEVICE_TREE_DISCOVERY, as I suggested on the committers call? You weren't there, but Stefano said he was taking notes.
Quoted 12 lines
xen/common/Kconfig +1
-1@@ -14,7 +14,7 @@ config CORE_PARKING config DOM0LESS_BOOT bool "Dom0less boot support" if EXPERT - depends on HAS_DOM0LESS && HAS_DEVICE_TREE && DOMAIN_BUILD_HELPERS + depends on HAS_DOM0LESS && HAS_DEVICE_TREE_DISCOVERY && DOMAIN_BUILD_HELPERS default y help Dom0less boot support enables Xen to create and start domU guests during
xen/common/Kconfig config HAS_ALTERNATIVE · line 90
Quoted 7 lines
xen/common/Kconfig +1
-1@@ -85,7 +85,7 @@ config HAS_ALTERNATIVE config HAS_COMPAT bool -config HAS_DEVICE_TREE +config HAS_DEVICE_TREE_DISCOVERY bool select LIBFDT
This select imo ought to move to HAS_DEVICE_TREE_PARSE, unless I misunderstand what LIBFDT covers.
xen/common/Makefile obj-$(CONFIG_HYPFS_CONFIG) += config_data.o · line 11
Quoted 11 lines
xen/common/Makefile +2
-2@@ -6,9 +6,9 @@ obj-$(CONFIG_HYPFS_CONFIG) += config_data.o obj-$(CONFIG_CORE_PARKING) += core_parking.o obj-y += cpu.o obj-$(CONFIG_DEBUG_TRACE) += debugtrace.o -obj-$(CONFIG_HAS_DEVICE_TREE) += device.o +obj-$(CONFIG_HAS_DEVICE_TREE_DISCOVERY) += device.o obj-$(filter-out $(CONFIG_X86),$(CONFIG_ACPI)) += device.o -obj-$(CONFIG_HAS_DEVICE_TREE) += device-tree/ +obj-$(CONFIG_HAS_DEVICE_TREE_DISCOVERY) += device-tree/
Here I'm less certain - is everything in that subdir truly "discovery" related?
xen/common/sched/Kconfig endmenu · line 73
Quoted 11 lines
xen/common/sched/Kconfig +1
-1@@ -67,7 +67,7 @@ endmenu config BOOT_TIME_CPUPOOLS bool "Create cpupools at boot time" - depends on HAS_DEVICE_TREE + depends on HAS_DEVICE_TREE_DISCOVERY help Creates cpupools during boot time and assigns cpus to them. Cpupools options can be specified in the device tree.
This similarly looks wrong to me. Whether to create CPU pools is purely a Xen-internal software thing, isn't it?
Jan
Re: [PATCH v4 10/12] xen: Rename CONFIG_HAS_DEVICE_TREE to CONFIG_HAS_DEVICE_TREE_DISCOVERY
Quoted 5 lines · Jan Beulich
Quoted 4 lines · Alejandro Vallejo
Moving forward the idea is for there to be:
1. Basic DT support: used by dom0less/hyperlaunch.
2. Full DT support: used for device discovery and HW setup.
Quoted 7 lines
Quoted 2 lines
Rename
HAS_DEVICE_TREEtoHAS_DEVICE_TREE_DISCOVERYto describe (2), whileDOM0LESS_BOOTis left to describe (1).Considering hyperlaunch this feels wrong to me. Did you consider splitting
HAS_DEVICE_TREEintoHAS_DEVICE_TREE_PARSEandHAS_DEVICE_TREE_DISCOVERY, as I suggested on the committers call? You weren't there, but Stefano said he was taking notes.
Oh, ftaod: I wouldn't insist on the _PARSING suffix. Having HAS_DEVICE_TREE and HAS_DEVICE_TREE_DISCOVERY (with the latter selecting the former) would be equally fine with me.
Jan
Re: [PATCH v4 10/12] xen: Rename CONFIG_HAS_DEVICE_TREE to CONFIG_HAS_DEVICE_TREE_DISCOVERY
In reply to Jan BeulichQuoted 5 lines · Jan Beulich
Quoted 4 lines · Alejandro Vallejo
Moving forward the idea is for there to be:
1. Basic DT support: used by dom0less/hyperlaunch.
2. Full DT support: used for device discovery and HW setup.
Quoted 7 lines
Quoted 2 lines
Rename
HAS_DEVICE_TREEtoHAS_DEVICE_TREE_DISCOVERYto describe (2), whileDOM0LESS_BOOTis left to describe (1).Considering hyperlaunch this feels wrong to me. Did you consider splitting
HAS_DEVICE_TREEintoHAS_DEVICE_TREE_PARSEandHAS_DEVICE_TREE_DISCOVERY, as I suggested on the committers call? You weren't there, but Stefano said he was taking notes.
Some might've been lost is transit, I admit. I don't remember hearing about a HAS_DEVICE_TREE_PARSE, but it might've very well been me being spotty when syncing with Stefano.
Having a special HAS_DEVICE_TREE_PARSE doesn't seem very helpful, as every arch would have it set. I'd definitely like for the "enable support to boot several predefined domains from DTB descriptions" to be a single option for both dom0less and hyperlaunch. And be selectable rather than unconditionally selected And ideally move towards a future in which both dom0less and hyperlaunch are one and the same.
I can do an early rename s/HAS_DOM0LESS/HAS_PREDEFINED_DOMAINS and s/ DOM0LESS_BOOT/BOOT_PREDEFINED_DOMAINS/ if that helps. I was waiting to do so until x86 gains the ability to boot off a DTB to avoid having help messages describing things not yet on the tree.
Quoted 16 lines
Quoted 16 lines
xen/common/Kconfig +1
-1@@ -14,7 +14,7 @@ config CORE_PARKING config DOM0LESS_BOOT bool "Dom0less boot support" if EXPERT - depends on HAS_DOM0LESS && HAS_DEVICE_TREE && DOMAIN_BUILD_HELPERS + depends on HAS_DOM0LESS && HAS_DEVICE_TREE_DISCOVERY && DOMAIN_BUILD_HELPERS default y help Dom0less boot support enables Xen to create and start domU guests during@@ -85,7 +85,7 @@ config HAS_ALTERNATIVE config HAS_COMPAT bool
Quoted 7 lines
xen/common/Kconfig config HAS_ALTERNATIVE · line 90
Quoted 4 lines
xen/common/Kconfig +1
-1-config HAS_DEVICE_TREE +config HAS_DEVICE_TREE_DISCOVERY bool select LIBFDTThis select imo ought to move to
HAS_DEVICE_TREE_PARSE, unless I misunderstand what LIBFDT covers.
Doing so would preclude compiling it out on x86 when hyperlaunch is not there. LIBFDT is very much essential on arm/riscv/ppc, but not so on x86.
Quoted 14 lines
xen/common/Makefile obj-$(CONFIG_HYPFS_CONFIG) += config_data.o · line 11
Quoted 12 lines
xen/common/Makefile +2
-2@@ -6,9 +6,9 @@ obj-$(CONFIG_HYPFS_CONFIG) += config_data.o obj-$(CONFIG_CORE_PARKING) += core_parking.o obj-y += cpu.o obj-$(CONFIG_DEBUG_TRACE) += debugtrace.o -obj-$(CONFIG_HAS_DEVICE_TREE) += device.o +obj-$(CONFIG_HAS_DEVICE_TREE_DISCOVERY) += device.o obj-$(filter-out $(CONFIG_X86),$(CONFIG_ACPI)) += device.o -obj-$(CONFIG_HAS_DEVICE_TREE) += device-tree/ +obj-$(CONFIG_HAS_DEVICE_TREE_DISCOVERY) += device-tree/Here I'm less certain - is everything in that subdir truly "discovery" related?
The non-discovery related parts are quite entangled with the discovery ones. In time, I'll want to move an untangled dom0less/hyperlaunch subset onto a separate predef-doms/ folder iff all of it starts using LIBFDT rather than unflattened DTs, but that's a future endavour.
There's also all of bootinfo, which is not discovery related, but is used ATM exclusively by arches doing discovery.
Quoted 16 lines
xen/common/sched/Kconfig endmenu · line 73
Quoted 12 lines
xen/common/sched/Kconfig +1
-1@@ -67,7 +67,7 @@ endmenu config BOOT_TIME_CPUPOOLS bool "Create cpupools at boot time" - depends on HAS_DEVICE_TREE + depends on HAS_DEVICE_TREE_DISCOVERY help Creates cpupools during boot time and assigns cpus to them. Cpupools options can be specified in the device tree.This similarly looks wrong to me. Whether to create CPU pools is purely a Xen-internal software thing, isn't it?
Quoted 1 line
Jan
In principle, it should be HAS_DOM0LESS and likely will be later when I hook it for x86. I was waiting for x86 needing such a change to use the binding. Would you rather have the change done now?
Cheers,
Alejandro
Re: [PATCH v4 10/12] xen: Rename CONFIG_HAS_DEVICE_TREE to CONFIG_HAS_DEVICE_TREE_DISCOVERY
Quoted 14 lines · Alejandro Vallejo
Quoted 5 lines · Jan Beulich
Quoted 4 lines · Alejandro Vallejo
Moving forward the idea is for there to be:
1. Basic DT support: used by dom0less/hyperlaunch.
2. Full DT support: used for device discovery and HW setup.Quoted 7 lines
Quoted 2 lines
Rename
HAS_DEVICE_TREEtoHAS_DEVICE_TREE_DISCOVERYto describe (2), whileDOM0LESS_BOOTis left to describe (1).Considering hyperlaunch this feels wrong to me. Did you consider splitting
HAS_DEVICE_TREEintoHAS_DEVICE_TREE_PARSEandHAS_DEVICE_TREE_DISCOVERY, as I suggested on the committers call? You weren't there, but Stefano said he was taking notes.
Quoted 6 lines
Some might've been lost is transit, I admit. I don't remember hearing about a
HAS_DEVICE_TREE_PARSE, but it might've very well been me being spotty when syncing with Stefano.Having a special
HAS_DEVICE_TREE_PARSEdoesn't seem very helpful, as every arch would have it set.
Hmm, yes, we don't want or need that. But then what's option 1 about? That shouldn't be "described" by DOM0LESS_BOOT.
Quoted 10 lines
I'd definitely like for the "enable support to boot
several predefined domains from DTB descriptions" to be a single option for both dom0less and hyperlaunch. And be selectable rather than unconditionally selected And ideally move towards a future in which both dom0less and hyperlaunch are one and the same.I can do an early rename s/HAS_DOM0LESS/HAS_PREDEFINED_DOMAINS and s/ DOM0LESS_BOOT/BOOT_PREDEFINED_DOMAINS/ if that helps. I was waiting to do so until x86 gains the ability to boot off a DTB to avoid having help messages describing things not yet on the tree.
I have to admit that it's not clear to me if that would help. As you say, on x86 that's not a thing just yet. What I think we need to aim for is to not leave the tree in a state that's more confusing than anything else. Even if later (which may be much later) things would get tidied again.
Quoted 23 lines
Quoted 15 lines
Quoted 15 lines
xen/common/Kconfig +1
-1@@ -14,7 +14,7 @@ config CORE_PARKING config DOM0LESS_BOOT bool "Dom0less boot support" if EXPERT - depends on HAS_DOM0LESS && HAS_DEVICE_TREE && DOMAIN_BUILD_HELPERS + depends on HAS_DOM0LESS && HAS_DEVICE_TREE_DISCOVERY && DOMAIN_BUILD_HELPERS default y help Dom0less boot support enables Xen to create and start domU guests during@@ -85,7 +85,7 @@ config HAS_ALTERNATIVE config HAS_COMPAT boolQuoted 7 lines
xen/common/Kconfig config HAS_ALTERNATIVE · line 90
Quoted 4 lines
xen/common/Kconfig +1
-1-config HAS_DEVICE_TREE +config HAS_DEVICE_TREE_DISCOVERY bool select LIBFDTThis select imo ought to move to
HAS_DEVICE_TREE_PARSE, unless I misunderstand what LIBFDT covers.
Quoted 2 lines
Doing so would preclude compiling it out on x86 when hyperlaunch is not there. LIBFDT is very much essential on arm/riscv/ppc, but not so on x86.
Okay, but _something_ has to select that on x86 as well, once hyperlaunch is going to need it.
Quoted 15 lines
Quoted 4 lines
Quoted 4 lines
xen/common/sched/Kconfig +0
-0@@ -67,7 +67,7 @@ endmenuQuoted 10 lines
xen/common/sched/Kconfig endmenu · line 73
Quoted 7 lines
xen/common/sched/Kconfig +1
-1config BOOT_TIME_CPUPOOLS bool "Create cpupools at boot time" - depends on HAS_DEVICE_TREE + depends on HAS_DEVICE_TREE_DISCOVERY help Creates cpupools during boot time and assigns cpus to them. Cpupools options can be specified in the device tree.This similarly looks wrong to me. Whether to create CPU pools is purely a Xen-internal software thing, isn't it?
Quoted 3 lines
In principle, it should be
HAS_DOM0LESSand likely will be later when I hook it for x86. I was waiting for x86 needing such a change to use the binding. Would you rather have the change done now?
See above - my main concern isn't with what is introduced early or later, but what the overall (intermediate and final) state of the tree is going to be.
Jan
Re: [PATCH v4 10/12] xen: Rename CONFIG_HAS_DEVICE_TREE to CONFIG_HAS_DEVICE_TREE_DISCOVERY
Quoted 19 lines · Jan Beulich
Quoted 18 lines · Alejandro Vallejo
Quoted 5 lines · Jan Beulich
Quoted 4 lines · Alejandro Vallejo
Moving forward the idea is for there to be:
1. Basic DT support: used by dom0less/hyperlaunch.
2. Full DT support: used for device discovery and HW setup.Quoted 7 lines
Quoted 2 lines
Rename
HAS_DEVICE_TREEtoHAS_DEVICE_TREE_DISCOVERYto describe (2), whileDOM0LESS_BOOTis left to describe (1).Considering hyperlaunch this feels wrong to me. Did you consider splitting
HAS_DEVICE_TREEintoHAS_DEVICE_TREE_PARSEandHAS_DEVICE_TREE_DISCOVERY, as I suggested on the committers call? You weren't there, but Stefano said he was taking notes.Some might've been lost is transit, I admit. I don't remember hearing about a
HAS_DEVICE_TREE_PARSE, but it might've very well been me being spotty when syncing with Stefano.
Quoted 5 lines
Quoted 2 lines
Having a special
HAS_DEVICE_TREE_PARSEdoesn't seem very helpful, as every arch would have it set.Hmm, yes, we don't want or need that. But then what's option 1 about? That shouldn't be "described" by
DOM0LESS_BOOT.
It's about x86 using device_tree/ for hyperlaunch. x86 is the single user that doesn't need (2) at all. In the x86 case the same selector that picks
Quoted 12 lines
Quoted 11 lines
I'd definitely like for the "enable support to boot
several predefined domains from DTB descriptions" to be a single option for both dom0less and hyperlaunch. And be selectable rather than unconditionally selected And ideally move towards a future in which both dom0less and hyperlaunch are one and the same.I can do an early rename s/HAS_DOM0LESS/HAS_PREDEFINED_DOMAINS and s/ DOM0LESS_BOOT/BOOT_PREDEFINED_DOMAINS/ if that helps. I was waiting to do so until x86 gains the ability to boot off a DTB to avoid having help messages describing things not yet on the tree.
Quoted 4 lines
I have to admit that it's not clear to me if that would help. As you say, on x86 that's not a thing just yet. What I think we need to aim for is to not leave the tree in a state that's more confusing than anything else. Even if later (which may be much later) things would get tidied again.
Ok, how about turning it on its head? Seems like we're in agreement with HAS_DEVICE_TREE_DISCOVERY for Full DT support. There could be a DEVICE_TREE_PARSE (no HAS_) that's selected by HAS_DEVICE_TREE_DISCOVERY and DOM0LESS_BOOT. This allows x86 to deselect it by not picking DOM0LESS_BOOT.
Note that x86 cannot select DOM0LESS_BOOT yet, but that's how it'd compile-in hyperlaunch. In the meantime, the tree depends on DEVICE_TREE_PARSE instead and device_tree/ is gated by DEVICE_TREE_PARSE only.
Sounds better?
Quoted 24 lines
Quoted 24 lines
Quoted 23 lines
Quoted 13 lines
xen/common/Kconfig +1
-1@@ -14,7 +14,7 @@ config CORE_PARKING config DOM0LESS_BOOT bool "Dom0less boot support" if EXPERT - depends on HAS_DOM0LESS && HAS_DEVICE_TREE && DOMAIN_BUILD_HELPERS + depends on HAS_DOM0LESS && HAS_DEVICE_TREE_DISCOVERY && DOMAIN_BUILD_HELPERS default y help Dom0less boot support enables Xen to create and start domU guests duringxen/common/Kconfig config HAS_ALTERNATIVE · line 90
Quoted 7 lines
xen/common/Kconfig +1
-1@@ -85,7 +85,7 @@ config HAS_ALTERNATIVE config HAS_COMPAT bool -config HAS_DEVICE_TREE +config HAS_DEVICE_TREE_DISCOVERY bool select LIBFDTThis select imo ought to move to
HAS_DEVICE_TREE_PARSE, unless I misunderstand what LIBFDT covers.
Quoted 5 lines
Quoted 2 lines
Doing so would preclude compiling it out on x86 when hyperlaunch is not there. LIBFDT is very much essential on arm/riscv/ppc, but not so on x86.
Okay, but _something_ has to select that on x86 as well, once hyperlaunch is going to need it.
DOM0LESS_BOOT would do so once required. In the proposal above that'd be selected by DEVICE_TREE_PARSE, which would be selected by DOM0LESS_BOOT.
Quoted 16 lines
Quoted 16 lines
Quoted 15 lines
xen/common/sched/Kconfig endmenu · line 73
Quoted 12 lines
xen/common/sched/Kconfig +1
-1@@ -67,7 +67,7 @@ endmenu config BOOT_TIME_CPUPOOLS bool "Create cpupools at boot time" - depends on HAS_DEVICE_TREE + depends on HAS_DEVICE_TREE_DISCOVERY help Creates cpupools during boot time and assigns cpus to them. Cpupools options can be specified in the device tree.This similarly looks wrong to me. Whether to create CPU pools is purely a Xen-internal software thing, isn't it?
Quoted 8 lines
Quoted 3 lines
In principle, it should be
HAS_DOM0LESSand likely will be later when I hook it for x86. I was waiting for x86 needing such a change to use the binding. Would you rather have the change done now?See above - my main concern isn't with what is introduced early or later, but what the overall (intermediate and final) state of the tree is going to be.
Jan
I think this latest proposal addresses the concern. Let me know what you think.
Cheers,
Alejandro
Re: [PATCH v4 10/12] xen: Rename CONFIG_HAS_DEVICE_TREE to CONFIG_HAS_DEVICE_TREE_DISCOVERY
Quoted 51 lines · Alejandro Vallejo
Quoted 19 lines · Jan Beulich
Quoted 18 lines · Alejandro Vallejo
Quoted 5 lines · Jan Beulich
Quoted 4 lines · Alejandro Vallejo
Moving forward the idea is for there to be:
1. Basic DT support: used by dom0less/hyperlaunch.
2. Full DT support: used for device discovery and HW setup.Quoted 7 lines
Quoted 2 lines
Rename
HAS_DEVICE_TREEtoHAS_DEVICE_TREE_DISCOVERYto describe (2), whileDOM0LESS_BOOTis left to describe (1).Considering hyperlaunch this feels wrong to me. Did you consider splitting
HAS_DEVICE_TREEintoHAS_DEVICE_TREE_PARSEandHAS_DEVICE_TREE_DISCOVERY, as I suggested on the committers call? You weren't there, but Stefano said he was taking notes.Some might've been lost is transit, I admit. I don't remember hearing about a
HAS_DEVICE_TREE_PARSE, but it might've very well been me being spotty when syncing with Stefano.Quoted 5 lines
Quoted 2 lines
Having a special
HAS_DEVICE_TREE_PARSEdoesn't seem very helpful, as every arch would have it set.Hmm, yes, we don't want or need that. But then what's option 1 about? That shouldn't be "described" by
DOM0LESS_BOOT.It's about x86 using device_tree/ for hyperlaunch. x86 is the single user that doesn't need (2) at all. In the x86 case the same selector that picks
Quoted 12 lines
Quoted 11 lines
I'd definitely like for the "enable support to boot
several predefined domains from DTB descriptions" to be a single option for both dom0less and hyperlaunch. And be selectable rather than unconditionally selected And ideally move towards a future in which both dom0less and hyperlaunch are one and the same.I can do an early rename s/HAS_DOM0LESS/HAS_PREDEFINED_DOMAINS and s/ DOM0LESS_BOOT/BOOT_PREDEFINED_DOMAINS/ if that helps. I was waiting to do so until x86 gains the ability to boot off a DTB to avoid having help messages describing things not yet on the tree.
Quoted 4 lines
I have to admit that it's not clear to me if that would help. As you say, on x86 that's not a thing just yet. What I think we need to aim for is to not leave the tree in a state that's more confusing than anything else. Even if later (which may be much later) things would get tidied again.
Ok, how about turning it on its head? Seems like we're in agreement with
HAS_DEVICE_TREE_DISCOVERYfor Full DT support. There could be aDEVICE_TREE_PARSE(noHAS_) that's selected byHAS_DEVICE_TREE_DISCOVERYandDOM0LESS_BOOT. This allows x86 to deselect it by not pickingDOM0LESS_BOOT.
Quoted 5 lines
Note that x86 cannot select
DOM0LESS_BOOTyet, but that's how it'd compile-in hyperlaunch. In the meantime, the tree depends onDEVICE_TREE_PARSEinstead and device_tree/ is gated byDEVICE_TREE_PARSEonly.Sounds better?
Yes. Except that in the last sentence of the previous paragraph: What's "the tree"? And in device_tree/ wouldn't we end up with unreachable code on x86 this way (the parts that are needed only by DEVICE_TREE_DISCOVERY)?
Jan
Re: [PATCH v4 10/12] xen: Rename CONFIG_HAS_DEVICE_TREE to CONFIG_HAS_DEVICE_TREE_DISCOVERY
Quoted 52 lines · Jan Beulich
Quoted 51 lines · Alejandro Vallejo
Quoted 19 lines · Jan Beulich
Quoted 18 lines · Alejandro Vallejo
Quoted 5 lines · Jan Beulich
Quoted 4 lines · Alejandro Vallejo
Moving forward the idea is for there to be:
1. Basic DT support: used by dom0less/hyperlaunch.
2. Full DT support: used for device discovery and HW setup.Quoted 7 lines
Quoted 2 lines
Rename
HAS_DEVICE_TREEtoHAS_DEVICE_TREE_DISCOVERYto describe (2), whileDOM0LESS_BOOTis left to describe (1).Considering hyperlaunch this feels wrong to me. Did you consider splitting
HAS_DEVICE_TREEintoHAS_DEVICE_TREE_PARSEandHAS_DEVICE_TREE_DISCOVERY, as I suggested on the committers call? You weren't there, but Stefano said he was taking notes.Some might've been lost is transit, I admit. I don't remember hearing about a
HAS_DEVICE_TREE_PARSE, but it might've very well been me being spotty when syncing with Stefano.Quoted 5 lines
Quoted 2 lines
Having a special
HAS_DEVICE_TREE_PARSEdoesn't seem very helpful, as every arch would have it set.Hmm, yes, we don't want or need that. But then what's option 1 about? That shouldn't be "described" by
DOM0LESS_BOOT.It's about x86 using device_tree/ for hyperlaunch. x86 is the single user that doesn't need (2) at all. In the x86 case the same selector that picks
Quoted 12 lines
Quoted 11 lines
I'd definitely like for the "enable support to boot
several predefined domains from DTB descriptions" to be a single option for both dom0less and hyperlaunch. And be selectable rather than unconditionally selected And ideally move towards a future in which both dom0less and hyperlaunch are one and the same.I can do an early rename s/HAS_DOM0LESS/HAS_PREDEFINED_DOMAINS and s/ DOM0LESS_BOOT/BOOT_PREDEFINED_DOMAINS/ if that helps. I was waiting to do so until x86 gains the ability to boot off a DTB to avoid having help messages describing things not yet on the tree.
Quoted 4 lines
I have to admit that it's not clear to me if that would help. As you say, on x86 that's not a thing just yet. What I think we need to aim for is to not leave the tree in a state that's more confusing than anything else. Even if later (which may be much later) things would get tidied again.
Ok, how about turning it on its head? Seems like we're in agreement with
HAS_DEVICE_TREE_DISCOVERYfor Full DT support. There could be aDEVICE_TREE_PARSE(noHAS_) that's selected byHAS_DEVICE_TREE_DISCOVERYandDOM0LESS_BOOT. This allows x86 to deselect it by not pickingDOM0LESS_BOOT.
Quoted 8 lines
Quoted 5 lines
Note that x86 cannot select
DOM0LESS_BOOTyet, but that's how it'd compile-in hyperlaunch. In the meantime, the tree depends onDEVICE_TREE_PARSEinstead and device_tree/ is gated byDEVICE_TREE_PARSEonly.Sounds better?
Yes. Except that in the last sentence of the previous paragraph: What's "the tree"?
By "the tree", I meant the hypervisor tree. I just mean that Kconfig would use DEVICEC_TREE_PARSE for selection purposes and the code would ifdef based on DEVICE_TREE_PARSE rather than DOM0LESS_BOOT rather than using the latter as a proxy.
Quoted 2 lines
And in device_tree/ wouldn't we end up with unreachable code on x86 this way (the parts that are needed only by
HAS_DEVICE_TREE_DISCOVERY)?
They'd be compiled-out, just as they are now gated on HAS_DEVICE_TREE_DISCOVERY on this patch. device-tree/ as a whole would be gated by DEVICE_TREE_PARSE, and each individual file inside might optionally be gated by stronger options.
Cheers,
Alejandro
PATCH v4 11/12 xen/dt: ifdef out DEV_DT-related bits from device_tree.{c,h}
In reply to Alejandro Vallejodevice-tree.c stops requiring CONFIG_HAS_DEVICE_TREE_DISCOVERY and may function with DOM0LESS_BOOT.
Without this, there's a clash with x86's definition of device_t. Because x86 doesn't discover devices in the DT it can simply skip the code to do so during the unflattening phase.
Not a functional change on architectures that currently use these files, as they already select CONFIG_HAS_DEVICE_TREE_DISCOVERY.
--- xen/common/device-tree/device-tree.c | 2 ++ xen/include/xen/device_tree.h | 4 ++++ 2 files changed, 6 insertions(+)
xen/common/device-tree/device-tree.c +2 -0
@@ -2029,9 +2029,11 @@ static unsigned long unflatten_dt_node(const void *fdt, ((char *)pp->value)[sz -1 ] =0 ;dt_dprintk ("fixed up name for %s -> %s\n" , pathp, (char *)pp->value); +#ifdef CONFIG_HAS_DEVICE_TREE_DISCOVERY /* Generic device initialization */ np->dev.type =DEV_DT ; np->dev.of_node = np; +#endif /* CONFIG_HAS_DEVICE_TREE_DISCOVERY */ } }if ( allnextpp )
xen/include/xen/device_tree.h +4 -0
@@ -108,9 +108,12 @@ struct dt_device_node {*/ struct list_head domain_list; +#ifdef CONFIG_HAS_DEVICE_TREE_DISCOVERY struct device dev; +#endif /* CONFIG_HAS_DEVICE_TREE_DISCOVERY */ }; +#ifdef CONFIG_HAS_DEVICE_TREE_DISCOVERY #define dt_to_dev (dt_node) (&(dt_node)->dev)static inline struct dt_device_node *dev_to_dt (struct device *dev)
@@ -119,6 +122,7 @@ static inline struct dt_device_node *dev_to_dt(struct device *dev) return container_of(dev, struct dt_device_node, dev); } +#endif /* CONFIG_HAS_DEVICE_TREE_DISCOVERY */ #define MAX_PHANDLE_ARGS 16struct dt_phandle_args {
Signature · 1 line
2.43.0
Re: [PATCH v4 11/12] xen/dt: ifdef out DEV_DT-related bits from device_tree.{c,h}
Quoted 11 lines · Alejandro Vallejo
device-tree.cstops requiringCONFIG_HAS_DEVICE_TREE_DISCOVERYand may function withDOM0LESS_BOOT.Without this, there's a clash with x86's definition of
device_t. Because x86 doesn't discover devices in the DT it can simply skip the code to do so during the unflattening phase.Not a functional change on architectures that currently use these files, as they already select
CONFIG_HAS_DEVICE_TREE_DISCOVERY.Signed-off-by Alejandro Vallejo <[email protected]>
Same comment about renaming DOM0LESS_BOOT from this commit message if there is a decision to rename that option. Other than that:
Re: [PATCH v4 11/12] xen/dt: ifdef out DEV_DT-related bits from device_tree.{c,h}
In reply to Alejandro VallejoQuoted 21 lines · Alejandro Vallejo
device-tree.cstops requiringCONFIG_HAS_DEVICE_TREE_DISCOVERYand may function withDOM0LESS_BOOT.Without this, there's a clash with x86's definition of
device_t. Because x86 doesn't discover devices in the DT it can simply skip the code to do so during the unflattening phase.Not a functional change on architectures that currently use these files, as they already select
CONFIG_HAS_DEVICE_TREE_DISCOVERY.Signed-off-by Alejandro Vallejo <[email protected]>--- xen/common/device-tree/device-tree.c | 2 ++ xen/include/xen/device_tree.h | 4 ++++ 2 files changed, 6 insertions(+)xen/common/device-tree/device-tree.c +0
-0
xen/common/device-tree/device-tree.c static unsigned long unflatten_dt_node(const void *fdt, · line 2038
Quoted 10 lines
xen/common/device-tree/device-tree.c +2
-0@@ -2029,9 +2029,11 @@ static unsigned long unflatten_dt_node(const void *fdt, ((char *)pp->value)[sz -1 ] =0 ;dt_dprintk ("fixed up name for %s -> %s\n" , pathp, (char *)pp->value); +#ifdef CONFIG_HAS_DEVICE_TREE_DISCOVERY /* Generic device initialization */ np->dev.type =DEV_DT ; np->dev.of_node = np; +#endif /* CONFIG_HAS_DEVICE_TREE_DISCOVERY */ } }
Without something said to that effect in the description, this contradicts
obj-$(CONFIG_HAS_DEVICE_TREE_DISCOVERY) += device-tree/
that the previous patch put in place, and that only the subsequent patch will further change.
Jan
Re: [PATCH v4 11/12] xen/dt: ifdef out DEV_DT-related bits from device_tree.{c,h}
Quoted 35 lines · Jan Beulich
Quoted 21 lines · Alejandro Vallejo
device-tree.cstops requiringCONFIG_HAS_DEVICE_TREE_DISCOVERYand may function withDOM0LESS_BOOT.Without this, there's a clash with x86's definition of
device_t. Because x86 doesn't discover devices in the DT it can simply skip the code to do so during the unflattening phase.Not a functional change on architectures that currently use these files, as they already select
CONFIG_HAS_DEVICE_TREE_DISCOVERY.Signed-off-by Alejandro Vallejo <[email protected]>--- xen/common/device-tree/device-tree.c | 2 ++ xen/include/xen/device_tree.h | 4 ++++ 2 files changed, 6 insertions(+)xen/common/device-tree/device-tree.c +0
-0xen/common/device-tree/device-tree.c static unsigned long unflatten_dt_node(const void *fdt, · line 2038
Quoted 10 lines
xen/common/device-tree/device-tree.c +2
-0@@ -2029,9 +2029,11 @@ static unsigned long unflatten_dt_node(const void *fdt, ((char *)pp->value)[sz -1 ] =0 ;dt_dprintk ("fixed up name for %s -> %s\n" , pathp, (char *)pp->value); +#ifdef CONFIG_HAS_DEVICE_TREE_DISCOVERY /* Generic device initialization */ np->dev.type =DEV_DT ; np->dev.of_node = np; +#endif /* CONFIG_HAS_DEVICE_TREE_DISCOVERY */ } }Without something said to that effect in the description, this contradicts
Quoted 6 lines
obj-$(CONFIG_HAS_DEVICE_TREE_DISCOVERY) += device-tree/
that the previous patch put in place, and that only the subsequent patch will further change.
Jan
Would replacing the last paragraph of the commit message with...
Not a functional change because the whole file is gated by CONFIG_HAS_DEVICE_TREE_DISCOVERY already. A later patch allows the file to be usable without it, for which this ifdefs are a prerequisite.
... help?
Cheers,
Alejandro
Re: [PATCH v4 11/12] xen/dt: ifdef out DEV_DT-related bits from device_tree.{c,h}
Quoted 43 lines · Alejandro Vallejo
Quoted 35 lines · Jan Beulich
Quoted 21 lines · Alejandro Vallejo
device-tree.cstops requiringCONFIG_HAS_DEVICE_TREE_DISCOVERYand may function withDOM0LESS_BOOT.Without this, there's a clash with x86's definition of
device_t. Because x86 doesn't discover devices in the DT it can simply skip the code to do so during the unflattening phase.Not a functional change on architectures that currently use these files, as they already select
CONFIG_HAS_DEVICE_TREE_DISCOVERY.Signed-off-by Alejandro Vallejo <[email protected]>--- xen/common/device-tree/device-tree.c | 2 ++ xen/include/xen/device_tree.h | 4 ++++ 2 files changed, 6 insertions(+)xen/common/device-tree/device-tree.c +0
-0xen/common/device-tree/device-tree.c static unsigned long unflatten_dt_node(const void *fdt, · line 2038
Quoted 10 lines
xen/common/device-tree/device-tree.c +2
-0@@ -2029,9 +2029,11 @@ static unsigned long unflatten_dt_node(const void *fdt, ((char *)pp->value)[sz -1 ] =0 ;dt_dprintk ("fixed up name for %s -> %s\n" , pathp, (char *)pp->value); +#ifdef CONFIG_HAS_DEVICE_TREE_DISCOVERY /* Generic device initialization */ np->dev.type =DEV_DT ; np->dev.of_node = np; +#endif /* CONFIG_HAS_DEVICE_TREE_DISCOVERY */ } }Without something said to that effect in the description, this contradicts
Quoted 6 lines
obj-$(CONFIG_HAS_DEVICE_TREE_DISCOVERY) += device-tree/
that the previous patch put in place, and that only the subsequent patch will further change.
Jan
Quoted 7 lines
Would replacing the last paragraph of the commit message with...
Not a functional change because the whole file is gated by
CONFIG_HAS_DEVICE_TREE_DISCOVERYalready. A later patch allows the file to be usable without it, for which this ifdefs are a prerequisite.... help?
Yes, afaic.
Jan
PATCH v4 12/12 xen/dt: Remove DOM0LESS_BOOT's requirement on HAS_DEVICE_TREE_DISCOVERY
In reply to Alejandro VallejoThis effectively means that DOM0LESS_BOOT on platforms without HAS_DEVICE_TREE_DISCOVERY (i.e: x86) acts as a selector for a stripped-down version of DT code.
--- xen/Kconfig.debug | 2 +- xen/common/Kconfig | 3 ++- xen/common/Makefile | 1 + xen/common/device-tree/Makefile | 8 ++++---- 4 files changed, 8 insertions(+), 6 deletions(-)
xen/Kconfig.debug +1 -1
@@ -92,7 +92,7 @@ config VERBOSE_DEBUG config DEVICE_TREE_DEBUG bool "Device tree debug messages" - depends on HAS_DEVICE_TREE_DISCOVERY + depends on DOM0LESS_BOOT || HAS_DEVICE_TREE_DISCOVERY help Device tree parsing and DOM0 device tree building messages are logged in the Xen ring buffer.
xen/common/Kconfig +2 -1
@@ -14,7 +14,8 @@ config CORE_PARKING config DOM0LESS_BOOT bool "Dom0less boot support" if EXPERT - depends on HAS_DOM0LESS && HAS_DEVICE_TREE_DISCOVERY && DOMAIN_BUILD_HELPERS + select LIBFDT + depends on HAS_DOM0LESS && DOMAIN_BUILD_HELPERS default y help Dom0less boot support enables Xen to create and start domU guests during
xen/common/Makefile +1 -0
@@ -9,6 +9,7 @@ obj-$(CONFIG_DEBUG_TRACE) += debugtrace.o obj-$(CONFIG_HAS_DEVICE_TREE_DISCOVERY) += device.o obj-$(filter-out $(CONFIG_X86),$(CONFIG_ACPI)) += device.o obj-$(CONFIG_HAS_DEVICE_TREE_DISCOVERY) += device-tree/ +obj-$(CONFIG_DOM0LESS_BOOT) += device-tree/ obj-$(CONFIG_IOREQ_SERVER) += dm.o obj-y += domain.o obj-y += event_2l.o
xen/common/device-tree/Makefile +4 -4
@@ -1,11 +1,11 @@ obj-y += bootfdt.init.o -obj-y += bootinfo-fdt.init.o -obj-y += bootinfo.init.o -obj-y += device-tree.o +obj-$(CONFIG_HAS_DEVICE_TREE_DISCOVERY) += bootinfo-fdt.init.o +obj-$(CONFIG_HAS_DEVICE_TREE_DISCOVERY) += bootinfo.init.o +obj-$(CONFIG_HAS_DEVICE_TREE_DISCOVERY) += device-tree.o obj-$(CONFIG_DOMAIN_BUILD_HELPERS) += domain-build.init.o obj-$(CONFIG_DOM0LESS_BOOT) += dom0less-build.init.o obj-$(CONFIG_OVERLAY_DTB) += dt-overlay.o -obj-y += intc.o +obj-$(CONFIG_HAS_DEVICE_TREE_DISCOVERY) += intc.o obj-$(CONFIG_DOMAIN_BUILD_HELPERS) += kernel.o obj-$(CONFIG_STATIC_EVTCHN) += static-evtchn.init.o obj-$(CONFIG_STATIC_MEMORY) += static-memory.init.o
Signature · 1 line
2.43.0
Re: [PATCH v4 12/12] xen/dt: Remove DOM0LESS_BOOT's requirement on HAS_DEVICE_TREE_DISCOVERY
Quoted 5 lines · Alejandro Vallejo
This effectively means that
DOM0LESS_BOOTon platforms withoutHAS_DEVICE_TREE_DISCOVERY(i.e: x86) acts as a selector for a stripped-down version of DT code.Signed-off-by Alejandro Vallejo <[email protected]>
This is so much better than before. Thank you and all the reviewers for making the integration so much smoother. This patch is so much simpler and readable compared to before.
I think we need to plan for renaming DOM0LESS_BOOT into something better, such as PREDEFINED_DOMS, but I would keep it as a separate patch in any case. So I think this is OK for now.
Quoted 39 lines
--- xen/Kconfig.debug | 2 +- xen/common/Kconfig | 3 ++- xen/common/Makefile | 1 + xen/common/device-tree/Makefile | 8 ++++---- 4 files changed, 8 insertions(+), 6 deletions(-)xen/Kconfig.debug +1
-1@@ -92,7 +92,7 @@ config VERBOSE_DEBUG config DEVICE_TREE_DEBUG bool "Device tree debug messages" - depends on HAS_DEVICE_TREE_DISCOVERY + depends on DOM0LESS_BOOT || HAS_DEVICE_TREE_DISCOVERY help Device tree parsing and DOM0 device tree building messages are logged in the Xen ring buffer.xen/common/Kconfig +2
-1@@ -14,7 +14,8 @@ config CORE_PARKING config DOM0LESS_BOOT bool "Dom0less boot support" if EXPERT - depends on HAS_DOM0LESS && HAS_DEVICE_TREE_DISCOVERY && DOMAIN_BUILD_HELPERS + select LIBFDT + depends on HAS_DOM0LESS && DOMAIN_BUILD_HELPERS default y help Dom0less boot support enables Xen to create and start domU guests duringxen/common/Makefile +0
-0
xen/common/Makefile obj-$(CONFIG_DEBUG_TRACE) += debugtrace.o · line 12
Quoted 4 lines
xen/common/Makefile +1
-0@@ -9,6 +9,7 @@ obj-$(CONFIG_DEBUG_TRACE) += debugtrace.o obj-$(CONFIG_HAS_DEVICE_TREE_DISCOVERY) += device.o obj-$(filter-out $(CONFIG_X86),$(CONFIG_ACPI)) += device.o obj-$(CONFIG_HAS_DEVICE_TREE_DISCOVERY) += device-tree/ +obj-$(CONFIG_DOM0LESS_BOOT) += device-tree/
nice trick
Quoted 26 lines
xen/common/Makefile +0
-0obj-$(CONFIG_IOREQ_SERVER) += dm.o obj-y += domain.o obj-y += event_2l.oxen/common/device-tree/Makefile +4
-4@@ -1,11 +1,11 @@ obj-y += bootfdt.init.o -obj-y += bootinfo-fdt.init.o -obj-y += bootinfo.init.o -obj-y += device-tree.o +obj-$(CONFIG_HAS_DEVICE_TREE_DISCOVERY) += bootinfo-fdt.init.o +obj-$(CONFIG_HAS_DEVICE_TREE_DISCOVERY) += bootinfo.init.o +obj-$(CONFIG_HAS_DEVICE_TREE_DISCOVERY) += device-tree.o obj-$(CONFIG_DOMAIN_BUILD_HELPERS) += domain-build.init.o obj-$(CONFIG_DOM0LESS_BOOT) += dom0less-build.init.o obj-$(CONFIG_OVERLAY_DTB) += dt-overlay.o -obj-y += intc.o +obj-$(CONFIG_HAS_DEVICE_TREE_DISCOVERY) += intc.o obj-$(CONFIG_DOMAIN_BUILD_HELPERS) += kernel.o obj-$(CONFIG_STATIC_EVTCHN) += static-evtchn.init.o obj-$(CONFIG_STATIC_MEMORY) += static-memory.init.oSignature · 1 line
2.43.0