| Message ID | 1457436573-6180-4-git-send-email-julien.grall@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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 <julien.grall@arm.com> > > --- > Cc: Thomas Gleixner <tglx@linutronix.de> > Cc: Jason Cooper <jason@lakedaemon.net> > Cc: Marc Zyngier <marc.zyngier@arm.com> > > 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 <christoffer.dall@linaro.org> -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Christoffer, On 09/03/2016 12:47, Christoffer Dall wrote: > 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 What about: "The ACPI code requires to use global variables in order to collect information from the tables. For now only a single global variable is used, but more will be added in a subsequent patch. To make clear they are ACPI specific, gather all the information in a single structure." [...] >> @@ -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. I will update the commit message, so I will rename the variable too. > > Acked-by: Christoffer Dall <christoffer.dall@linaro.org> Cheers,
On Wed, Mar 09, 2016 at 01:18:14PM +0700, Julien Grall wrote: > Hi Christoffer, > > On 09/03/2016 12:47, Christoffer Dall wrote: > >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 > > What about: > > "The ACPI code requires to use global variables in order to collect > information from the tables. > > For now only a single global variable is used, but more will be > added in a subsequent patch. To make clear they are ACPI specific, > gather all the information in a single structure." > that's better. > [...] > > >>@@ -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. > > I will update the commit message, so I will rename the variable too. > Thanks, -Christoffer -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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;
For now, there is only one member. More member will be added later. Signed-off-by: Julien Grall <julien.grall@arm.com> --- Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Jason Cooper <jason@lakedaemon.net> Cc: Marc Zyngier <marc.zyngier@arm.com> Changes in v2: - Patch added --- drivers/irqchip/irq-gic.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)