From patchwork Mon Sep 5 20:05:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Nowicki X-Patchwork-Id: 9315183 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 A3D79607D3 for ; Mon, 5 Sep 2016 20:12:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 96E6628904 for ; Mon, 5 Sep 2016 20:12:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8B5ED288E4; Mon, 5 Sep 2016 20:12:25 +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.4 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, 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 E7B8B288E4 for ; Mon, 5 Sep 2016 20:12:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935920AbcIEUIN (ORCPT ); Mon, 5 Sep 2016 16:08:13 -0400 Received: from mail-lf0-f41.google.com ([209.85.215.41]:35626 "EHLO mail-lf0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935915AbcIEUHI (ORCPT ); Mon, 5 Sep 2016 16:07:08 -0400 Received: by mail-lf0-f41.google.com with SMTP id l131so39049500lfl.2 for ; Mon, 05 Sep 2016 13:07:07 -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=x+T6TpF6CHakguN5+VheRX6cmOcxUePz7erd0FUlHqo=; b=cb5N8a30Nx0dFTZJVs3xTDWQ2+auH2Rp/KlMY5C5aEIIfb73y6t0berUiwgi1WaMI8 HSrt/fHWDE5Od6kWxocW02DoQOzLUtflJ+0fztMMZmcOx5suQC/mT1cXS1qhzPjACage Kin2JXcB6mEpUBxcITcei1qI1eVBU7DaLxnMgvTkZZV/gHyyLN70HroAygP5kJ3vnLwc U3Btlz30pnlqkEFXHW5Ej35hsYsQqIjHyue5PzfcNGhQSLRPbn7WpDifgMJi2dboMcR9 xkmwrAaObZeYy4OYPKqXY3/5tAmHQTTDRXTOy5R9mEO5e7Wgrw7pxqXccIALZj1Z/7Wx 0RxA== 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=x+T6TpF6CHakguN5+VheRX6cmOcxUePz7erd0FUlHqo=; b=VoJ+MQhAiCeiFWqfU0z4aPctW2g4g6DeP6h1WARYLkw5UIo2IxfVUZimTWQd+fqoHU wFatyWsNR+XGIoLm2YX8tXdKqpQD8SiYcdYajOxD5rmL95oOOzc/5pdlXwYsn7SKVE7D 4cMG6w2EnM4PPRoPoEqsTEzW5/qRer9UMsv5UQax059bnrAt97gaWBmPfXxuxXiellCp AfkSi7Uin9/Hg0mV+1z0mZv6A4J2QGEN9EsJ+ctzTzh9exvylgLYh1TJu6KcEWQmU9sQ O8hOEI4MhaNiOyW1ARlKipjeqVDMRROQa5I3dwXWlEVSjUH1EjAAsc8reXpkKyFLIqzr +D6A== X-Gm-Message-State: AE9vXwMkALXW/w1r7SZuvjHmy1M37s9SfcbpaG6sQlg7JMGMO82wrrXaDgQ3cD8WEq2N8A== X-Received: by 10.25.215.82 with SMTP id o79mr10987431lfg.132.1473106026447; Mon, 05 Sep 2016 13:07:06 -0700 (PDT) Received: from localhost.localdomain (50-233-148-156-static.hfc.comcastbusiness.net. [50.233.148.156]) by smtp.gmail.com with ESMTPSA id p82sm5068405lfd.15.2016.09.05.13.06.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 05 Sep 2016 13:07:05 -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 V9 3/8] PCI/MSI: Setup MSI domain on a per-device basis using IORT ACPI table Date: Mon, 5 Sep 2016 22:05:35 +0200 Message-Id: <1473105940-9761-4-git-send-email-tn@semihalf.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1473105940-9761-1-git-send-email-tn@semihalf.com> References: <1473105940-9761-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..37f253a 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 */