Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1240797
| From | Marc Zyngier <marc.zyngier@arm.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 12/16] irqchip/gic: Switch ACPI support to stacked domains |
| Date | 2015-10-06 19:40 +0200 |
| Message-ID | <qgEny-4wt-55@gated-at.bofh.it> (permalink) |
| References | <qgEnv-4wt-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
Now that the basic ACPI GSI code is irq domain aware, make sure
that the ACPI support in the GIC doesn't pointlessly deviate from
the DT path.
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
drivers/irqchip/irq-gic.c | 44 ++++++++++++++++++++++++++++++--------------
1 file changed, 30 insertions(+), 14 deletions(-)
diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
index f1f4ca1..ad5ecfd 100644
--- a/drivers/irqchip/irq-gic.c
+++ b/drivers/irqchip/irq-gic.c
@@ -950,6 +950,15 @@ static int gic_irq_domain_translate(struct irq_domain *d,
return 0;
}
+ if (fwspec->fwnode->type == FWNODE_IRQCHIP) {
+ if(fwspec->param_count != 2)
+ return -EINVAL;
+
+ *hwirq = fwspec->param[0];
+ *type = fwspec->param[1];
+ return 0;
+ }
+
return -EINVAL;
}
@@ -1004,7 +1013,7 @@ static const struct irq_domain_ops gic_irq_domain_ops = {
static void __init __gic_init_bases(unsigned int gic_nr, int irq_start,
void __iomem *dist_base, void __iomem *cpu_base,
- u32 percpu_offset, struct device_node *node)
+ u32 percpu_offset, struct fwnode_handle *handle)
{
irq_hw_number_t hwirq_base;
struct gic_chip_data *gic;
@@ -1056,11 +1065,11 @@ static void __init __gic_init_bases(unsigned int gic_nr, int irq_start,
gic_irqs = 1020;
gic->gic_irqs = gic_irqs;
- if (node) { /* DT case */
- gic->domain = irq_domain_add_linear(node, gic_irqs,
- &gic_irq_domain_hierarchy_ops,
- gic);
- } else { /* Non-DT case */
+ if (handle) { /* DT/ACPI */
+ gic->domain = irq_domain_create_linear(handle, gic_irqs,
+ &gic_irq_domain_hierarchy_ops,
+ gic);
+ } else { /* Legacy support */
/*
* For primary GICs, skip over SGIs.
* For secondary GICs, skip over PPIs, too.
@@ -1083,7 +1092,7 @@ static void __init __gic_init_bases(unsigned int gic_nr, int irq_start,
irq_base = irq_start;
}
- gic->domain = irq_domain_add_legacy(node, gic_irqs, irq_base,
+ gic->domain = irq_domain_add_legacy(NULL, gic_irqs, irq_base,
hwirq_base, &gic_irq_domain_ops, gic);
}
@@ -1191,7 +1200,8 @@ gic_of_init(struct device_node *node, struct device_node *parent)
if (of_property_read_u32(node, "cpu-offset", &percpu_offset))
percpu_offset = 0;
- __gic_init_bases(gic_cnt, -1, dist_base, cpu_base, percpu_offset, node);
+ __gic_init_bases(gic_cnt, -1, dist_base, cpu_base, percpu_offset,
+ &node->fwnode);
if (!gic_cnt)
gic_init_physaddr(node);
@@ -1265,6 +1275,7 @@ int __init
gic_v2_acpi_init(struct acpi_table_header *table)
{
void __iomem *cpu_base, *dist_base;
+ struct fwnode_handle *domain_handle;
int count;
/* Collect CPU base addresses */
@@ -1315,14 +1326,19 @@ gic_v2_acpi_init(struct acpi_table_header *table)
static_key_slow_dec(&supports_deactivate);
/*
- * Initialize zero GIC instance (no multi-GIC support). Also, set GIC
- * as default IRQ domain to allow for GSI registration and GSI to IRQ
- * number translation (see acpi_register_gsi() and acpi_gsi_to_irq()).
+ * Initialize GIC instance zero (no multi-GIC support).
*/
- __gic_init_bases(0, -1, dist_base, cpu_base, 0, NULL);
- irq_set_default_host(gic_data[0].domain);
+ domain_handle = irq_domain_alloc_fwnode(dist_base);
+ if (!domain_handle) {
+ pr_err("Unable to allocate domain handle\n");
+ iounmap(cpu_base);
+ iounmap(dist_base);
+ return -ENOMEM;
+ }
+
+ __gic_init_bases(0, -1, dist_base, cpu_base, 0, domain_handle);
- acpi_irq_model = ACPI_IRQ_MODEL_GIC;
+ acpi_set_irq_model(ACPI_IRQ_MODEL_GIC, domain_handle);
return 0;
}
#endif
--
2.1.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 00/16] Divorcing irqdomain and device_node Marc Zyngier <marc.zyngier@arm.com> - 2015-10-06 19:40 +0200
[PATCH 12/16] irqchip/gic: Switch ACPI support to stacked domains Marc Zyngier <marc.zyngier@arm.com> - 2015-10-06 19:40 +0200
[PATCH 13/16] irqchip/gic: Kill the xlate method Marc Zyngier <marc.zyngier@arm.com> - 2015-10-06 19:40 +0200
[PATCH 08/16] irqdomain: Add a fwnode_handle allocator Marc Zyngier <marc.zyngier@arm.com> - 2015-10-06 19:40 +0200
Re: [PATCH 08/16] irqdomain: Add a fwnode_handle allocator "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2015-10-12 22:10 +0200
[PATCH 07/16] irqdomain: Introduce irq_domain_create_{linear,tree} Marc Zyngier <marc.zyngier@arm.com> - 2015-10-06 19:40 +0200
[PATCH 03/16] irqdomain: Allow irq domain lookup by fwnode Marc Zyngier <marc.zyngier@arm.com> - 2015-10-06 19:50 +0200
Re: [PATCH 03/16] irqdomain: Allow irq domain lookup by fwnode Marc Zyngier <marc.zyngier@arm.com> - 2015-10-13 09:40 +0200
[PATCH 05/16] irqchip: Convert all alloc/xlate users from of_node to fwnode Marc Zyngier <marc.zyngier@arm.com> - 2015-10-06 19:50 +0200
Re: [PATCH 05/16] irqchip: Convert all alloc/xlate users from of_node to fwnode Hanjun Guo <hanjun.guo@linaro.org> - 2015-10-12 08:50 +0200
[PATCH 06/16] irqdomain: Introduce irq_create_fwspec_mapping Marc Zyngier <marc.zyngier@arm.com> - 2015-10-06 19:50 +0200
[PATCH 01/16] irqdomain: Use an accessor for the of_node field Marc Zyngier <marc.zyngier@arm.com> - 2015-10-06 19:50 +0200
Re: [PATCH 01/16] irqdomain: Use an accessor for the of_node field Thomas Gleixner <tglx@linutronix.de> - 2015-10-09 16:30 +0200
Re: [PATCH 01/16] irqdomain: Use an accessor for the of_node field Marc Zyngier <marc.zyngier@arm.com> - 2015-10-09 16:40 +0200
Re: [PATCH 01/16] irqdomain: Use an accessor for the of_node field Hanjun Guo <hanjun.guo@linaro.org> - 2015-10-12 08:10 +0200
Re: [PATCH 01/16] irqdomain: Use an accessor for the of_node field Marc Zyngier <marc.zyngier@arm.com> - 2015-10-12 11:40 +0200
[PATCH 04/16] irqdomain: Introduce a firmware-specific IRQ specifier structure Marc Zyngier <marc.zyngier@arm.com> - 2015-10-06 19:50 +0200
Re: [PATCH 00/16] Divorcing irqdomain and device_node Thomas Gleixner <tglx@linutronix.de> - 2015-10-11 23:10 +0200
Re: [PATCH 00/16] Divorcing irqdomain and device_node Hanjun Guo <hanjun.guo@linaro.org> - 2015-10-12 04:50 +0200
Re: [PATCH 00/16] Divorcing irqdomain and device_node Hanjun Guo <hanjun.guo@linaro.org> - 2015-10-12 09:20 +0200
Re: [PATCH 00/16] Divorcing irqdomain and device_node Marc Zyngier <marc.zyngier@arm.com> - 2015-10-12 12:40 +0200
Re: [PATCH 00/16] Divorcing irqdomain and device_node "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2015-10-12 22:20 +0200
Re: [PATCH 00/16] Divorcing irqdomain and device_node Marc Zyngier <marc.zyngier@arm.com> - 2015-10-13 10:30 +0200
csiph-web