From patchwork Fri Oct 2 00:50:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Daney X-Patchwork-Id: 7312361 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D17A7BEEA4 for ; Fri, 2 Oct 2015 00:51:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 059B2207B6 for ; Fri, 2 Oct 2015 00:51:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2989C207B1 for ; Fri, 2 Oct 2015 00:51:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751701AbbJBAvj (ORCPT ); Thu, 1 Oct 2015 20:51:39 -0400 Received: from mail-ig0-f175.google.com ([209.85.213.175]:35198 "EHLO mail-ig0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751265AbbJBAuj (ORCPT ); Thu, 1 Oct 2015 20:50:39 -0400 Received: by igbkq10 with SMTP id kq10so7269813igb.0; Thu, 01 Oct 2015 17:50:38 -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=O+1tQiwqIm4Vmj4BmViuUuNwRrjE1TvMwInKcuvhZiU=; b=fwmzrlEyJhp2hxglml7SiWhwMXMAlcJ9eFecMmaXy1hxqG9o4Bcxmjp5q3YHNXa/+s NmQIl/8Eq1oDiaiLPYs14V27YkDnE6H/px58YRaOnbtEBn0p2x4j2zw0sXYquyL1t4Kt YbxLXnGMiyUD/vCuC1l+XJHcgCblRRBfOnJAfhGwcl64dLJ8wXFPVimm2vL1xqi5xvgk bpQaKUprOjUnjNC2+E27ffl5Ea83y067vgMP2f+GrH1XOG4JB1phlU1gEi8WwTjjZZC0 3DO6P0L7Y88kBHs6kuU6pVljiq//cbBaBOOG+7O5saKOwVWVkLwokwwJF59RmxQc8ntw DU1w== X-Received: by 10.50.50.137 with SMTP id c9mr1614991igo.23.1443747038647; Thu, 01 Oct 2015 17:50:38 -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 e19sm2532828igo.14.2015.10.01.17.50.35 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 01 Oct 2015 17:50:37 -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 t920oYur009972; Thu, 1 Oct 2015 17:50:34 -0700 Received: (from ddaney@localhost) by dl.caveonetworks.com (8.14.5/8.14.5/Submit) id t920oYfo009971; Thu, 1 Oct 2015 17:50:34 -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 v4 4/4] irqchip/gic-v3-its: Add handling of PCI requester id. Date: Thu, 1 Oct 2015 17:50:25 -0700 Message-Id: <1443747025-9918-5-git-send-email-ddaney.cavm@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1443747025-9918-1-git-send-email-ddaney.cavm@gmail.com> References: <1443747025-9918-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 X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: David Daney Replace open coded generation PCI/MSI requester id with call to the new function pci_msi_domain_get_msi_rid() which applies the "msi-map" to the id value. Signed-off-by: David Daney Reviewed-by: Marc Zyngier --- drivers/irqchip/irq-gic-v3-its-pci-msi.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/irqchip/irq-gic-v3-its-pci-msi.c b/drivers/irqchip/irq-gic-v3-its-pci-msi.c index cf351c6..7bbf64a 100644 --- a/drivers/irqchip/irq-gic-v3-its-pci-msi.c +++ b/drivers/irqchip/irq-gic-v3-its-pci-msi.c @@ -42,7 +42,6 @@ static struct irq_chip its_msi_irq_chip = { struct its_pci_alias { struct pci_dev *pdev; - u32 dev_id; u32 count; }; @@ -60,7 +59,6 @@ static int its_get_pci_alias(struct pci_dev *pdev, u16 alias, void *data) { struct its_pci_alias *dev_alias = data; - dev_alias->dev_id = alias; if (pdev != dev_alias->pdev) dev_alias->count += its_pci_msi_vec_count(dev_alias->pdev); @@ -86,7 +84,7 @@ static int its_pci_msi_prepare(struct irq_domain *domain, struct device *dev, pci_for_each_dma_alias(pdev, its_get_pci_alias, &dev_alias); /* ITS specific DeviceID, as the core ITS ignores dev. */ - info->scratchpad[0].ul = dev_alias.dev_id; + info->scratchpad[0].ul = pci_msi_domain_get_msi_rid(domain, pdev); return msi_info->ops->msi_prepare(domain->parent, dev, dev_alias.count, info);