From patchwork Thu Oct 8 22:10:49 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Daney X-Patchwork-Id: 527998 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id E08691402A8 for ; Fri, 9 Oct 2015 09:11:35 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=Ds1U+KXH; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934596AbbJHWLP (ORCPT ); Thu, 8 Oct 2015 18:11:15 -0400 Received: from mail-io0-f179.google.com ([209.85.223.179]:35669 "EHLO mail-io0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754365AbbJHWLB (ORCPT ); Thu, 8 Oct 2015 18:11:01 -0400 Received: by ioiz6 with SMTP id z6so73489773ioi.2; Thu, 08 Oct 2015 15:11:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=wMfu2QQIaLc3GkT1vtm2oWBKD+nA27wXFAypOiIOug4=; b=Ds1U+KXHcBgR1VufjMHrzANjM9F4gtjpnfDtkrLu+mbQ9JlQGAdVYBBC30e5kC2p4n t8+OBMhfooSX42FtArh7Fkb2yzJjA4BvbYjrL2bcsa1ep1iCRd8ee3B/VmXkKB47xocn SBVFO5cTdUYSKNu0vS+w6m4W496kIaQY9h5r79BU/GoscqpG/KEvQCTdGP+oBpuUj3Ac V+ejx2B7GSqBW0YVMnbV5pdoBBT+tUlhxj0+uJElct1zXCH3o6xeONG2pLi8U+V0jUWD PkiokU6U6Xt+kNTwBTjjjCgUnIvnavBINnDCexsLXN6q8V6/Th5XMeLV8rC2SOVLajEQ Sa7A== X-Received: by 10.107.130.217 with SMTP id m86mr13442434ioi.22.1444342260950; Thu, 08 Oct 2015 15:11:00 -0700 (PDT) Received: from dl.caveonetworks.com (64.2.3.194.ptr.us.xo.net. [64.2.3.194]) by smtp.gmail.com with ESMTPSA id y186sm154965iod.18.2015.10.08.15.10.55 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 08 Oct 2015 15:10:58 -0700 (PDT) Received: from dl.caveonetworks.com (localhost.localdomain [127.0.0.1]) by dl.caveonetworks.com (8.14.5/8.14.5) with ESMTP id t98MAsxS006246; Thu, 8 Oct 2015 15:10:54 -0700 Received: (from ddaney@localhost) by dl.caveonetworks.com (8.14.5/8.14.5/Submit) id t98MAsUh006245; Thu, 8 Oct 2015 15:10:54 -0700 From: David Daney To: linux-kernel@vger.kernel.org, Will Deacon , Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, Marc Zyngier , Grant Likely , Thomas Gleixner , Jason Cooper , Frank Rowand , Bjorn Helgaas , linux-pci@vger.kernel.org Cc: David Daney Subject: [PATCH v5 3/4] PCI/MSI: Add helper function pci_msi_domain_get_msi_rid(). Date: Thu, 8 Oct 2015 15:10:49 -0700 Message-Id: <1444342250-6196-4-git-send-email-ddaney.cavm@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1444342250-6196-1-git-send-email-ddaney.cavm@gmail.com> References: <1444342250-6196-1-git-send-email-ddaney.cavm@gmail.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: David Daney Add pci_msi_domain_get_msi_rid() to return the MSI requester id (RID). Initially needed by gic-v3 based systems. It will be used by follow on patch to drivers/irqchip/irq-gic-v3-its-pci-msi.c Initially supports mapping the RID via OF device tree. In the future, this could be extended to use ACPI _IORT tables as well. Reviewed-by: Marc Zyngier Signed-off-by: David Daney Acked-by: Bjorn Helgaas --- drivers/pci/msi.c | 30 ++++++++++++++++++++++++++++++ include/linux/msi.h | 1 + 2 files changed, 31 insertions(+) diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index d449714..81a2798 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -20,6 +20,7 @@ #include #include #include +#include #include "pci.h" @@ -1327,4 +1328,33 @@ struct irq_domain *pci_msi_create_default_irq_domain(struct device_node *node, return domain; } + +static int get_msi_id_cb(struct pci_dev *pdev, u16 alias, void *data) +{ + u32 *pa = data; + + *pa = alias; + return 0; +} +/** + * pci_msi_domain_get_msi_rid - Get the MSI requester id (RID) + * @domain: The interrupt domain + * @pdev: The PCI device. + * + * The RID for a device is formed from the alias, with a firmware + * supplied mapping applied + * + * Returns: The RID. + */ +u32 pci_msi_domain_get_msi_rid(struct irq_domain *domain, struct pci_dev *pdev) +{ + u32 rid = 0; + + pci_for_each_dma_alias(pdev, get_msi_id_cb, &rid); + + if (domain->of_node) + rid = of_msi_map_rid(&pdev->dev, domain->of_node, rid); + + return rid; +} #endif /* CONFIG_PCI_MSI_IRQ_DOMAIN */ diff --git a/include/linux/msi.h b/include/linux/msi.h index ad939d0..56e3b76 100644 --- a/include/linux/msi.h +++ b/include/linux/msi.h @@ -293,6 +293,7 @@ irq_hw_number_t pci_msi_domain_calc_hwirq(struct pci_dev *dev, struct msi_desc *desc); int pci_msi_domain_check_cap(struct irq_domain *domain, struct msi_domain_info *info, struct device *dev); +u32 pci_msi_domain_get_msi_rid(struct irq_domain *domain, struct pci_dev *pdev); #endif /* CONFIG_PCI_MSI_IRQ_DOMAIN */ #endif /* LINUX_MSI_H */