[PATCH v6 07/23] xen/riscv: implement make_cpus_node()
Oleksii Kurochko <[email protected]>
| Newsgroups | org.xenproject.lists.xen-devel |
|---|---|
| Message-ID | <4d7eba7501a43727cdc30efcff56f422c1bc376d.1784559209.git.oleksii.kurochko@gmail.com> |
Implement make_cpus_node() to create cpus node for a guest domain. This function is going to be use by common dom0less code during construction domain. Signed-off-by: Oleksii Kurochko <[email protected]> Acked-by: Jan Beulich <[email protected]> --- Changes in v6: - Update the two build_guest_isa_str() call sites for its new `const struct domain *d` signature. - Drop build/tools/fixdep from the patch. - Add Acked-by: Jan Beulich <[email protected]>. --- Changes in v5: - Drop Acked-by: Jan Beulich <[email protected]> as extra changes were done because of the changed in prev. patch. - Move isa_str allocation and construction out of arch_domain_create() and into make_cpus_node() as a local variable, since the string is only needed during FDT generation. Use a two-call build_guest_isa_str() pattern (size probe, then fill) with xvmalloc_array, and convert all post-allocation error returns to goto out so xvfree() runs on every path. --- Changes in v4: - Update the comment in make_cpus_node() to match code style. - Add Acked-by: Jan Beulich <[email protected]>. --- Changes in v3: - Add blank line above make_cpus_node() function definition. - Move 'unsigned int cpu' from function-level declarations into the for loop. - Drop 'uint32_t reg = cpu_to_fdt32(cpu)'; use fdt_property_cell(fdt, "reg", cpu) instead of fdt_property(fdt, "reg", ®, sizeof(reg)) so byte-order adjustment is handled internally. - Add matching /* interrupt-controller */ start comment; fix end comment to /* end interrupt-controller */. - Update d->arch.guest_isa_str to ->isa_str in make_cpus_node() function. --- Changes in v2: - s/u32/uint32_t for timebase_frequency local variable. - Drop +1 from BUILD_BUG_ON(). - return fdt_end_node(fdt); instead of res at the end of the function. --- --- xen/arch/riscv/domain-build.c | 125 ++++++++++++++++++++++++++++++++++ 1 file changed, 125 insertions(+) diff --git a/xen/arch/riscv/domain-build.c b/xen/arch/riscv/domain-build.c index 5f6f4b6248a5..8be29d9331d2 100644 --- a/xen/arch/riscv/domain-build.c +++ b/xen/arch/riscv/domain-build.c @@ -3,8 +3,11 @@ #include <xen/fdt-domain-build.h> #include <xen/fdt-kernel.h> #include <xen/init.h> +#include <xen/libfdt/libfdt.h> #include <xen/sched.h> +#include <xen/xvmalloc.h> +#include <asm/cpufeature.h> #include <asm/current.h> #include <asm/guest_access.h> @@ -48,3 +51,125 @@ int __init construct_domain(struct domain *d, struct kernel_info *kinfo) return 0; } + +int __init make_cpus_node(const struct domain *d, struct kernel_info *kinfo) +{ + int res; + const struct dt_device_node *cpus = dt_find_node_by_path("/cpus"); + uint32_t timebase_frequency; + bool frequency_valid; + void *fdt = kinfo->fdt; + char *isa_str; + int len; + + dt_dprintk("Create cpus node\n"); + + if ( !cpus ) + { + dprintk(XENLOG_ERR, "Missing /cpus node in the device tree?\n"); + return -ENOENT; + } + + frequency_valid = dt_property_read_u32(cpus, "timebase-frequency", + &timebase_frequency); + + if ( (len = build_guest_isa_str(NULL, 0, d)) < 0 ) + return len; + + if ( !(isa_str = xvmalloc_array(char, len + 1)) ) + return -ENOMEM; + + if ( build_guest_isa_str(isa_str, len + 1, d) != len ) + { + res = -EINVAL; + goto out; + } + + res = fdt_begin_node(fdt, "cpus"); + if ( res ) + goto out; + + res = fdt_property_cell(fdt, "#address-cells", 1); + if ( res ) + goto out; + + res = fdt_property_cell(fdt, "#size-cells", 0); + if ( res ) + goto out; + + if ( frequency_valid ) + res = fdt_property_cell(fdt, "timebase-frequency", timebase_frequency); + + for ( unsigned int cpu = 0; cpu < d->max_vcpus; cpu++ ) + { + char buf[64]; + + snprintf(buf, sizeof(buf), "cpu@%u", cpu); + res = fdt_begin_node(fdt, buf); + if ( res ) + goto out; + + res = fdt_property_cell(fdt, "reg", cpu); + if ( res ) + goto out; + + res = fdt_property_string(fdt, "status", "okay"); + if ( res ) + goto out; + + res = fdt_property_string(fdt, "compatible", "riscv"); + if ( res ) + goto out; + + BUILD_BUG_ON((sizeof("riscv,") + + sizeof_field(struct gstage_mode_desc, name)) >= sizeof(buf)); + snprintf(buf, sizeof(buf), "riscv,%s", max_gstage_mode->name); + res = fdt_property_string(fdt, "mmu-type", buf); + if ( res ) + goto out; + + res = fdt_property_string(fdt, "riscv,isa", isa_str); + if ( res ) + goto out; + + res = fdt_property_string(fdt, "device_type", "cpu"); + if ( res ) + goto out; + + /* Start of interrupt-controller */ + res = fdt_begin_node(fdt, "interrupt-controller"); + if ( res ) + goto out; + + res = fdt_property_string(fdt, "compatible", "riscv,cpu-intc"); + if ( res ) + goto out; + + res = fdt_property_cell(fdt, "#interrupt-cells", 1); + if ( res ) + goto out; + + res = fdt_property(fdt, "interrupt-controller", NULL, 0); + if ( res ) + goto out; + + res = fdt_property_u32(fdt, "phandle", alloc_phandle(kinfo)); + if ( res ) + goto out; + + /* End of interrupt-controller */ + res = fdt_end_node(fdt); + if ( res ) + goto out; + + res = fdt_end_node(fdt); + if ( res ) + goto out; + } + + res = fdt_end_node(fdt); + + out: + xvfree(isa_str); + return res; +} -- 2.54.0