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

Groups > linux.kernel > #1178769

[PATCH v3 04/15] PCI/MSI: Add hooks to populate the msi_domain field

Show all headers | View raw

In order to be able to populate the device msi_domain field,
add the necesary hooks to propagate the host bridge msi_domain
across secondary busses to devices.

So far, nobody populates the initial msi_domain.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
 drivers/pci/probe.c | 30 ++++++++++++++++++++++++++++++
 include/linux/pci.h |  1 +
 2 files changed, 31 insertions(+)

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index cefd636..376f6fa 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -661,6 +661,20 @@ static void pci_set_bus_speed(struct pci_bus *bus)
 	}
 }
 
+void __weak pcibios_set_host_bridge_msi_domain(struct pci_bus *bus)
+{
+}
+
+static void pci_set_bus_msi_domain(struct pci_bus *bus)
+{
+	struct pci_dev *bridge = bus->self;
+
+	if (!bridge)
+		pcibios_set_host_bridge_msi_domain(bus);
+	else
+		dev_set_msi_domain(&bus->dev, dev_get_msi_domain(&bridge->dev));
+}
+
 static struct pci_bus *pci_alloc_child_bus(struct pci_bus *parent,
 					   struct pci_dev *bridge, int busnr)
 {
@@ -714,6 +728,7 @@ static struct pci_bus *pci_alloc_child_bus(struct pci_bus *parent,
 	bridge->subordinate = child;
 
 add_dev:
+	pci_set_bus_msi_domain(child);
 	ret = device_register(&child->dev);
 	WARN_ON(ret < 0);
 
@@ -1544,6 +1559,17 @@ static void pci_init_capabilities(struct pci_dev *dev)
 	pci_enable_acs(dev);
 }
 
+static void pci_set_msi_domain(struct pci_dev *dev)
+{
+	/*
+	 * If no domain has been set through the pcibios callback,
+	 * inherit the default from the bus device.
+	 */
+	if (!dev_get_msi_domain(&dev->dev))
+		dev_set_msi_domain(&dev->dev,
+				   dev_get_msi_domain(&dev->bus->dev));
+}
+
 void pci_device_add(struct pci_dev *dev, struct pci_bus *bus)
 {
 	int ret;
@@ -1585,6 +1611,9 @@ void pci_device_add(struct pci_dev *dev, struct pci_bus *bus)
 	ret = pcibios_add_device(dev);
 	WARN_ON(ret < 0);
 
+	/* Setup MSI irq domain */
+	pci_set_msi_domain(dev);
+
 	/* Notifier could use PCI capabilities */
 	dev->match_driver = false;
 	ret = device_add(&dev->dev);
@@ -1975,6 +2004,7 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus,
 	b->bridge = get_device(&bridge->dev);
 	device_enable_async_suspend(b->bridge);
 	pci_set_bus_of_node(b);
+	pci_set_bus_msi_domain(b);
 
 	if (!parent)
 		set_dev_node(b->bridge, pcibus_to_node(b));
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 8a0321a..3622453 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1645,6 +1645,7 @@ int pcibios_set_pcie_reset_state(struct pci_dev *dev,
 int pcibios_add_device(struct pci_dev *dev);
 void pcibios_release_device(struct pci_dev *dev);
 void pcibios_penalize_isa_irq(int irq, int active);
+void pcibios_set_host_bridge_msi_domain(struct pci_bus *bus);
 
 #ifdef CONFIG_HIBERNATE_CALLBACKS
 extern struct dev_pm_ops pcibios_pm_ops;
-- 
2.1.4

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

[PATCH v3 00/15] Introducing per-device MSI domain Marc Zyngier <marc.zyngier@arm.com> - 2015-07-07 19:20 +0200
  [PATCH v3 03/15] device core: Introduce per-device MSI domain pointer Marc Zyngier <marc.zyngier@arm.com> - 2015-07-07 19:20 +0200
  [PATCH v3 02/15] PCI: MSI: Register irq domain with specific token Marc Zyngier <marc.zyngier@arm.com> - 2015-07-07 19:20 +0200
  [PATCH v3 08/15] platform: of: Assign MSI domain to platform device Marc Zyngier <marc.zyngier@arm.com> - 2015-07-07 19:20 +0200
  [PATCH v3 04/15] PCI/MSI: Add hooks to populate the msi_domain field Marc Zyngier <marc.zyngier@arm.com> - 2015-07-07 19:20 +0200
  [PATCH v3 01/15] genirq: irqdomain: Allow irq domain aliasing Marc Zyngier <marc.zyngier@arm.com> - 2015-07-07 19:20 +0200
  [PATCH v3 14/15] PCI/MSI: pci-xgene-msi: Get rid of struct msi_controller Marc Zyngier <marc.zyngier@arm.com> - 2015-07-07 19:20 +0200
  [PATCH v3 09/15] irqchip: gicv3-its: Split PCI/MSI code from the core ITS driver Marc Zyngier <marc.zyngier@arm.com> - 2015-07-07 19:30 +0200
  [PATCH v3 11/15] irqchip: GICv2m: Get rid of struct msi_controller Marc Zyngier <marc.zyngier@arm.com> - 2015-07-07 19:30 +0200
  [PATCH v3 13/15] irqchip: gicv3-its: Make the PCI/MSI code standalone Marc Zyngier <marc.zyngier@arm.com> - 2015-07-07 19:30 +0200
  [PATCH v3 05/15] PCI/MSI: of: Add support for OF-provided msi_domain Marc Zyngier <marc.zyngier@arm.com> - 2015-07-07 19:30 +0200
  [PATCH v3 07/15] PCI/MSI: Let pci_msi_get_domain use struct device's msi_domain Marc Zyngier <marc.zyngier@arm.com> - 2015-07-07 19:30 +0200
  [PATCH v3 06/15] PCI/MSI: of: Allow msi_domain lookup using the host bridge node Marc Zyngier <marc.zyngier@arm.com> - 2015-07-07 19:30 +0200
  [PATCH v3 10/15] irqchip: gicv3-its: Register irq domain with platform MSI token Marc Zyngier <marc.zyngier@arm.com> - 2015-07-07 19:30 +0200
  [PATCH v3 12/15] irqchip: gicv3-its: Get rid of struct msi_controller Marc Zyngier <marc.zyngier@arm.com> - 2015-07-07 19:30 +0200

csiph-web