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

Groups > linux.kernel > #1477201

[PATCH V10 3/8] PCI/MSI: Setup MSI domain on a per-device basis using IORT ACPI table

Show all headers | View raw

It is possible to provide information about which MSI controller to
use on a per-device basis for DT. This patch supply this with ACPI support.

Currently, IORT is the only one ACPI table which can provide such mapping.
In order to plug IORT into MSI infrastructure we are adding ACPI
equivalents for finding PCI device domain and its RID translation
(pci_msi_domain_get_msi_rid and pci_msi_domain_get_msi_rid calls).

Signed-off-by: Tomasz Nowicki <tn@semihalf.com>
Reviewed-by: Hanjun Guo <hanjun.guo@linaro.org>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
---
 drivers/pci/msi.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 98f1222..137b4c5 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -19,6 +19,7 @@
 #include <linux/smp.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/acpi_iort.h>
 #include <linux/slab.h>
 #include <linux/irqdomain.h>
 #include <linux/of_irq.h>
@@ -1502,8 +1503,8 @@ u32 pci_msi_domain_get_msi_rid(struct irq_domain *domain, struct pci_dev *pdev)
 	pci_for_each_dma_alias(pdev, get_msi_id_cb, &rid);
 
 	of_node = irq_domain_get_of_node(domain);
-	if (of_node)
-		rid = of_msi_map_rid(&pdev->dev, of_node, rid);
+	rid = of_node ? of_msi_map_rid(&pdev->dev, of_node, rid) :
+			iort_msi_map_rid(&pdev->dev, rid);
 
 	return rid;
 }
@@ -1519,9 +1520,13 @@ u32 pci_msi_domain_get_msi_rid(struct irq_domain *domain, struct pci_dev *pdev)
  */
 struct irq_domain *pci_msi_get_device_domain(struct pci_dev *pdev)
 {
+	struct irq_domain *dom;
 	u32 rid = 0;
 
 	pci_for_each_dma_alias(pdev, get_msi_id_cb, &rid);
-	return of_msi_map_get_device_domain(&pdev->dev, rid);
+	dom = of_msi_map_get_device_domain(&pdev->dev, rid);
+	if (!dom)
+		dom = iort_get_device_domain(&pdev->dev, rid);
+	return dom;
 }
 #endif /* CONFIG_PCI_MSI_IRQ_DOMAIN */
-- 
1.9.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH V10 0/8] Introduce ACPI world to ITS irqchip Tomasz Nowicki <tn@semihalf.com> - 2016-09-06 11:10 +0200
  [PATCH V10 6/8] irqchip/gicv3-its: Probe ITS in the ACPI way Tomasz Nowicki <tn@semihalf.com> - 2016-09-06 11:10 +0200
  [PATCH V10 1/8] ACPI: I/O Remapping Table (IORT) initial support Tomasz Nowicki <tn@semihalf.com> - 2016-09-06 11:10 +0200
    [UPDATE PATCH V10 1/8] ACPI: I/O Remapping Table (IORT) initial support Tomasz Nowicki <tn@semihalf.com> - 2016-09-07 14:00 +0200
      Re: [UPDATE PATCH V10 1/8] ACPI: I/O Remapping Table (IORT) initial  support Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> - 2016-09-08 16:00 +0200
      Re: [UPDATE PATCH V10 1/8] ACPI: I/O Remapping Table (IORT) initial  support Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> - 2016-09-09 11:30 +0200
    Re: [PATCH V10 1/8] ACPI: I/O Remapping Table (IORT) initial support Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> - 2016-09-09 10:50 +0200
  [PATCH V10 2/8] ACPI: Add new IORT functions to support MSI domain handling Tomasz Nowicki <tn@semihalf.com> - 2016-09-06 11:10 +0200
    Re: [PATCH V10 2/8] ACPI: Add new IORT functions to support MSI  domain handling Tomasz Nowicki <tn@semihalf.com> - 2016-09-06 12:30 +0200
      Re: [PATCH V10 2/8] ACPI: Add new IORT functions to support MSI  domain handling Tomasz Nowicki <tn@semihalf.com> - 2016-09-07 12:40 +0200
        Re: [PATCH V10 2/8] ACPI: Add new IORT functions to support MSI  domain handling "Rafael J. Wysocki" <rafael@kernel.org> - 2016-09-07 13:40 +0200
    Re: [PATCH V10 2/8] ACPI: Add new IORT functions to support MSI  domain handling Thomas Gleixner <tglx@linutronix.de> - 2016-09-06 12:30 +0200
    [UPDATE PATCH V10 2/8] ACPI: Add new IORT functions to support MSI domain handling Tomasz Nowicki <tn@semihalf.com> - 2016-09-07 14:00 +0200
      Re: [UPDATE PATCH V10 2/8] ACPI: Add new IORT functions to support  MSI domain handling Tomasz Nowicki <tn@semihalf.com> - 2016-09-07 15:10 +0200
  [PATCH V10 7/8] irqchip/gicv3-its: Factor out PCI-MSI part that might be reused for ACPI Tomasz Nowicki <tn@semihalf.com> - 2016-09-06 11:10 +0200
    Re: [PATCH V10 7/8] irqchip/gicv3-its: Factor out PCI-MSI part that  might be reused for ACPI Thomas Gleixner <tglx@linutronix.de> - 2016-09-06 12:00 +0200
      Re: [PATCH V10 7/8] irqchip/gicv3-its: Factor out PCI-MSI part that  might be reused for ACPI Tomasz Nowicki <tn@semihalf.com> - 2016-09-06 12:30 +0200
        Re: [PATCH V10 7/8] irqchip/gicv3-its: Factor out PCI-MSI part that  might be reused for ACPI "Rafael J. Wysocki" <rafael@kernel.org> - 2016-09-06 13:30 +0200
          Re: [PATCH V10 7/8] irqchip/gicv3-its: Factor out PCI-MSI part that  might be reused for ACPI Tomasz Nowicki <tn@semihalf.com> - 2016-09-07 09:50 +0200
  [PATCH V10 4/8] irqchip/gicv3-its: Cleanup for ITS domain initialization Tomasz Nowicki <tn@semihalf.com> - 2016-09-06 11:20 +0200
  [PATCH V10 8/8] irqchip/gicv3-its: Use MADT ITS subtable to do PCI/MSI domain initialization Tomasz Nowicki <tn@semihalf.com> - 2016-09-06 11:20 +0200
  [PATCH V10 3/8] PCI/MSI: Setup MSI domain on a per-device basis using IORT ACPI table Tomasz Nowicki <tn@semihalf.com> - 2016-09-06 11:20 +0200
  [PATCH V10 5/8] irqchip/gicv3-its: Refactor ITS DT init code to prepare for ACPI Tomasz Nowicki <tn@semihalf.com> - 2016-09-06 11:20 +0200

csiph-web