From patchwork Wed Sep 30 22:47:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Daney X-Patchwork-Id: 524681 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 2EE69140D6A for ; Thu, 1 Oct 2015 08:47:43 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=Bl6CqXfq; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755185AbbI3WrX (ORCPT ); Wed, 30 Sep 2015 18:47:23 -0400 Received: from mail-ig0-f170.google.com ([209.85.213.170]:34026 "EHLO mail-ig0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754803AbbI3WrN (ORCPT ); Wed, 30 Sep 2015 18:47:13 -0400 Received: by igcpb10 with SMTP id pb10so4947581igc.1; Wed, 30 Sep 2015 15:47:13 -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=Bl6CqXfqgtoyhTUtqwY7SzzefNX2EYeFWdx4imH4dwgjUeJY/6ozF+sRHAHB96VmFb 3pffzidQf2iY2G9ZHW0GZJdg+pXzYV3inKyyHIcn7C5Lfjm8ZWgwSwm3RBJTiJ9D8PQH CLSS8yFfSnbqrTUaTIHeEJFmxO/bREAXyw9JxlpiFIyKTqf4kZPQAIK/O9GvosjywgeW jBuFnRhUuEg3M/eqXRX0GOjPaB0M+RLgAUYkWwPqZ4kimcY/OE4oZgqkUbCm28JwKixt kCAgIdA7EweG6BaWBrZtPwaDgZ0ciF7P5nv6Buy0xOBKa2KcL2bFp+ipqKbX0mS+FwYi 8DTg== X-Received: by 10.50.4.33 with SMTP id h1mr8126374igh.24.1443653233056; Wed, 30 Sep 2015 15:47:13 -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 n10sm456309igy.1.2015.09.30.15.47.08 (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 30 Sep 2015 15:47:11 -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 t8UMl77m024978; Wed, 30 Sep 2015 15:47:07 -0700 Received: (from ddaney@localhost) by dl.caveonetworks.com (8.14.5/8.14.5/Submit) id t8UMl7lH024977; Wed, 30 Sep 2015 15:47:07 -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 v3 4/4] irqchip/gic-v3-its: Add handling of PCI requester id. Date: Wed, 30 Sep 2015 15:47:02 -0700 Message-Id: <1443653222-24924-5-git-send-email-ddaney.cavm@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1443653222-24924-1-git-send-email-ddaney.cavm@gmail.com> References: <1443653222-24924-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 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 --- 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);