| Message ID | 20180305160415.16760-4-andre.przywara@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | New VGIC(-v2) implementation | expand |
Hi Andre, On 05/03/18 16:03, Andre Przywara wrote: > The code to generate the DT node or MADT table for Dom0 reaches into the > domain's VGIC structure to learn the number of redistributor regions and Mega NIT: Can you either use VGIC or vGIC within the same patch? :) > their base addresses. > Since those values are copied from the hardware, we can as well use > those hardware values directly when setting up the hardware domain. > > This avoids the hardware GIC code to reference vGIC data structures. > > Signed-off-by: Andre Przywara <andre.przywara@linaro.org> Reviewed-by: Julien Grall <julien.grall@arm.com> Cheers, > --- > Changelog RFC ... v1: > - Use GIC hardware values consistently in this function. > > xen/arch/arm/gic-v3.c | 17 +++++++---------- > 1 file changed, 7 insertions(+), 10 deletions(-) > > diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c > index 25c30bb9ea..b1f8a86409 100644 > --- a/xen/arch/arm/gic-v3.c > +++ b/xen/arch/arm/gic-v3.c > @@ -1162,13 +1162,11 @@ static int gicv3_make_hwdom_dt_node(const struct domain *d, > if ( res ) > return res; > > - res = fdt_property_cell(fdt, "redistributor-stride", > - d->arch.vgic.rdist_stride); > + res = fdt_property_cell(fdt, "redistributor-stride", gicv3.rdist_stride); > if ( res ) > return res; > > - res = fdt_property_cell(fdt, "#redistributor-regions", > - d->arch.vgic.nr_regions); > + res = fdt_property_cell(fdt, "#redistributor-regions", gicv3.rdist_count); > if ( res ) > return res; > > @@ -1178,7 +1176,7 @@ static int gicv3_make_hwdom_dt_node(const struct domain *d, > * CPU interface and virtual cpu interfaces accessesed as System registers > * So cells are created only for Distributor and rdist regions > */ > - new_len = new_len * (d->arch.vgic.nr_regions + 1); > + new_len = new_len * (gicv3.rdist_count + 1); > > hw_reg = dt_get_property(gic, "reg", &len); > if ( !hw_reg ) > @@ -1406,13 +1404,13 @@ static int gicv3_make_hwdom_madt(const struct domain *d, u32 offset) > > /* Add Generic Redistributor */ > size = sizeof(struct acpi_madt_generic_redistributor); > - for ( i = 0; i < d->arch.vgic.nr_regions; i++ ) > + for ( i = 0; i < gicv3.rdist_count; i++ ) > { > gicr = (struct acpi_madt_generic_redistributor *)(base_ptr + table_len); > gicr->header.type = ACPI_MADT_TYPE_GENERIC_REDISTRIBUTOR; > gicr->header.length = size; > - gicr->base_address = d->arch.vgic.rdist_regions[i].base; > - gicr->length = d->arch.vgic.rdist_regions[i].size; > + gicr->base_address = gicv3.rdist_regions[i].base; > + gicr->length = gicv3.rdist_regions[i].size; > table_len += size; > } > > @@ -1425,8 +1423,7 @@ static unsigned long gicv3_get_hwdom_extra_madt_size(const struct domain *d) > { > unsigned long size; > > - size = sizeof(struct acpi_madt_generic_redistributor) > - * d->arch.vgic.nr_regions; > + size = sizeof(struct acpi_madt_generic_redistributor) * gicv3.rdist_count; > > size += sizeof(struct acpi_madt_generic_translator) > * vgic_v3_its_count(d); >
diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c index 25c30bb9ea..b1f8a86409 100644 --- a/xen/arch/arm/gic-v3.c +++ b/xen/arch/arm/gic-v3.c @@ -1162,13 +1162,11 @@ static int gicv3_make_hwdom_dt_node(const struct domain *d, if ( res ) return res; - res = fdt_property_cell(fdt, "redistributor-stride", - d->arch.vgic.rdist_stride); + res = fdt_property_cell(fdt, "redistributor-stride", gicv3.rdist_stride); if ( res ) return res; - res = fdt_property_cell(fdt, "#redistributor-regions", - d->arch.vgic.nr_regions); + res = fdt_property_cell(fdt, "#redistributor-regions", gicv3.rdist_count); if ( res ) return res; @@ -1178,7 +1176,7 @@ static int gicv3_make_hwdom_dt_node(const struct domain *d, * CPU interface and virtual cpu interfaces accessesed as System registers * So cells are created only for Distributor and rdist regions */ - new_len = new_len * (d->arch.vgic.nr_regions + 1); + new_len = new_len * (gicv3.rdist_count + 1); hw_reg = dt_get_property(gic, "reg", &len); if ( !hw_reg ) @@ -1406,13 +1404,13 @@ static int gicv3_make_hwdom_madt(const struct domain *d, u32 offset) /* Add Generic Redistributor */ size = sizeof(struct acpi_madt_generic_redistributor); - for ( i = 0; i < d->arch.vgic.nr_regions; i++ ) + for ( i = 0; i < gicv3.rdist_count; i++ ) { gicr = (struct acpi_madt_generic_redistributor *)(base_ptr + table_len); gicr->header.type = ACPI_MADT_TYPE_GENERIC_REDISTRIBUTOR; gicr->header.length = size; - gicr->base_address = d->arch.vgic.rdist_regions[i].base; - gicr->length = d->arch.vgic.rdist_regions[i].size; + gicr->base_address = gicv3.rdist_regions[i].base; + gicr->length = gicv3.rdist_regions[i].size; table_len += size; } @@ -1425,8 +1423,7 @@ static unsigned long gicv3_get_hwdom_extra_madt_size(const struct domain *d) { unsigned long size; - size = sizeof(struct acpi_madt_generic_redistributor) - * d->arch.vgic.nr_regions; + size = sizeof(struct acpi_madt_generic_redistributor) * gicv3.rdist_count; size += sizeof(struct acpi_madt_generic_translator) * vgic_v3_its_count(d);
The code to generate the DT node or MADT table for Dom0 reaches into the domain's VGIC structure to learn the number of redistributor regions and their base addresses. Since those values are copied from the hardware, we can as well use those hardware values directly when setting up the hardware domain. This avoids the hardware GIC code to reference vGIC data structures. Signed-off-by: Andre Przywara <andre.przywara@linaro.org> --- Changelog RFC ... v1: - Use GIC hardware values consistently in this function. xen/arch/arm/gic-v3.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)