From mboxrd@z Thu Jan 1 00:00:00 1970 From: christoffer.dall@linaro.org (Christoffer Dall) Date: Tue, 8 Mar 2016 21:47:10 -0800 Subject: [PATCH v3 3/9] irqchip/gic-v2: Gather ACPI specific data in a single structure In-Reply-To: <1457436573-6180-4-git-send-email-julien.grall@arm.com> References: <1457436573-6180-1-git-send-email-julien.grall@arm.com> <1457436573-6180-4-git-send-email-julien.grall@arm.com> Message-ID: <20160309054710.GI26583@lvm> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Tue, Mar 08, 2016 at 11:29:27AM +0000, Julien Grall wrote: > For now, there is only one member. More member will be added later. questionable commit message > > Signed-off-by: Julien Grall > > --- > Cc: Thomas Gleixner > Cc: Jason Cooper > Cc: Marc Zyngier > > Changes in v2: > - Patch added > --- > drivers/irqchip/irq-gic.c | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) > > diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c > index 8f9ebf7..fbde202 100644 > --- a/drivers/irqchip/irq-gic.c > +++ b/drivers/irqchip/irq-gic.c > @@ -1245,7 +1245,10 @@ IRQCHIP_DECLARE(pl390, "arm,pl390", gic_of_init); > #endif > > #ifdef CONFIG_ACPI > -static phys_addr_t cpu_phy_base __initdata; > +static struct > +{ > + phys_addr_t cpu_phy_base; > +} acpi_data __initdata; > > static int __init > gic_acpi_parse_madt_cpu(struct acpi_subtable_header *header, > @@ -1265,10 +1268,10 @@ gic_acpi_parse_madt_cpu(struct acpi_subtable_header *header, > * All CPU interface addresses have to be the same. > */ > gic_cpu_base = processor->base_address; > - if (cpu_base_assigned && gic_cpu_base != cpu_phy_base) > + if (cpu_base_assigned && gic_cpu_base != acpi_data.cpu_phy_base) > return -EINVAL; > > - cpu_phy_base = gic_cpu_base; > + acpi_data.cpu_phy_base = gic_cpu_base; > cpu_base_assigned = 1; > return 0; > } > @@ -1316,7 +1319,7 @@ static int __init gic_v2_acpi_init(struct acpi_subtable_header *header, > return -EINVAL; > } > > - cpu_base = ioremap(cpu_phy_base, ACPI_GIC_CPU_IF_MEM_SIZE); > + cpu_base = ioremap(acpi_data.cpu_phy_base, ACPI_GIC_CPU_IF_MEM_SIZE); > if (!cpu_base) { > pr_err("Unable to map GICC registers\n"); > return -ENOMEM; > -- > 1.9.1 > super nit: I would use cpu_phys_base instead of cpu_phy_base, but I'll leave it up to you. Acked-by: Christoffer Dall