diff options
author | Tomasz Nowicki <tn@semihalf.com> | 2015-08-10 17:40:32 +0200 |
---|---|---|
committer | Tomasz Nowicki <tn@semihalf.com> | 2015-09-28 18:55:09 +0200 |
commit | d0fd38a5aaacdea839ea9311b18dddbf9617cfbc (patch) | |
tree | 9fc320cb9600660e7c102c75cfd1085ba56fd91a | |
parent | 654e0f179ee6e9a0718ab276d97b2f82766e48a7 (diff) |
acpi, gicv3, msi: Factor out code that might be reused for ACPI equivalent.
Firmware agnostic code lands in separate function which do necessary
domain initialization based on global unequally domain token.
Signed-off-by: Tomasz Nowicki <tn@semihalf.com>
-rw-r--r-- | drivers/irqchip/irq-gic-v3-its-pci-msi.c | 35 | ||||
-rw-r--r-- | drivers/irqchip/irq-gic-v3-its-platform-msi.c | 35 |
2 files changed, 42 insertions, 28 deletions
diff --git a/drivers/irqchip/irq-gic-v3-its-pci-msi.c b/drivers/irqchip/irq-gic-v3-its-pci-msi.c index cf351c637464..a9bbc22629f0 100644 --- a/drivers/irqchip/irq-gic-v3-its-pci-msi.c +++ b/drivers/irqchip/irq-gic-v3-its-pci-msi.c @@ -108,29 +108,36 @@ static struct of_device_id its_device_id[] = { {}, }; -static int __init its_pci_msi_init(void) +static int __init its_pci_msi_init_one(void *token) { - struct device_node *np; struct irq_domain *parent; + parent = irq_find_matching_host(token, DOMAIN_BUS_NEXUS); + if (!parent || !msi_get_domain_info(parent)) { + pr_err("Unable to locate ITS domain\n"); + return -ENXIO; + } + + if (!pci_msi_create_irq_domain(token, &its_pci_msi_domain_info, + parent)) { + pr_err("Unable to create PCI domain\n"); + return -ENOMEM; + } + + return 0; +} + +static int __init its_pci_of_msi_init(void) +{ + struct device_node *np; + for (np = of_find_matching_node(NULL, its_device_id); np; np = of_find_matching_node(np, its_device_id)) { if (!of_property_read_bool(np, "msi-controller")) continue; - parent = irq_find_matching_host(np, DOMAIN_BUS_NEXUS); - if (!parent || !msi_get_domain_info(parent)) { - pr_err("%s: unable to locate ITS domain\n", - np->full_name); - continue; - } - - if (!pci_msi_create_irq_domain(np, &its_pci_msi_domain_info, - parent)) { - pr_err("%s: unable to create PCI domain\n", - np->full_name); + if (its_pci_msi_init_one(np)) continue; - } pr_info("PCI/MSI: %s domain created\n", np->full_name); } diff --git a/drivers/irqchip/irq-gic-v3-its-platform-msi.c b/drivers/irqchip/irq-gic-v3-its-platform-msi.c index a86550562779..1c737c4bfee8 100644 --- a/drivers/irqchip/irq-gic-v3-its-platform-msi.c +++ b/drivers/irqchip/irq-gic-v3-its-platform-msi.c @@ -61,29 +61,36 @@ static struct of_device_id its_device_id[] = { {}, }; -static int __init its_pmsi_init(void) +static int __init its_pmsi_init_one(void *token) { - struct device_node *np; struct irq_domain *parent; + parent = irq_find_matching_host(token, DOMAIN_BUS_NEXUS); + if (!parent || !msi_get_domain_info(parent)) { + pr_err("Unable to locate ITS domain\n"); + return -ENXIO; + } + + if (!platform_msi_create_irq_domain(token, &its_pmsi_domain_info, + parent)) { + pr_err("Unable to create platform domain\n"); + return -ENOMEM; + } + + return 0; +} + +static int __init its_pmsi_of_init(void) +{ + struct device_node *np; + for (np = of_find_matching_node(NULL, its_device_id); np; np = of_find_matching_node(np, its_device_id)) { if (!of_property_read_bool(np, "msi-controller")) continue; - parent = irq_find_matching_host(np, DOMAIN_BUS_NEXUS); - if (!parent || !msi_get_domain_info(parent)) { - pr_err("%s: unable to locate ITS domain\n", - np->full_name); - continue; - } - - if (!platform_msi_create_irq_domain(np, &its_pmsi_domain_info, - parent)) { - pr_err("%s: unable to create platform domain\n", - np->full_name); + if (its_pmsi_init_one(np)) continue; - } pr_info("Platform MSI: %s domain created\n", np->full_name); } |