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: 9315151 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 7600B607D3 for ; Mon, 5 Sep 2016 20:09:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 67AD7287D5 for ; Mon, 5 Sep 2016 20:09:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5A11528804; Mon, 5 Sep 2016 20:09:23 +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 D79E5287D5 for ; Mon, 5 Sep 2016 20:09:22 +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 1bh0BP-0007yT-3u; Mon, 05 Sep 2016 20:07:55 +0000 Received: from mail-lf0-x22e.google.com ([2a00:1450:4010:c07::22e]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bh0Ay-0007ew-Ur for linux-arm-kernel@lists.infradead.org; Mon, 05 Sep 2016 20:07:30 +0000 Received: by mail-lf0-x22e.google.com with SMTP id h127so29402752lfh.0 for ; Mon, 05 Sep 2016 13:07:08 -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=VQx4wxdNapCpovRqah8SlwLOQ/nA7lnz/DGBbuX558NVyiVCcM/33T5XwNGf9TVs4k oIVndVErU6WZe5BoTzsMTQurwx5DVzLTdM0el3y/HtoSsOqiTbKgMbjFSddOp8634B8Y cDBpQKG+p1cpzLl3UoQoAaUiR9Cgup9L5q4irivHXY2IRwsi1F5J9HOyYjLDnMNA2aPz 1DivRk7ZyXIR38O0Z7tGDBXTul9hIxvWjmTFnqXVSC0VCRWKvNTERkk504vCD1WwxfF0 sJ1iBiY/UcKdNbavVXaCbn0K3sDlh4V5B5+dN/BCarc3LWrAW8YpSEcaWajBL9u3orrG DG7w== X-Gm-Message-State: AE9vXwPwTIZborV+no+pUBfBaof1gBdf1dmeVXTxGjyLA9Kk+tbK5TH0dhMQx5/GDRWMGQ== 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160905_130729_223157_F5FF2F51 X-CRM114-Status: GOOD ( 11.85 ) 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..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 */