|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] Re: [PATCH v2] xen/arm: Preserve host GIC #interrupt-cells for Dom0
On 17-Nov-26 08:39, Kuan-Wei Chiu wrote:
> Xen copies device interrupt properties from the host device tree to
> Dom0, but hardcodes #interrupt-cells to 3 in make_gic_node() and
> fdt_property_interrupts(). On GICv3 platforms where the host uses 4
> cells, Dom0 parses the copied specifiers as 3 cells each and fails to
> set up device interrupts.
>
> Propagate #interrupt-cells from the host GIC node in make_gic_node()
> and pad Dom0 interrupt specifiers with trailing zero cells in
> fdt_property_interrupts().
>
> Signed-off-by: Kuan-Wei Chiu <visitorckw@xxxxxxxxx>
> Reviewed-by: Michal Orzel <michal.orzel@xxxxxxx>
> ---
> Changes in v2:
> - Add a comment in fdt_property_interrupts() explaining why only the
> hardware domain preserves the host GIC's #interrupt-cells and that
> extra cells beyond 3 are zero-padded.
>
> xen/arch/arm/domain_build.c | 37 ++++++++++++++++++++++++++++++++++---
> 1 file changed, 34 insertions(+), 3 deletions(-)
>
> diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
> index 606e85818e..d5bb895a6e 100644
> --- a/xen/arch/arm/domain_build.c
> +++ b/xen/arch/arm/domain_build.c
> @@ -654,12 +654,37 @@ static int __init fdt_property_interrupts(const struct
> kernel_info *kinfo,
> unsigned int num_irq)
> {
> int res;
> + uint32_t intrcells = ARRAY_SIZE(intr[0]);
> + void *val;
> + unsigned int i, stride;
>
> - res = fdt_property(kinfo->fdt, "interrupts",
> - intr, sizeof(intr[0]) * num_irq);
> + /*
> + * Only the hardware domain preserves the host GIC's #interrupt-cells,
> + * since its device interrupt properties are copied from the host DT;
> + * domUs always use a 3-cell virtual GIC. Any extra cells beyond the
> + * 3-cell specifier, such as the GICv3 PPI affinity partition, are
> + * zero-padded.
> + */
> + if ( is_hardware_domain(kinfo->bd.d) )
> + {
> + const struct dt_device_node *gic = dt_interrupt_controller;
> +
> + if ( !dt_property_read_u32(gic, "#interrupt-cells", &intrcells) )
> + return -FDT_ERR_XEN(ENOENT);
Blank line here.
> + if ( intrcells < ARRAY_SIZE(intr[0]) )
> + return -FDT_ERR_XEN(ERANGE);
> + }
> +
> + stride = intrcells * sizeof(intr[0][0]);
> + res = fdt_property_placeholder(kinfo->fdt, "interrupts",
> + stride * num_irq, &val);
> if ( res )
> return res;
>
> + memset(val, 0, stride * num_irq);
Blank line here.
> + for ( i = 0; i < num_irq; i++ )
> + memcpy((uint8_t *)val + i * stride, intr[i], sizeof(intr[0]));
> +
> res = fdt_property_cell(kinfo->fdt, "interrupt-parent",
> kinfo->phandle_intc);
>
> @@ -1320,6 +1345,7 @@ static int __init make_gic_node(const struct domain *d,
> void *fdt,
> int res = 0;
> const void *addrcells, *sizecells;
> u32 addrcells_len, sizecells_len;
> + uint32_t intrcells;
> const char *name;
>
> /*
> @@ -1370,7 +1396,12 @@ static int __init make_gic_node(const struct domain
> *d, void *fdt,
> return res;
> }
>
> - res = fdt_property_cell(fdt, "#interrupt-cells", 3);
> + if ( !dt_property_read_u32(gic, "#interrupt-cells", &intrcells) )
> + return -FDT_ERR_XEN(ENOENT);
Blank line here.
With that my tag stands. Can be fixed on commit.
~Michal
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |