From patchwork Thu Aug 11 10:06:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Nowicki X-Patchwork-Id: 9274943 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 E982560CDC for ; Thu, 11 Aug 2016 10:08:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DA2D5285E7 for ; Thu, 11 Aug 2016 10:08:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CEE0D285EA; Thu, 11 Aug 2016 10:08:45 +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 2C7AF285E9 for ; Thu, 11 Aug 2016 10:08:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932787AbcHKKI0 (ORCPT ); Thu, 11 Aug 2016 06:08:26 -0400 Received: from mail-wm0-f43.google.com ([74.125.82.43]:36739 "EHLO mail-wm0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752796AbcHKKGv (ORCPT ); Thu, 11 Aug 2016 06:06:51 -0400 Received: by mail-wm0-f43.google.com with SMTP id q128so20117413wma.1 for ; Thu, 11 Aug 2016 03:06:50 -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=YnNEcUPbyjkF7tPZS6bqYJbRlNWbKrcLQmWKNHBXtbU=; b=jmH2SZ0qpwhN10KlWHDed+OohqvGvfQP7qpOhoI/4gN9mIUA6s4hjLm2XcwfBkNbq9 f0DSO+kkHaY4beqM1AyaIAb2jPLicXuH+jCr7BIwJIfR+VeUnXSlvgRgntUff6kcGaml zo8hiXVMlbJ5EgmcBjLv/1Fb5mXzm/IL1R0HXZjBrP1URy7oW+kpSyD0eY2xFOxb7QR7 gSuibOcJ2QefZ3j8WxYxJKazD1Vilq/d1qEMv+KM8BVpSQROgSTZfjkr3Fjoz/DUnrJ1 sXzXpN9JKlTmAzGfYuugj7I0qo+Vn8/T+AdJGfZMLTXf3TMWy3HW9KKVK6Xh61UaWbfR pAAw== 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=YnNEcUPbyjkF7tPZS6bqYJbRlNWbKrcLQmWKNHBXtbU=; b=D01xW9ZFW67NEsmkstvwjSqGLWWhDbBfitUhH867zpG+rupBeVIoDQw5axyIjcnUjH Yr2BKIAMzmMEFz2YHaviV4mHKXc2aYA3bu2b4Ajo0Fj7+bbmtFLqpcJFaF630duopypb cxsgNfUesRBeQG5744SGEpQiq8bzmxXMZZD8TJpvotP1rxsBxsqQlF4Wmqa/q+5fwUpv 2be0wFj2hgqfUjMCUNIqlYIVmFWhix49dzNnEug93BjcSRx4B5xedFACXiOghPVQpSSs mC2p5394EfvrlOHn986pKaDmuAEnFZlkJLTM5PZv5CK/JBGWJkK5Vh0JYnfNKOSsh5BZ DVXQ== X-Gm-Message-State: AEkoous00XB8n/6+lYkNy7Fecr+8qPmqwOB4tlt/qWyLetqMgdsnPpNGWYC8J8aDHyNWeA== X-Received: by 10.25.210.75 with SMTP id j72mr1373205lfg.4.1470910009817; Thu, 11 Aug 2016 03:06:49 -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 p21sm448233lfp.4.2016.08.11.03.06.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 11 Aug 2016 03:06:48 -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 V8 3/8] PCI/MSI: Setup MSI domain on a per-device basis using IORT ACPI table Date: Thu, 11 Aug 2016 12:06:33 +0200 Message-Id: <1470909998-16710-4-git-send-email-tn@semihalf.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1470909998-16710-1-git-send-email-tn@semihalf.com> References: <1470909998-16710-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 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 a02981e..7bb981a 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -1498,8 +1499,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; } @@ -1515,9 +1516,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 */