From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752106AbcGSVmf (ORCPT ); Tue, 19 Jul 2016 17:42:35 -0400 Received: from mail.kernel.org ([198.145.29.136]:54938 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751614AbcGSVmd (ORCPT ); Tue, 19 Jul 2016 17:42:33 -0400 Date: Tue, 19 Jul 2016 16:42:27 -0500 From: Bjorn Helgaas To: Tomasz Nowicki Cc: marc.zyngier@arm.com, tglx@linutronix.de, jason@lakedaemon.net, rjw@rjwysocki.net, bhelgaas@google.com, lorenzo.pieralisi@arm.com, robert.richter@caviumnetworks.com, shijie.huang@arm.com, Suravee.Suthikulpanit@amd.com, hanjun.guo@linaro.org, al.stone@linaro.org, graeme.gregory@linaro.org, Catalin.Marinas@arm.com, will.deacon@arm.com, linux-kernel@vger.kernel.org, okaya@codeaurora.org, linux-acpi@vger.kernel.org, ddaney.cavm@gmail.com, linux-pci@vger.kernel.org, mw@semihalf.com, andrea.gallo@linaro.org, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH V7 3/8] PCI/MSI: Setup MSI domain on a per-device basis using IORT ACPI table Message-ID: <20160719214227.GB18635@localhost> References: <1466420541-20101-1-git-send-email-tn@semihalf.com> <1466420541-20101-4-git-send-email-tn@semihalf.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1466420541-20101-4-git-send-email-tn@semihalf.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 On Mon, Jun 20, 2016 at 01:02:16PM +0200, Tomasz Nowicki wrote: > 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 > Acked-by: Marc Zyngier Acked-by: Bjorn Helgaas I assume this will be merged along with the rest of the series via some non-PCI tree. > --- > 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 > #include > #include > +#include > #include > #include > #include > @@ -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 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel