| Message ID | 1437643598-19795-8-git-send-email-marc.zyngier@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
On Thu, Jul 23, 2015 at 10:26:26AM +0100, Marc Zyngier wrote: > Now that we can easily find which MSI domain a PCI device is > using, use dev_get_msi_domain as a way to retrieve the information. > > The original code is still used as a fallback. > > Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Acked-by: Bjorn Helgaas <bhelgaas@google.com> > --- > drivers/pci/msi.c | 14 ++++++++------ > 1 file changed, 8 insertions(+), 6 deletions(-) > > diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c > index ef4ec6e..da3c607 100644 > --- a/drivers/pci/msi.c > +++ b/drivers/pci/msi.c > @@ -39,14 +39,16 @@ struct irq_domain * __weak arch_get_pci_msi_domain(struct pci_dev *dev) > > static struct irq_domain *pci_msi_get_domain(struct pci_dev *dev) > { > - struct irq_domain *domain = NULL; > + struct irq_domain *domain; > + > + domain = dev_get_msi_domain(&dev->dev); > + if (domain) > + return domain; > > - if (dev->bus->msi) > - domain = dev->bus->msi->domain; > - if (!domain) > - domain = arch_get_pci_msi_domain(dev); > + if (dev->bus->msi && (domain = dev->bus->msi->domain)) > + return domain; > > - return domain; > + return arch_get_pci_msi_domain(dev); > } > > static int pci_msi_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) > -- > 2.1.4 > -- 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
On 07/23/2015 05:26 PM, Marc Zyngier wrote: > Now that we can easily find which MSI domain a PCI device is > using, use dev_get_msi_domain as a way to retrieve the information. > > The original code is still used as a fallback. > > Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> > --- > drivers/pci/msi.c | 14 ++++++++------ > 1 file changed, 8 insertions(+), 6 deletions(-) > > diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c > index ef4ec6e..da3c607 100644 > --- a/drivers/pci/msi.c > +++ b/drivers/pci/msi.c > @@ -39,14 +39,16 @@ struct irq_domain * __weak arch_get_pci_msi_domain(struct pci_dev *dev) > > static struct irq_domain *pci_msi_get_domain(struct pci_dev *dev) > { > - struct irq_domain *domain = NULL; > + struct irq_domain *domain; > + > + domain = dev_get_msi_domain(&dev->dev); > + if (domain) > + return domain; > > - if (dev->bus->msi) > - domain = dev->bus->msi->domain; > - if (!domain) > - domain = arch_get_pci_msi_domain(dev); > + if (dev->bus->msi && (domain = dev->bus->msi->domain)) > + return domain; > > - return domain; > + return arch_get_pci_msi_domain(dev); > } > > static int pci_msi_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) Reviewed-by: Hanjun Guo <hanjun.guo@linaro.org> Thanks Hanjun -- 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
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index ef4ec6e..da3c607 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -39,14 +39,16 @@ struct irq_domain * __weak arch_get_pci_msi_domain(struct pci_dev *dev) static struct irq_domain *pci_msi_get_domain(struct pci_dev *dev) { - struct irq_domain *domain = NULL; + struct irq_domain *domain; + + domain = dev_get_msi_domain(&dev->dev); + if (domain) + return domain; - if (dev->bus->msi) - domain = dev->bus->msi->domain; - if (!domain) - domain = arch_get_pci_msi_domain(dev); + if (dev->bus->msi && (domain = dev->bus->msi->domain)) + return domain; - return domain; + return arch_get_pci_msi_domain(dev); } static int pci_msi_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
Now that we can easily find which MSI domain a PCI device is using, use dev_get_msi_domain as a way to retrieve the information. The original code is still used as a fallback. Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> --- drivers/pci/msi.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)