Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1296113

[PATCHv7 1/6] msi: Relax msi_domain_alloc() to support parentless MSI irqdomains

Show all headers | View raw

From: Liu Jiang <jiang.liu@linux.intel.com>

Previously msi_domain_alloc() assumes MSI irqdomains always have parent
irqdomains, but that's not true for the new Intel VMD devices. So 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>
---
 kernel/irq/msi.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/kernel/irq/msi.c b/kernel/irq/msi.c
index 6b0c0b7..5e15cb4 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,
 	if (irq_find_mapping(domain, hwirq) > 0)
 		return -EEXIST;
 
-	ret = irq_domain_alloc_irqs_parent(domain, virq, nr_irqs, arg);
-	if (ret < 0)
-		return ret;
+	if (domain->parent) {
+		ret = irq_domain_alloc_irqs_parent(domain, virq, nr_irqs, arg);
+		if (ret < 0)
+			return ret;
+	}
 
 	for (i = 0; i < nr_irqs; i++) {
 		ret = ops->msi_init(domain, info, virq + i, hwirq + i, arg);
-- 
2.6.2.307.g37023ba

--
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

Thread

[PATCHv7 0/6] Driver for new "VMD" device Keith Busch <keith.busch@intel.com> - 2015-12-21 18:50 +0100
  [PATCHv7 1/6] msi: Relax msi_domain_alloc() to support parentless MSI irqdomains Keith Busch <keith.busch@intel.com> - 2015-12-21 18:50 +0100
  [PATCHv7 5/6] x86/PCI: Initial commit for new VMD device driver Keith Busch <keith.busch@intel.com> - 2015-12-21 18:50 +0100
  [PATCHv7 6/6] PCI/AER: Use 32 bit int type domains Keith Busch <keith.busch@intel.com> - 2015-12-21 18:50 +0100
  [PATCHv7 3/6] x86/IRQ: Export IRQ domain function for module use Keith Busch <keith.busch@intel.com> - 2015-12-21 18:50 +0100
  [PATCHv7 4/6] x86/PCI: Allow PCI domain specific dma ops Keith Busch <keith.busch@intel.com> - 2015-12-21 18:50 +0100

csiph-web