irqchip/gic-v3: Pass #redistributor-regions to gic_of_setup_kvm_info()

The caller of gic_of_setup_kvm_info() already queried DT for the value
of the #redistributor-regions property.  So just pass this value,
instead of doing the DT look-up again in the callee.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/808286a3ac08f60585ae7e2c848e0f9b3cb79cf8.1719912215.git.geert+renesas@glider.be

diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c
index e4bc5f04226e61095895b9a37aedd94d93beedb6..7c12d11513c61dc009535b892beebd0f9e9eabb1 100644 (file)
--- a/drivers/irqchip/irq-gic-v3.c
+++ b/drivers/irqchip/irq-gic-v3.c
@@ -2190,11 +2190,10 @@ out_put_node:
        of_node_put(parts_node);
 }
 
-static void __init gic_of_setup_kvm_info(struct device_node *node)
+static void __init gic_of_setup_kvm_info(struct device_node *node, u32 nr_redist_regions)
 {
        int ret;
        struct resource r;
-       u32 gicv_idx;
 
        gic_v3_kvm_info.type = GIC_V3;
 
@@ -2202,12 +2201,8 @@ static void __init gic_of_setup_kvm_info(struct device_node *node)
        if (!gic_v3_kvm_info.maint_irq)
                return;
 
-       if (of_property_read_u32(node, "#redistributor-regions",
-                                &gicv_idx))
-               gicv_idx = 1;
-
-       gicv_idx += 3;  /* Also skip GICD, GICC, GICH */
-       ret = of_address_to_resource(node, gicv_idx, &r);
+       /* Also skip GICD, GICC, GICH */
+       ret = of_address_to_resource(node, nr_redist_regions + 3, &r);
        if (!ret)
                gic_v3_kvm_info.vcpu = r;
 
@@ -2297,7 +2292,7 @@ static int __init gic_of_init(struct device_node *node, struct device_node *pare
        gic_populate_ppi_partitions(node);
 
        if (static_branch_likely(&supports_deactivate_key))
-               gic_of_setup_kvm_info(node);
+               gic_of_setup_kvm_info(node, nr_redist_regions);
        return 0;
 
 out_unmap_rdist: