Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967175AbbLPWPr (ORCPT ); Wed, 16 Dec 2015 17:15:47 -0500 Received: from mail.kernel.org ([198.145.29.136]:54394 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966011AbbLPWPo (ORCPT ); Wed, 16 Dec 2015 17:15:44 -0500 Date: Wed, 16 Dec 2015 16:15:41 -0600 From: Bjorn Helgaas To: Suravee Suthikulpanit Cc: marc.zyngier@arm.com, tglx@linutronix.de, jason@lakedaemon.net, rjw@rjwysocki.net, bhelgaas@google.com, Lorenzo Pieralisi , Will Deacon , Catalin Marinas , hanjun.guo@linaro.org, tomasz.nowicki@linaro.org, graeme.gregory@linaro.org, dhdang@apm.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, linux-pci@vger.kernel.org Subject: Re: [PATCH v7 1/4] acpi: pci: Setup MSI domain for ACPI based pci devices Message-ID: <20151216221541.GA31633@localhost> References: <1449766530-16935-1-git-send-email-Suravee.Suthikulpanit@amd.com> <1449766530-16935-2-git-send-email-Suravee.Suthikulpanit@amd.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1449766530-16935-2-git-send-email-Suravee.Suthikulpanit@amd.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5203 Lines: 148 On Thu, Dec 10, 2015 at 08:55:27AM -0800, Suravee Suthikulpanit wrote: > This patch introduces pci_msi_register_fwnode_provider() for irqchip > to register a callback, to provide a way to determine appropriate MSI > domain for a pci device. > > It also introduces pci_host_bridge_acpi_msi_domain(), which returns > the MSI domain of the specified PCI host bridge with DOMAIN_BUS_PCI_MSI > bus token. Then, it is assigned to pci device. > > Reviewed-by: Marc Zyngier > Cc: Bjorn Helgaas > Cc: Rafael J. Wysocki > Signed-off-by: Suravee Suthikulpanit Acked-by: Bjorn Helgaas I assume the whole series will be queued via a non-PCI tree. > --- > drivers/pci/pci-acpi.c | 42 ++++++++++++++++++++++++++++++++++++++++++ > drivers/pci/probe.c | 2 ++ > include/linux/irqdomain.h | 5 +++++ > include/linux/pci.h | 10 ++++++++++ > 4 files changed, 59 insertions(+) > > diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c > index a32ba75..d3f32d6 100644 > --- a/drivers/pci/pci-acpi.c > +++ b/drivers/pci/pci-acpi.c > @@ -9,7 +9,9 @@ > > #include > #include > +#include > #include > +#include > #include > #include > #include > @@ -689,6 +691,46 @@ static struct acpi_bus_type acpi_pci_bus = { > .cleanup = pci_acpi_cleanup, > }; > > + > +static struct fwnode_handle *(*pci_msi_get_fwnode_cb)(struct device *dev); > + > +/** > + * pci_msi_register_fwnode_provider - Register callback to retrieve fwnode > + * @fn: Callback matching a device to a fwnode that identifies a PCI > + * MSI domain. > + * > + * This should be called by irqchip driver, which is the parent of > + * the MSI domain to provide callback interface to query fwnode. > + */ > +void > +pci_msi_register_fwnode_provider(struct fwnode_handle *(*fn)(struct device *)) > +{ > + pci_msi_get_fwnode_cb = fn; > +} > + > +/** > + * pci_host_bridge_acpi_msi_domain - Retrieve MSI domain of a PCI host bridge > + * @bus: The PCI host bridge bus. > + * > + * This function uses the callback function registered by > + * pci_msi_register_fwnode_provider() to retrieve the irq_domain with > + * type DOMAIN_BUS_PCI_MSI of the specified host bridge bus. > + * This returns NULL on error or when the domain is not found. > + */ > +struct irq_domain *pci_host_bridge_acpi_msi_domain(struct pci_bus *bus) > +{ > + struct fwnode_handle *fwnode; > + > + if (!pci_msi_get_fwnode_cb) > + return NULL; > + > + fwnode = pci_msi_get_fwnode_cb(&bus->dev); > + if (!fwnode) > + return NULL; > + > + return irq_find_matching_fwnode(fwnode, DOMAIN_BUS_PCI_MSI); > +} > + > static int __init acpi_pci_init(void) > { > int ret; > diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c > index edb1984..553a029 100644 > --- a/drivers/pci/probe.c > +++ b/drivers/pci/probe.c > @@ -672,6 +672,8 @@ static struct irq_domain *pci_host_bridge_msi_domain(struct pci_bus *bus) > * should be called from here. > */ > d = pci_host_bridge_of_msi_domain(bus); > + if (!d) > + d = pci_host_bridge_acpi_msi_domain(bus); > > return d; > } > diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h > index d5e5c5b..a06feda 100644 > --- a/include/linux/irqdomain.h > +++ b/include/linux/irqdomain.h > @@ -410,6 +410,11 @@ static inline bool irq_domain_is_hierarchy(struct irq_domain *domain) > static inline void irq_dispose_mapping(unsigned int virq) { } > static inline void irq_domain_activate_irq(struct irq_data *data) { } > static inline void irq_domain_deactivate_irq(struct irq_data *data) { } > +static inline struct irq_domain *irq_find_matching_fwnode( > + struct fwnode_handle *fwnode, enum irq_domain_bus_token bus_token) > +{ > + return NULL; > +} > #endif /* !CONFIG_IRQ_DOMAIN */ > > #endif /* _LINUX_IRQDOMAIN_H */ > diff --git a/include/linux/pci.h b/include/linux/pci.h > index 6ae25aa..d86378c 100644 > --- a/include/linux/pci.h > +++ b/include/linux/pci.h > @@ -1946,6 +1946,16 @@ static inline struct irq_domain * > pci_host_bridge_of_msi_domain(struct pci_bus *bus) { return NULL; } > #endif /* CONFIG_OF */ > > +#ifdef CONFIG_ACPI > +struct irq_domain *pci_host_bridge_acpi_msi_domain(struct pci_bus *bus); > + > +void > +pci_msi_register_fwnode_provider(struct fwnode_handle *(*fn)(struct device *)); > +#else > +static inline struct irq_domain * > +pci_host_bridge_acpi_msi_domain(struct pci_bus *bus) { return NULL; } > +#endif > + > #ifdef CONFIG_EEH > static inline struct eeh_dev *pci_dev_to_eeh_dev(struct pci_dev *pdev) > { > -- > 2.1.0 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-pci" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- 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/