aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/irqchip/irq-gic.c
diff options
context:
space:
mode:
authorSuravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>2015-12-10 11:55:30 -0500
committerMarc Zyngier <marc.zyngier@arm.com>2015-12-21 10:43:35 -0500
commit0644b3daca28dcb320373ae20069c269c9386304 (patch)
tree122327cebd0aee36ee4f5049f35c58a87a10279c /drivers/irqchip/irq-gic.c
parent4266ab1a8ff5715e48b2e89046305864650ce025 (diff)
irqchip/gic-v2m: acpi: Introducing GICv2m ACPI support
This patch introduces gicv2m_acpi_init(), which uses information in MADT GIC MSI frames structure to initialize GICv2m driver. It also exposes gicv2m_init() function, which simplifies callers to a single GICv2m init function. Reviewed-by: Marc Zyngier <marc.zyngier@arm.com> Tested-by: Duc Dang <dhdang@apm.com> Acked-by: Rafael J. Wysocki <rjw@rjwysocki.net> Signed-off-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com> Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'drivers/irqchip/irq-gic.c')
-rw-r--r--drivers/irqchip/irq-gic.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
index fcd327f49e8e..644e8bbe130c 100644
--- a/drivers/irqchip/irq-gic.c
+++ b/drivers/irqchip/irq-gic.c
@@ -1234,7 +1234,7 @@ gic_of_init(struct device_node *node, struct device_node *parent)
1234 } 1234 }
1235 1235
1236 if (IS_ENABLED(CONFIG_ARM_GIC_V2M)) 1236 if (IS_ENABLED(CONFIG_ARM_GIC_V2M))
1237 gicv2m_of_init(node, gic_data[gic_cnt].domain); 1237 gicv2m_init(&node->fwnode, gic_data[gic_cnt].domain);
1238 1238
1239 gic_cnt++; 1239 gic_cnt++;
1240 return 0; 1240 return 0;
@@ -1359,6 +1359,10 @@ static int __init gic_v2_acpi_init(struct acpi_subtable_header *header,
1359 __gic_init_bases(0, -1, dist_base, cpu_base, 0, domain_handle); 1359 __gic_init_bases(0, -1, dist_base, cpu_base, 0, domain_handle);
1360 1360
1361 acpi_set_irq_model(ACPI_IRQ_MODEL_GIC, domain_handle); 1361 acpi_set_irq_model(ACPI_IRQ_MODEL_GIC, domain_handle);
1362
1363 if (IS_ENABLED(CONFIG_ARM_GIC_V2M))
1364 gicv2m_init(NULL, gic_data[0].domain);
1365
1362 return 0; 1366 return 0;
1363} 1367}
1364IRQCHIP_ACPI_DECLARE(gic_v2, ACPI_MADT_TYPE_GENERIC_DISTRIBUTOR, 1368IRQCHIP_ACPI_DECLARE(gic_v2, ACPI_MADT_TYPE_GENERIC_DISTRIBUTOR,