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: 9316267 X-Patchwork-Delegate: bhelgaas@google.com 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 837D4601C0 for ; Tue, 6 Sep 2016 09:31:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7A1CE28C2E for ; Tue, 6 Sep 2016 09:31:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6EAE528C31; Tue, 6 Sep 2016 09:31:35 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 702B428C2E for ; Tue, 6 Sep 2016 09:31:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755991AbcIFJLd (ORCPT ); Tue, 6 Sep 2016 05:11:33 -0400 Received: from mail-lf0-f45.google.com ([209.85.215.45]:35294 "EHLO mail-lf0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933688AbcIFJI5 (ORCPT ); Tue, 6 Sep 2016 05:08:57 -0400 Received: by mail-lf0-f45.google.com with SMTP id l131so47782075lfl.2 for ; Tue, 06 Sep 2016 02:08:56 -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=fvQ74IqVtASeeXvxuttqT7KY8CH7kGGa8yxjRcYyROl4z34FKizcbMFrDD++PiEW9q LGTFVDKBcsfBy/9qWaxIM0pSkuKWRf3wsJP8pGmjV8aeMJ4FZJvR43OhGNPc2uugbLZO hrGuMuBYj6uR6wtR9/vtcFx2IRTlQV4+ri+beAcvCC39pemr6K3pyZ5AYnSAamku9QXE WhY+95xcWWdCKnAK611ktJtZx2W0bSEB75mBkTeMhPInyw6hVwiHXltjWNXahVzPyYr0 z1gaHrtax5qcVrrWa5harqllvVHkJvzwGY6O76tBtlOUo9JkvpO42b7827Ct5IbdVrIA LMHQ== X-Gm-Message-State: AE9vXwMk96xfjjFIinxsoS9hIGgcB3ZKk1GOZFgj28nk9k0lMxZ0IEsRw5IhWvOuxhN+Ag== 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 Cc: will.deacon@arm.com, catalin.marinas@arm.com, hanjun.guo@linaro.org, shijie.huang@arm.com, robert.richter@caviumnetworks.com, mw@semihalf.com, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linaro-acpi@lists.linaro.org, andrea.gallo@linaro.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, al.stone@linaro.org, graeme.gregory@linaro.org, ddaney.cavm@gmail.com, okaya@codeaurora.org, Tomasz Nowicki 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> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.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 */