Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bafa9193 authored by Julien Grall's avatar Julien Grall Committed by Christoffer Dall
Browse files

irqchip/gic-v2: Gather ACPI specific data in a single structure 



The ACPI code requires to use global variables in order to collect
information from the tables.

For now, 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.

Signed-off-by: default avatarJulien Grall <julien.grall@arm.com>
Acked-by: default avatarChristofer Dall <christoffer.dall@linaro.org>
Acked-by: default avatarHanjun Guo <hanjun.guo@linaro.org>
Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
parent d9b5e415

drivers/irqchip/irq-gic.c

+7 −4
Original line number Diff line number Diff line
@@ -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_phys_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_phys_base)

		return -EINVAL;



	cpu_phy_base = gic_cpu_base;

	acpi_data.cpu_phys_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_phys_base, ACPI_GIC_CPU_IF_MEM_SIZE);

	if (!cpu_base) {

		pr_err("Unable to map GICC registers\n");

		return -ENOMEM;