From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_MUTT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 96B01C43218 for ; Fri, 26 Apr 2019 13:47:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6F0D82089E for ; Fri, 26 Apr 2019 13:47:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726060AbfDZNrb (ORCPT ); Fri, 26 Apr 2019 09:47:31 -0400 Received: from 8bytes.org ([81.169.241.247]:37696 "EHLO theia.8bytes.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726039AbfDZNra (ORCPT ); Fri, 26 Apr 2019 09:47:30 -0400 Received: by theia.8bytes.org (Postfix, from userid 1000) id 590925F7; Fri, 26 Apr 2019 15:47:29 +0200 (CEST) Date: Fri, 26 Apr 2019 15:47:28 +0200 From: Joerg Roedel To: Heiner Kallweit Cc: Benjamin Herrenschmidt , Michael Ellerman , Oded Gabbay , Alex Deucher , Christian =?iso-8859-1?Q?K=F6nig?= , "David (ChunMing) Zhou" , David Airlie , Daniel Vetter , David Woodhouse , Realtek linux nic maintainers , "David S. Miller" , Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , Maxime Coquelin , Bjorn Helgaas , Benson Leung , Enric Balletbo i Serra , Stephen Rothwell , Paul Mackerras , open list , "open list:AMD KFD" , "open list:RADEON and AMDGPU DRM DRIVERS" , "open list:AMD IOMMU (AMD-VI)" , "open list:8169 10/100/1000 GIGABIT ETHERNET DRIVER" , "moderated list:ARM/STM32 ARCHITECTURE" , "moderated list:ARM/STM32 ARCHITECTURE" , "open list:PCI SUBSYSTEM" Subject: Re: [PATCH v2 7/9] iommu/vt-d: use helper pci_dev_id Message-ID: <20190426134727.GE24576@8bytes.org> References: <2e1f9a57-6d08-d017-24da-3e6b97fa2449@gmail.com> <0889204c-18aa-8a5f-1781-aaf32ee5beba@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <0889204c-18aa-8a5f-1781-aaf32ee5beba@gmail.com> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org On Wed, Apr 24, 2019 at 09:16:10PM +0200, Heiner Kallweit wrote: > Use new helper pci_dev_id() to simplify the code. > > Signed-off-by: Heiner Kallweit Reviewed-by: Joerg Roedel > --- > drivers/iommu/intel-iommu.c | 2 +- > drivers/iommu/intel_irq_remapping.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c > index d93c4bd7d..3f475a23a 100644 > --- a/drivers/iommu/intel-iommu.c > +++ b/drivers/iommu/intel-iommu.c > @@ -1391,7 +1391,7 @@ static void iommu_enable_dev_iotlb(struct device_domain_info *info) > > /* pdev will be returned if device is not a vf */ > pf_pdev = pci_physfn(pdev); > - info->pfsid = PCI_DEVID(pf_pdev->bus->number, pf_pdev->devfn); > + info->pfsid = pci_dev_id(pf_pdev); > } > > #ifdef CONFIG_INTEL_IOMMU_SVM > diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c > index 634d8f059..4160aa9f3 100644 > --- a/drivers/iommu/intel_irq_remapping.c > +++ b/drivers/iommu/intel_irq_remapping.c > @@ -424,7 +424,7 @@ static int set_msi_sid(struct irte *irte, struct pci_dev *dev) > set_irte_sid(irte, SVT_VERIFY_SID_SQ, SQ_ALL_16, data.alias); > else > set_irte_sid(irte, SVT_VERIFY_SID_SQ, SQ_ALL_16, > - PCI_DEVID(dev->bus->number, dev->devfn)); > + pci_dev_id(dev)); > > return 0; > } > -- > 2.21.0 >