From patchwork Tue Sep 6 09:08:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Nowicki X-Patchwork-Id: 9316209 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4507A60B16 for ; Tue, 6 Sep 2016 09:11:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4A1D328C34 for ; Tue, 6 Sep 2016 09:11:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3EB0828B89; Tue, 6 Sep 2016 09:11:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CFD5128C25 for ; Tue, 6 Sep 2016 09:11:39 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bhCOK-0006eN-Hc; Tue, 06 Sep 2016 09:10:04 +0000 Received: from mail-lf0-x22d.google.com ([2a00:1450:4010:c07::22d]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bhCNZ-00062l-Or for linux-arm-kernel@lists.infradead.org; Tue, 06 Sep 2016 09:09:21 +0000 Received: by mail-lf0-x22d.google.com with SMTP id u14so18717032lfd.1 for ; Tue, 06 Sep 2016 02:08:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=PWsfNMN5PkaAHxS3BXQS/eBEFhHeKuE4fTldXRDNVXo=; b=sF7ZPc89WclqfDd9ssGXFeq4q1NWmx+exKE/KZoMx1wnzs7IBSTEvZ0vw+UJkSUkt5 +TUC41scMoT9o1gdzgHGP0c8CuMdQSYZhEbjHVKhPSrELc677rxU5w8WXGYPnsYmiXSB +dP1Vgdm7YNvlTyGt0JeE7+kKYNHZCc/uMW6xU67QkVe3oW3Zw++piaYjXbojJI9rdQk YyTpWULt1NJh9O1SGc79uFh/ouTuYsF5zaB+LSe1CfmUVCLuEzVLmKgpDVr2qXOvM4JC ehyK4ov0DCHmBX783eo2N0Ueb/ZWbVv6DwNpIGd6DsOVoAo1CX9GXcujaq83LVnuZTyC Iq9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=PWsfNMN5PkaAHxS3BXQS/eBEFhHeKuE4fTldXRDNVXo=; b=SHkYJ+Cn8aFiYbd9ydNRC4UJh7W618jVUMvhrnHyvQ4SR5V7YxOGFa+zWK+/m4ZZG6 ZxvPn5O2MRJp9lviRFg5VvRA8iMlUFLHUKleXuLhaMi2P4DmXUmyQ5M83c8upHVpE1Te 0rP+fnQj/Pe6ciZT/k+jtti6+IlgQIuxxSxxgiJy2xVec3VRwh+edCi2xN29ZYIXBH4z ILrgjKMRfHd0w7M9luMxL27p0UpXRq/GPW1mhEvOpZ/ZA2wzHanMcrgfhbzQawjQ6Hgq A7i1QXMUpAR3LwSY1bA/PtlQv+34A2pNJg4CBtCSw9LiHgOJ9rC0irg/K4M/u/bGxddu 7FCA== X-Gm-Message-State: AE9vXwOiMUkmKid+fqlwpNlMi+lbyyl0aaQyRu3APrfrY5D/pwo5samE9RE9JVNSpmdMUg== X-Received: by 10.46.0.93 with SMTP id 90mr1808431lja.39.1473152935575; Tue, 06 Sep 2016 02:08:55 -0700 (PDT) Received: from tn-HP-4.semihalf.local (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.gmail.com with ESMTPSA id 184sm5443301lfz.22.2016.09.06.02.08.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 06 Sep 2016 02:08:54 -0700 (PDT) From: Tomasz Nowicki To: marc.zyngier@arm.com, tglx@linutronix.de, jason@lakedaemon.net, rjw@rjwysocki.net, helgaas@kernel.org, rafael@kernel.org, Lorenzo.Pieralisi@arm.com Subject: [PATCH V10 3/8] PCI/MSI: Setup MSI domain on a per-device basis using IORT ACPI table Date: Tue, 6 Sep 2016 11:08:53 +0200 Message-Id: <1473152938-17388-4-git-send-email-tn@semihalf.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1473152938-17388-1-git-send-email-tn@semihalf.com> References: <1473152938-17388-1-git-send-email-tn@semihalf.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160906_020918_328999_06B6C96B X-CRM114-Status: GOOD ( 12.26 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: graeme.gregory@linaro.org, al.stone@linaro.org, linaro-acpi@lists.linaro.org, catalin.marinas@arm.com, will.deacon@arm.com, linux-kernel@vger.kernel.org, okaya@codeaurora.org, linux-acpi@vger.kernel.org, robert.richter@caviumnetworks.com, hanjun.guo@linaro.org, ddaney.cavm@gmail.com, linux-pci@vger.kernel.org, shijie.huang@arm.com, Tomasz Nowicki , mw@semihalf.com, andrea.gallo@linaro.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Reviewed-by: Hanjun Guo Acked-by: Marc Zyngier Acked-by: Bjorn Helgaas --- 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 98f1222..137b4c5 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -1502,8 +1503,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; } @@ -1519,9 +1520,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 */