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

Groups > linux.kernel > #1420953

[PATCH V6 2/7] PCI/MSI: Setup MSI domain on a per-devices 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>
---
 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 a080f44..1d45e81 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -18,6 +18,7 @@
 #include <linux/smp.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/iort.h>
 #include <linux/slab.h>
 #include <linux/irqdomain.h>
 #include <linux/of_irq.h>
@@ -1364,8 +1365,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;
 }
@@ -1381,9 +1382,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 V6 0/7] Introduce ACPI world to ITS irqchip Tomasz Nowicki <tn@semihalf.com> - 2016-06-13 16:50 +0200
  [PATCH V6 1/7] ACPI: I/O Remapping Table (IORT) initial support Tomasz Nowicki <tn@semihalf.com> - 2016-06-13 16:50 +0200
    Re: [PATCH V6 1/7] ACPI: I/O Remapping Table (IORT) initial support Marc Zyngier <marc.zyngier@arm.com> - 2016-06-15 10:40 +0200
      Re: [PATCH V6 1/7] ACPI: I/O Remapping Table (IORT) initial support Tomasz Nowicki <tn@semihalf.com> - 2016-06-17 16:10 +0200
    Re: [PATCH V6 1/7] ACPI: I/O Remapping Table (IORT) initial support Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> - 2016-06-15 13:10 +0200
      Re: [PATCH V6 1/7] ACPI: I/O Remapping Table (IORT) initial support Tomasz Nowicki <tn@semihalf.com> - 2016-06-15 15:30 +0200
      Re: [PATCH V6 1/7] ACPI: I/O Remapping Table (IORT) initial support Tomasz Nowicki <tn@semihalf.com> - 2016-06-20 11:40 +0200
    Re: [PATCH V6 1/7] ACPI: I/O Remapping Table (IORT) initial support Sinan Kaya <okaya@codeaurora.org> - 2016-06-15 15:30 +0200
      Re: [PATCH V6 1/7] ACPI: I/O Remapping Table (IORT) initial support Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> - 2016-06-15 15:40 +0200
        Re: [PATCH V6 1/7] ACPI: I/O Remapping Table (IORT) initial support Sinan Kaya <okaya@codeaurora.org> - 2016-06-15 15:50 +0200
          Re: [PATCH V6 1/7] ACPI: I/O Remapping Table (IORT) initial support Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> - 2016-06-15 16:20 +0200
            Re: [PATCH V6 1/7] ACPI: I/O Remapping Table (IORT) initial support Sinan Kaya <okaya@codeaurora.org> - 2016-06-15 16:50 +0200
  [PATCH V6 2/7] PCI/MSI: Setup MSI domain on a per-devices basis using IORT ACPI table Tomasz Nowicki <tn@semihalf.com> - 2016-06-13 16:50 +0200
    Re: [PATCH V6 2/7] PCI/MSI: Setup MSI domain on a per-devices basis  using IORT ACPI table Marc Zyngier <marc.zyngier@arm.com> - 2016-06-15 10:40 +0200
  [PATCH V6 5/7] irqchip/gicv3-its: Probe ITS in the ACPI way Tomasz Nowicki <tn@semihalf.com> - 2016-06-13 16:50 +0200
    Re: [PATCH V6 5/7] irqchip/gicv3-its: Probe ITS in the ACPI way Marc Zyngier <marc.zyngier@arm.com> - 2016-06-15 11:00 +0200
  [PATCH V6 4/7] irqchip/gicv3-its: Refator ITS DT init code to prepare for ACPI Tomasz Nowicki <tn@semihalf.com> - 2016-06-13 16:50 +0200
    Re: [PATCH V6 4/7] irqchip/gicv3-its: Refator ITS DT init code to  prepare for ACPI Marc Zyngier <marc.zyngier@arm.com> - 2016-06-15 11:00 +0200
  Re: [PATCH V6 0/7] Introduce ACPI world to ITS irqchip Marc Zyngier <marc.zyngier@arm.com> - 2016-06-15 11:20 +0200
    Re: [PATCH V6 0/7] Introduce ACPI world to ITS irqchip Tomasz Nowicki <tn@semihalf.com> - 2016-06-15 11:40 +0200

csiph-web