From patchwork Thu Oct 8 22:10:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Daney X-Patchwork-Id: 7356711 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 45A40BEEA4 for ; Thu, 8 Oct 2015 22:12:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 81536207B3 for ; Thu, 8 Oct 2015 22:12:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0E4C5207B9 for ; Thu, 8 Oct 2015 22:12:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934601AbbJHWLk (ORCPT ); Thu, 8 Oct 2015 18:11:40 -0400 Received: from mail-io0-f182.google.com ([209.85.223.182]:36454 "EHLO mail-io0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933120AbbJHWLA (ORCPT ); Thu, 8 Oct 2015 18:11:00 -0400 Received: by ioii196 with SMTP id i196so73368600ioi.3; Thu, 08 Oct 2015 15:11:00 -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=6u7zUsa0T43BcehNC7WRIBTNZfytnDqfizjNGxH30ac=; b=oykAAhOyMQYyud6rEfqRQx7g0Wtv/yf3HyMMgBmQp2cJ0sP/GMi3ZUQ8o43E9pf8Vv m+333VTOciiA0VYrieoDS3f6/8b43qGn5wz+BKd6mpeGOoNlDD/ZAXPayVzzzs4RDwxg P2iKi7rx6d2ZB9pZg96t/6FqxwyceyeDAOq02X9PLWitucSC44Di7jDGbI0GrtM+NvCG FkV+c55cXvFv2jMmGe1ifKvE/JZa+ho0SWVfuoQcwrMmd4H+0NI6i6bKvOHTbLU7QleR 6vChaHm4kze0cysJMgohXAHcUI7DoukAFqL08LmTnRykUo/012glld5Ij7dEjs6fK6Yj ltGg== X-Received: by 10.107.137.75 with SMTP id l72mr11397360iod.121.1444342259979; Thu, 08 Oct 2015 15:10:59 -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 f16sm4535949igt.5.2015.10.08.15.10.56 (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 t98MAtCt006250; Thu, 8 Oct 2015 15:10:55 -0700 Received: (from ddaney@localhost) by dl.caveonetworks.com (8.14.5/8.14.5/Submit) id t98MAtnb006249; Thu, 8 Oct 2015 15:10:55 -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 4/4] irqchip/gic-v3-its: Add handling of PCI requester id. Date: Thu, 8 Oct 2015 15:10:50 -0700 Message-Id: <1444342250-6196-5-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 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=unavailable 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. Reviewed-by: Marc Zyngier Signed-off-by: David Daney --- 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 a7c8c9f..96f5f5f 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(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);