diff options
author | Liu Jiang <jiang.liu@linux.intel.com> | 2016-01-12 15:18:06 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2016-01-14 14:59:09 -0500 |
commit | bf6f869f8c111ba265cd199c64b25c646987500a (patch) | |
tree | df784b909775f2396870d5a2fb3f86431c85a98b | |
parent | 1ec218373b8ebda821aec00bb156a9c94fad9cd4 (diff) |
genirq/MSI: Relax msi_domain_alloc() to support parentless MSI irqdomains
Previously msi_domain_alloc() assumed MSI irqdomains always had parent
irqdomains, but that's not true for the new Intel VMD devices. Relax
msi_domain_alloc() to support parentless MSI irqdomains.
Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Signed-off-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r-- | kernel/irq/msi.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/kernel/irq/msi.c b/kernel/irq/msi.c index 6b0c0b74a2a1..5e15cb4b2f00 100644 --- a/kernel/irq/msi.c +++ b/kernel/irq/msi.c | |||
@@ -109,9 +109,11 @@ static int msi_domain_alloc(struct irq_domain *domain, unsigned int virq, | |||
109 | if (irq_find_mapping(domain, hwirq) > 0) | 109 | if (irq_find_mapping(domain, hwirq) > 0) |
110 | return -EEXIST; | 110 | return -EEXIST; |
111 | 111 | ||
112 | ret = irq_domain_alloc_irqs_parent(domain, virq, nr_irqs, arg); | 112 | if (domain->parent) { |
113 | if (ret < 0) | 113 | ret = irq_domain_alloc_irqs_parent(domain, virq, nr_irqs, arg); |
114 | return ret; | 114 | if (ret < 0) |
115 | return ret; | ||
116 | } | ||
115 | 117 | ||
116 | for (i = 0; i < nr_irqs; i++) { | 118 | for (i = 0; i < nr_irqs; i++) { |
117 | ret = ops->msi_init(domain, info, virq + i, hwirq + i, arg); | 119 | ret = ops->msi_init(domain, info, virq + i, hwirq + i, arg); |