From patchwork Tue May 31 11:19:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Nowicki X-Patchwork-Id: 9144353 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 BB50D6082F for ; Tue, 31 May 2016 11:20:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AF6A428223 for ; Tue, 31 May 2016 11:20:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A252B281FF; Tue, 31 May 2016 11:20:16 +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=ham 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 7B8ED2820E for ; Tue, 31 May 2016 11:20:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753355AbcEaLUH (ORCPT ); Tue, 31 May 2016 07:20:07 -0400 Received: from mail-lf0-f51.google.com ([209.85.215.51]:34529 "EHLO mail-lf0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753333AbcEaLUD (ORCPT ); Tue, 31 May 2016 07:20:03 -0400 Received: by mail-lf0-f51.google.com with SMTP id k98so88059967lfi.1 for ; Tue, 31 May 2016 04:20:02 -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=hN7DJEJMnSuyGgTbWdXY263t/0GddwH3oh+gC56DEXY=; b=JhibFHmNDcRAZhi/hJ2n/5qw7PLZ1jBAgXZ54oFesaFr9z5SjUkSSX7Y6j/7a+AC6b B1PzXrO7tCdukDSMA+zzacUmptq3Tpf75FHRnez6aqRlT7JMpKyr73mrtiN2oxQlmbFf 6q61mvrHKbVslbpbXGM4wodCR0l69oYTP6HK4/LWrwD2jvD6/MS8QdkD7txC1JZmlsY3 W4T68g6K8GyZDV4zNY9IrvnBxdwTjiq8+CPWYiItz5/URQh+7ihM+trIUwauXiO9CZJS FCvZECpw/lcBlUEMn7s1KkQ64BmEX1Tq8vmhKQrn2kaAksX5ABJ7y4bgUnU964mkrH/4 6LhA== 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=hN7DJEJMnSuyGgTbWdXY263t/0GddwH3oh+gC56DEXY=; b=aqbVQxjsgCQoOxQEqquXWjenEzYYhUOk9c2msqz9iL6cwoRngHw1HcwDu+O79B/XHR 8yXI5gXvQZ/2zhrmYnTkZTXzQ3E1oOVVMkM9TWAv9TkGRVJc1aOcgqAUe+XpMWBaLwK2 YCH5TS1EHp5OUOchAcMoZjIoPruE0ClwEWCy4LbncAdkkLPCAr1zBlTf4cbDtFmrx4Uy wIetmOWijHggPFC53L5+OlDkt8sB5HWMAmI4Tpd06Ty6TsD9xdURvk0wW/bGVQMQBKwt TXf/bWosilsVc4q+thVuW3cNFN5FK7Ekox5YllZkgovg3nhicDPhaH1IcxMjNROnf5NI 1wmQ== X-Gm-Message-State: ALyK8tKn558/IQvMox8U6J0Nf6IlLAsi4rG0TORUQQZlWpz8AUWPRImZdeFyuFSCl/kggQ== X-Received: by 10.25.126.5 with SMTP id z5mr10505632lfc.199.1464693601923; Tue, 31 May 2016 04:20:01 -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 66sm5280056lfz.14.2016.05.31.04.19.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 31 May 2016 04:20:01 -0700 (PDT) From: Tomasz Nowicki To: marc.zyngier@arm.com, tglx@linutronix.de, jason@lakedaemon.net, rjw@rjwysocki.net, lorenzo.pieralisi@arm.com, robert.richter@caviumnetworks.com, shijie.huang@arm.com, Suravee.Suthikulpanit@amd.com, hanjun.guo@linaro.org Cc: al.stone@linaro.org, mw@semihalf.com, graeme.gregory@linaro.org, Catalin.Marinas@arm.com, will.deacon@arm.com, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, ddaney.cavm@gmail.com, okaya@codeaurora.org, andrea.gallo@linaro.org, Tomasz Nowicki Subject: [PATCH V5 2/7] acpi, pci: Setup MSI domain on a per-devices basis. Date: Tue, 31 May 2016 13:19:39 +0200 Message-Id: <1464693584-22343-3-git-send-email-tn@semihalf.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1464693584-22343-1-git-send-email-tn@semihalf.com> References: <1464693584-22343-1-git-send-email-tn@semihalf.com> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@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 --- 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..ba49df7 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_pci_get_msi_rid(pdev, 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_pci_get_domain(pdev, rid); + return dom; } #endif /* CONFIG_PCI_MSI_IRQ_DOMAIN */