From: Marc Zyngier <marc.zyngier@arm.com>
To: Bjorn Helgaas <bhelgaas@google.com>,
Thomas Gleixner <tglx@linutronix.de>,
Jiang Liu <jiang.liu@linux.intel.com>,
Jason Cooper <jason@lakedaemon.net>
Cc: <linux-arm-kernel@lists.infradead.org>,
<linux-pci@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
Yijing Wang <wangyijing@huawei.com>, Ma Jun <majun258@huawei.com>,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Duc Dang <dhdang@apm.com>
Subject: [PATCH v4 04/19] PCI/MSI: Add hooks to populate the msi_domain field
Date: Wed, 15 Jul 2015 13:16:38 +0100 [thread overview]
Message-ID: <1436962613-17359-5-git-send-email-marc.zyngier@arm.com> (raw)
In-Reply-To: <1436962613-17359-1-git-send-email-marc.zyngier@arm.com>
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 fbf245f..fe0825f 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1644,6 +1644,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
next prev parent reply other threads:[~2015-07-15 12:21 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-15 12:16 [PATCH v4 00/19] Per-device MSI domain & platform MSI Marc Zyngier
2015-07-15 12:16 ` [PATCH v4 01/19] genirq: irqdomain: Allow irq domain aliasing Marc Zyngier
2015-07-15 12:16 ` [PATCH v4 02/19] PCI: MSI: Register irq domain with specific token Marc Zyngier
2015-07-15 12:16 ` [PATCH v4 03/19] device core: Introduce per-device MSI domain pointer Marc Zyngier
2015-07-15 12:16 ` Marc Zyngier [this message]
2015-07-21 21:19 ` [PATCH v4 04/19] PCI/MSI: Add hooks to populate the msi_domain field Bjorn Helgaas
2015-07-21 21:26 ` Bjorn Helgaas
2015-07-22 14:42 ` Marc Zyngier
2015-07-22 14:48 ` Bjorn Helgaas
2015-07-22 14:54 ` Marc Zyngier
2015-07-22 16:53 ` Bjorn Helgaas
2015-07-22 17:42 ` Marc Zyngier
2015-07-15 12:16 ` [PATCH v4 05/19] PCI/MSI: of: Add support for OF-provided msi_domain Marc Zyngier
2015-07-21 21:30 ` Bjorn Helgaas
2015-07-15 12:16 ` [PATCH v4 06/19] PCI/MSI: of: Allow msi_domain lookup using the host bridge node Marc Zyngier
2015-07-15 12:16 ` [PATCH v4 07/19] PCI/MSI: Let pci_msi_get_domain use struct device's msi_domain Marc Zyngier
2015-07-21 21:17 ` Bjorn Helgaas
2015-07-22 15:19 ` Marc Zyngier
2015-07-15 12:16 ` [PATCH v4 08/19] platform: of: Assign MSI domain to platform device Marc Zyngier
2015-07-15 12:16 ` [PATCH v4 09/19] drivers: base: Add MSI domain support for non-PCI devices Marc Zyngier
2015-07-20 2:33 ` majun (F)
2015-07-20 7:54 ` Marc Zyngier
2015-07-15 12:16 ` [PATCH v4 10/19] genirq: Add DOMAIN_BUS_NEXUS irqdomain property Marc Zyngier
2015-07-15 12:16 ` [PATCH v4 11/19] irqchip: gicv3-its: Split PCI/MSI code from the core ITS driver Marc Zyngier
2015-07-15 12:16 ` [PATCH v4 12/19] irqchip: gicv3-its: Register irq domain with NEXUS token Marc Zyngier
2015-07-15 12:16 ` [PATCH v4 13/19] irqchip: gicv3-its: Get rid of struct msi_controller Marc Zyngier
2015-07-15 12:16 ` [PATCH v4 14/19] irqchip: gicv3-its: Make the PCI/MSI code standalone Marc Zyngier
2015-07-15 12:16 ` [PATCH v4 15/19] irqchip: gicv3-its: Add platform MSI support Marc Zyngier
2015-07-15 12:16 ` [PATCH v4 16/19] irqchip: GICv2m: Get rid of struct msi_controller Marc Zyngier
2015-07-15 12:16 ` [PATCH v4 17/19] irqchip: GICv2m: Add platform MSI support Marc Zyngier
2015-07-15 12:16 ` [PATCH v4 18/19] PCI/MSI: pci-xgene-msi: Get rid of struct msi_controller Marc Zyngier
2015-07-15 12:16 ` [PATCH v4 19/19] PCI/MSI: Drop domain field from msi_controller Marc Zyngier
2015-07-21 21:37 ` Bjorn Helgaas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1436962613-17359-5-git-send-email-marc.zyngier@arm.com \
--to=marc.zyngier@arm.com \
--cc=bhelgaas@google.com \
--cc=dhdang@apm.com \
--cc=jason@lakedaemon.net \
--cc=jiang.liu@linux.intel.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=majun258@huawei.com \
--cc=tglx@linutronix.de \
--cc=wangyijing@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®