From mboxrd@z Thu Jan 1 00:00:00 1970 From: Joerg Roedel Subject: Re: [PATCH v2 7/9] iommu/vt-d: use helper pci_dev_id Date: Fri, 26 Apr 2019 15:47:28 +0200 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 Return-path: Content-Disposition: inline In-Reply-To: <0889204c-18aa-8a5f-1781-aaf32ee5beba@gmail.com> Sender: netdev-owner@vger.kernel.org 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 List-Id: amd-gfx.lists.freedesktop.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 > 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,URIBL_BLOCKED, USER_AGENT_MUTT autolearn=ham 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 6411AC43218 for ; Fri, 26 Apr 2019 13:50:53 +0000 (UTC) Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3D290206E0 for ; Fri, 26 Apr 2019 13:50:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3D290206E0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=8bytes.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=iommu-bounces@lists.linux-foundation.org Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 0AC0027DD; Fri, 26 Apr 2019 13:50:53 +0000 (UTC) Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 7670E27DC for ; Fri, 26 Apr 2019 13:47:43 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from theia.8bytes.org (8bytes.org [81.169.241.247]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 4F331875 for ; Fri, 26 Apr 2019 13:47:31 +0000 (UTC) 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 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-Disposition: inline In-Reply-To: <0889204c-18aa-8a5f-1781-aaf32ee5beba@gmail.com> User-Agent: Mutt/1.10.1 (2018-07-13) Cc: David Airlie , Benjamin Herrenschmidt , "open list:AMD KFD" , Paul Mackerras , "moderated list:ARM/STM32 ARCHITECTURE" , "David \(ChunMing\) Zhou" , Michael Ellerman , "open list:RADEON and AMDGPU DRM DRIVERS" , Jose Abreu , "open list:PCI SUBSYSTEM" , Realtek linux nic maintainers , Alexandre Torgue , Stephen Rothwell , Alex Deucher , Bjorn Helgaas , Giuseppe Cavallaro , Benson Leung , "moderated list:ARM/STM32 ARCHITECTURE" , Maxime Coquelin , "open list:8169 10/100/1000 GIGABIT ETHERNET DRIVER" , open list , Christian =?iso-8859-1?Q?K=F6nig?= , "open list:AMD IOMMU \(AMD-VI\)" , Daniel Vetter , Enric Balletbo i Serra , David Woodhouse , "David S. Miller" X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Development issues for Linux IOMMU support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Sender: iommu-bounces@lists.linux-foundation.org Errors-To: iommu-bounces@lists.linux-foundation.org Message-ID: <20190426134728.m7hKiVCysMupb1y3kQaadt7L5ARZaA20W5BNV4wVv-g@z> 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 > _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu 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 > 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=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_MUTT autolearn=ham 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 34E17C43218 for ; Fri, 26 Apr 2019 13:47:40 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 013DF2089E for ; Fri, 26 Apr 2019 13:47:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="SLNT6Wn9" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 013DF2089E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=8bytes.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=aW2QFwQ9GNPeEnwQu5wfN24wNiD/CwjR8fzNbI50gUU=; b=SLNT6Wn9oiFf3z pjLyyqfwtnjbHmn28QJ2eZKWXxLvV94pI4F+dWq/qo6qdPNwimsOuTLeNjxzt6mx7nxpmCYq4Qdzk JOKv44/Nxr0ewPWF9VaXuBEgnHwtvEFz+TMUHU2QYVcCEvRin/UxNGbnpTTqf7/ShPOhVnQ5DHoLw 1Unadz2c0LxsTghVmiILiHgsoAU4k9DCgkZp0S4yS4B9p4IWBgieulansWjNgT/qUrg9UQB/6Yxlf UZUnx/cl9PgkQ/I5W9Fv1YvPnDzRJy40e7w9J2OGd+0Pl89v3i8xFoGhB+gC5Dvvheskl0wmlOTig KQID28NW6Cp7UfvEFRrw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hK1CP-0001lu-Tk; Fri, 26 Apr 2019 13:47:33 +0000 Received: from 8bytes.org ([81.169.241.247] helo=theia.8bytes.org) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hK1CN-0001js-6H for linux-arm-kernel@lists.infradead.org; Fri, 26 Apr 2019 13:47:32 +0000 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 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-Disposition: inline In-Reply-To: <0889204c-18aa-8a5f-1781-aaf32ee5beba@gmail.com> User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190426_064731_382172_C5E41EA9 X-CRM114-Status: GOOD ( 14.42 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , Benjamin Herrenschmidt , "open list:AMD KFD" , Paul Mackerras , "moderated list:ARM/STM32 ARCHITECTURE" , "David \(ChunMing\) Zhou" , Michael Ellerman , "open list:RADEON and AMDGPU DRM DRIVERS" , Jose Abreu , "open list:PCI SUBSYSTEM" , Realtek linux nic maintainers , Alexandre Torgue , Stephen Rothwell , Alex Deucher , Bjorn Helgaas , Giuseppe Cavallaro , Benson Leung , "moderated list:ARM/STM32 ARCHITECTURE" , Oded Gabbay , Maxime Coquelin , "open list:8169 10/100/1000 GIGABIT ETHERNET DRIVER" , open list , Christian =?iso-8859-1?Q?K=F6nig?= , "open list:AMD IOMMU \(AMD-VI\)" , Daniel Vetter , Enric Balletbo i Serra , David Woodhouse , "David S. Miller" Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.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 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel