From nobody Fri Oct 31 03:41:52 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1752737530; cv=none; d=zohomail.com; s=zohoarc; b=FCmVrCAacSOP6LlNpGs3Tw+OCsq3A/XYkRwlySojzferzdSByr3t4u3NPn9LJt5JoWTPsI+pJ9LMrqZtS5h8uN0+ZUkE+sYKNgeDKb55o6arBeEsAjKJmDwuBZbuZ611/qWVcnlVwj+vd+i5hAwZSPfgAKHPBDrcJFYhsCx8Tko= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752737530; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=fcfoiUYIVjl/D0Ywq9KbeNKGyLzp30Ote+u9ohhrmSU=; b=kyTAzefbb9Ro99bA5M8AzHgkMyamiz//77kT4zPpKDtIYcc/xUdTtcQIgT1MBIneYEaVM+nWc3IauX1Jv6T1olUROsBRszSFEb5hm6KZKtAEtIamiLocLuTjG7ZOnu5S2qytDnF27JetUjc/UZGTz5tKyLqXlG3ySTDVEXmwCoc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1752737530209426.6640577848632; Thu, 17 Jul 2025 00:32:10 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1046274.1416597 (Exim 4.92) (envelope-from ) id 1ucJ5v-0004Oq-Al; Thu, 17 Jul 2025 07:31:55 +0000 Received: by outflank-mailman (output) from mailman id 1046274.1416597; Thu, 17 Jul 2025 07:31:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ucJ5v-0004Oh-7j; Thu, 17 Jul 2025 07:31:55 +0000 Received: by outflank-mailman (input) for mailman id 1046274; Thu, 17 Jul 2025 07:31:53 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ucJ5t-0004NF-PZ for xen-devel@lists.xenproject.org; Thu, 17 Jul 2025 07:31:53 +0000 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [2a00:1450:4864:20::331]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 1afde8ba-62e0-11f0-b894-0df219b8e170; Thu, 17 Jul 2025 09:31:51 +0200 (CEST) Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-45619d70c72so14397205e9.0 for ; Thu, 17 Jul 2025 00:31:51 -0700 (PDT) Received: from pc (cpc92320-cmbg19-2-0-cust1786.5-4.cable.virginm.net. [82.13.70.251]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b5e8dc201asm19792460f8f.22.2025.07.17.00.31.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jul 2025 00:31:49 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 1afde8ba-62e0-11f0-b894-0df219b8e170 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752737511; x=1753342311; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fcfoiUYIVjl/D0Ywq9KbeNKGyLzp30Ote+u9ohhrmSU=; b=E+vA807oRtyFKU834ZuPIe+suj7w935NdWOSFresbm9secVe0E+KB4xawElTsIbn6g FRGHrU5YBCbSbUdZpONG16P+9BZLO1Ly5OWrMu7Uc+sCwDgrXh7Wk8tqX3rXvyGKIeIK hAukzdQxoEQMNLvQGbCZc5W6nEHE4l+/ScbahH7Z9sFSOL9KCI+qXQhHOTXbbQFWpTrd +Oy42rk5IWkXY1z5L/TQMw+vHrEbwgrva/CYGM7sjSS7zMQbd33gXrcQtIKE5bBRPaIX 0LXXy6ztrSCRWie64Nm3Y1T+O+ytV45NFScoUIfKCvNGs4ugO/JUUKxnHNmeppWNTaaC LWYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752737511; x=1753342311; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fcfoiUYIVjl/D0Ywq9KbeNKGyLzp30Ote+u9ohhrmSU=; b=l4I0g5fGfJa/AjrwIeTyJ/aLDlMonC3+Xu80Y78bULdT0B7j2zg9gCGMhyGc7ioIqg wQM4mYciQ/SjDxS+G79L/ImX/oJFTOZGCVRCOJ37GPQFVNNKHLw/Y76DPrT/mQ05hm78 IcXCnPqFhTAYvQStIhGImGXDdlL711dUnMfFEMI1IBJgkpfLAXl1GPa8Zo/7qT2lURg7 CxItnF41HaMMEjkOWgDUsdFFXHeQyn11w6GmiohZnP3lw8hyFCH+nRA5+H+uykRTXUND XfAHGsCHsaT2gERY6X3UBIaXSJhUIyd1pkfmol59Q+KkBYihYXumWxVU9efVcHpZD/H1 NBTg== X-Gm-Message-State: AOJu0YxbpU6XWUYmYXvoKZboHkq8hdpCUyO/568UmlbKdjTAWo3hZniv oEb8mSb1VRdd83vMYBqmXwEDzoIRw1VZ2rZTLSC0VOrsUWsYsKgRjGxPSKaHdkgk X-Gm-Gg: ASbGnctuMH2xSNZI3oG9bXIuuIKzWuCjZTTatHkf+E/GrvJ4EuP/7Gq/cZVBAYpIttI dZzlZFZ4/tR3Ugh01lQ9YdmilNm+1GS/Ap7o8NfxxmWTQpl7Ph79vp/QKXnm6yYELMskJXW4OX3 lSJObp7M1ed1dOZ/6s/i67mz7VM9ry4Wz3TBMDakK8wEDEo4q9Kul3CZCKQDPGW1v8nilyrK8w0 2yLNCE0R3akZNUpPZ+QbuiDNdrY0vfAchPAj2Ujj0NTiO7Ih9NA87SReDI1E3czDgN23oyKuGg+ 7MUOyRy/GXHE0aeEpsxyREon5fw+PaALQsnDcheD1nK3+j2c7iMfAoX7+XQMeNmgjdj35C+eKDb khDqRuGucURDtodUnZAsQv/wdH9he1H9IRk9a4omp1XjDbVjx0q1kehCSbn19dgbEbyLr0dIk X-Google-Smtp-Source: AGHT+IF3hlqeQXuWHBqiWGN3+xcZxUMYETb8myDtKsSXMDI+JdEAQVruwFYaqQ1uPpLUkAW1uMBpEw== X-Received: by 2002:a5d:64c4:0:b0:3a4:e231:8632 with SMTP id ffacd0b85a97d-3b613abe2c2mr1896604f8f.12.1752737510249; Thu, 17 Jul 2025 00:31:50 -0700 (PDT) From: Andrii Sultanov To: xen-devel@lists.xenproject.org Cc: Andrii Sultanov , Jan Beulich , Andrew Cooper , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Denis Mukhin Subject: [PATCH v5 2/3] drivers: Change find_iommu_for_device function to take pci_sbdf_t, simplify code Date: Thu, 17 Jul 2025 08:31:26 +0100 Message-ID: X-Mailer: git-send-email 2.50.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1752737531250116600 Content-Type: text/plain; charset="utf-8" Following a similar change to amd_iommu struct, change the find_iommu_for_device function to take pci_sbdf_t as a single parameter. This removes conversions in the majority of cases. Bloat-o-meter reports (on top of the first patch in the series): add/remove: 0/0 grow/shrink: 12/11 up/down: 95/-95 (0) Function old new delta amd_iommu_get_supported_ivhd_type 54 86 +32 parse_ivrs_table 3955 3966 +11 amd_iommu_assign_device 271 282 +11 __mon_lengths 2928 2936 +8 update_intremap_entry_from_msi_msg 859 864 +5 iov_supports_xt 270 275 +5 amd_setup_hpet_msi 232 237 +5 amd_iommu_domain_destroy 46 51 +5 _hvm_dpci_msi_eoi 155 160 +5 find_iommu_for_device 242 246 +4 amd_iommu_ioapic_update_ire 572 575 +3 allocate_domain_resources 82 83 +1 amd_iommu_read_ioapic_from_ire 347 344 -3 reassign_device 843 838 -5 amd_iommu_remove_device 352 347 -5 amd_iommu_get_reserved_device_memory 521 516 -5 amd_iommu_flush_iotlb 359 354 -5 amd_iommu_add_device 844 839 -5 amd_iommu_setup_domain_device 1478 1472 -6 build_info 752 744 -8 amd_iommu_detect_one_acpi 886 876 -10 register_range_for_device 297 281 -16 parse_ivmd_block 1339 1312 -27 Signed-off-by: Andrii Sultanov Acked-by: Jan Beulich Reviewed-by: Denis Mukhin --- Changes in V5: * Added a Reviewed-by tag Changes in V4: * After amendments to the previous commit which increased improvements there, this commit now does not improve code size anymore (but still simplifies code), so I've updated the bloat-o-meter report. Changes in V3: * Amended commit message * As the previous patch dropped the aliasing of seg and bdf, renamed users = of amd_iommu as appropriate. Changes in V2: * Split single commit into several patches * Dropped brackets around &(iommu->sbdf) and &(sbdf) * Dropped most of the hunk in _invalidate_all_devices - it was bloat-equivalent to the existing code - just convert with PCI_SBDF instead * Dropped the hunk in get_intremap_requestor_id (iommu_intr.c) and amd_iommu_get_reserved_device_memory (iommu_map.c) as they were only increasing the code size. * Kept "/* XXX */" where appropriate * Fixed a slip-up in register_range_for_iommu_devices where iommu->sbdf replaced the usage of *different* seg and bdf. --- xen/drivers/passthrough/amd/iommu.h | 2 +- xen/drivers/passthrough/amd/iommu_acpi.c | 14 +++++----- xen/drivers/passthrough/amd/iommu_cmd.c | 2 +- xen/drivers/passthrough/amd/iommu_init.c | 4 +-- xen/drivers/passthrough/amd/iommu_intr.c | 17 ++++++------ xen/drivers/passthrough/amd/iommu_map.c | 2 +- xen/drivers/passthrough/amd/pci_amd_iommu.c | 30 ++++++++++----------- 7 files changed, 35 insertions(+), 36 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu.h b/xen/drivers/passthrough/= amd/iommu.h index ba541f7943..2599800e6a 100644 --- a/xen/drivers/passthrough/amd/iommu.h +++ b/xen/drivers/passthrough/amd/iommu.h @@ -240,7 +240,7 @@ void amd_iommu_flush_intremap(struct amd_iommu *iommu, = uint16_t bdf); void amd_iommu_flush_all_caches(struct amd_iommu *iommu); =20 /* find iommu for bdf */ -struct amd_iommu *find_iommu_for_device(int seg, int bdf); +struct amd_iommu *find_iommu_for_device(pci_sbdf_t sbdf); =20 /* interrupt remapping */ bool cf_check iov_supports_xt(void); diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c b/xen/drivers/passthr= ough/amd/iommu_acpi.c index 04d6e365cb..a9c5432e86 100644 --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -239,17 +239,17 @@ static int __init register_range_for_device( unsigned int bdf, paddr_t base, paddr_t limit, bool iw, bool ir, bool exclusion) { - int seg =3D 0; /* XXX */ - struct ivrs_mappings *ivrs_mappings =3D get_ivrs_mappings(seg); + pci_sbdf_t sbdf =3D { .seg =3D 0 /* XXX */, .bdf =3D bdf }; + struct ivrs_mappings *ivrs_mappings =3D get_ivrs_mappings(sbdf.seg); struct amd_iommu *iommu; u16 req; int rc =3D 0; =20 - iommu =3D find_iommu_for_device(seg, bdf); + iommu =3D find_iommu_for_device(sbdf); if ( !iommu ) { AMD_IOMMU_WARN("IVMD: no IOMMU for device %pp - ignoring constrain= \n", - &PCI_SBDF(seg, bdf)); + &sbdf); return 0; } req =3D ivrs_mappings[bdf].dte_requestor_id; @@ -263,9 +263,9 @@ static int __init register_range_for_device( paddr_t length =3D limit + PAGE_SIZE - base; =20 /* reserve unity-mapped page entries for device */ - rc =3D reserve_unity_map_for_device(seg, bdf, base, length, iw, ir, + rc =3D reserve_unity_map_for_device(sbdf.seg, bdf, base, length, i= w, ir, false) ?: - reserve_unity_map_for_device(seg, req, base, length, iw, ir, + reserve_unity_map_for_device(sbdf.seg, req, base, length, iw,= ir, false); } else @@ -297,7 +297,7 @@ static int __init register_range_for_iommu_devices( /* reserve unity-mapped page entries for devices */ for ( bdf =3D rc =3D 0; !rc && bdf < ivrs_bdf_entries; bdf++ ) { - if ( iommu !=3D find_iommu_for_device(iommu->sbdf.seg, bdf) ) + if ( iommu !=3D find_iommu_for_device(PCI_SBDF(iommu->sbdf.seg, bd= f)) ) continue; =20 req =3D get_ivrs_mappings(iommu->sbdf.seg)[bdf].dte_requestor_id; diff --git a/xen/drivers/passthrough/amd/iommu_cmd.c b/xen/drivers/passthro= ugh/amd/iommu_cmd.c index eefd626161..6b80c57f44 100644 --- a/xen/drivers/passthrough/amd/iommu_cmd.c +++ b/xen/drivers/passthrough/amd/iommu_cmd.c @@ -288,7 +288,7 @@ void amd_iommu_flush_iotlb(u8 devfn, const struct pci_d= ev *pdev, if ( !pci_ats_enabled(pdev->seg, pdev->bus, pdev->devfn) ) return; =20 - iommu =3D find_iommu_for_device(pdev->seg, pdev->sbdf.bdf); + iommu =3D find_iommu_for_device(pdev->sbdf); =20 if ( !iommu ) { diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthr= ough/amd/iommu_init.c index 58d657060a..3f6d2f5db5 100644 --- a/xen/drivers/passthrough/amd/iommu_init.c +++ b/xen/drivers/passthrough/amd/iommu_init.c @@ -1540,13 +1540,13 @@ static void invalidate_all_domain_pages(void) static int cf_check _invalidate_all_devices( u16 seg, struct ivrs_mappings *ivrs_mappings) { - unsigned int bdf;=20 + unsigned int bdf; u16 req_id; struct amd_iommu *iommu; =20 for ( bdf =3D 0; bdf < ivrs_bdf_entries; bdf++ ) { - iommu =3D find_iommu_for_device(seg, bdf); + iommu =3D find_iommu_for_device(PCI_SBDF(seg, bdf)); req_id =3D ivrs_mappings[bdf].dte_requestor_id; if ( iommu ) { diff --git a/xen/drivers/passthrough/amd/iommu_intr.c b/xen/drivers/passthr= ough/amd/iommu_intr.c index 7ac07ba77e..25bf25904e 100644 --- a/xen/drivers/passthrough/amd/iommu_intr.c +++ b/xen/drivers/passthrough/amd/iommu_intr.c @@ -337,7 +337,7 @@ void cf_check amd_iommu_ioapic_update_ire( /* get device id of ioapic devices */ bdf =3D ioapic_sbdf[idx].bdf; seg =3D ioapic_sbdf[idx].seg; - iommu =3D find_iommu_for_device(seg, bdf); + iommu =3D find_iommu_for_device(PCI_SBDF(seg, bdf)); if ( !iommu ) { AMD_IOMMU_WARN("failed to find IOMMU for IO-APIC @ %04x:%04x\n", @@ -383,7 +383,7 @@ unsigned int cf_check amd_iommu_read_ioapic_from_ire( =20 seg =3D ioapic_sbdf[idx].seg; bdf =3D ioapic_sbdf[idx].bdf; - iommu =3D find_iommu_for_device(seg, bdf); + iommu =3D find_iommu_for_device(PCI_SBDF(seg, bdf)); if ( !iommu ) return val; req_id =3D get_intremap_requestor_id(seg, bdf); @@ -495,16 +495,15 @@ static int update_intremap_entry_from_msi_msg( return fresh; } =20 -static struct amd_iommu *_find_iommu_for_device(int seg, int bdf) +static struct amd_iommu *_find_iommu_for_device(pci_sbdf_t sbdf) { struct amd_iommu *iommu; - pci_sbdf_t sbdf =3D PCI_SBDF(seg, bdf); =20 for_each_amd_iommu ( iommu ) if ( iommu->sbdf.sbdf =3D=3D sbdf.sbdf ) return NULL; =20 - iommu =3D find_iommu_for_device(seg, bdf); + iommu =3D find_iommu_for_device(sbdf); if ( iommu ) return iommu; =20 @@ -524,7 +523,7 @@ int cf_check amd_iommu_msi_msg_update_ire( bdf =3D pdev ? pdev->sbdf.bdf : hpet_sbdf.bdf; seg =3D pdev ? pdev->seg : hpet_sbdf.seg; =20 - iommu =3D _find_iommu_for_device(seg, bdf); + iommu =3D _find_iommu_for_device(PCI_SBDF(seg, bdf)); if ( IS_ERR_OR_NULL(iommu) ) return PTR_ERR(iommu); =20 @@ -661,8 +660,8 @@ bool __init cf_check iov_supports_xt(void) if ( idx =3D=3D MAX_IO_APICS ) return false; =20 - if ( !find_iommu_for_device(ioapic_sbdf[idx].seg, - ioapic_sbdf[idx].bdf) ) + if ( !find_iommu_for_device(PCI_SBDF(ioapic_sbdf[idx].seg, + ioapic_sbdf[idx].bdf)) ) { AMD_IOMMU_WARN("no IOMMU for IO-APIC %#x (ID %x)\n", apic, IO_APIC_ID(apic)); @@ -691,7 +690,7 @@ int __init cf_check amd_setup_hpet_msi(struct msi_desc = *msi_desc) return -ENODEV; } =20 - iommu =3D find_iommu_for_device(hpet_sbdf.seg, hpet_sbdf.bdf); + iommu =3D find_iommu_for_device(PCI_SBDF(hpet_sbdf.seg, hpet_sbdf.bdf)= ); if ( !iommu ) return -ENXIO; =20 diff --git a/xen/drivers/passthrough/amd/iommu_map.c b/xen/drivers/passthro= ugh/amd/iommu_map.c index d28c475650..320a2dc64c 100644 --- a/xen/drivers/passthrough/amd/iommu_map.c +++ b/xen/drivers/passthrough/amd/iommu_map.c @@ -717,7 +717,7 @@ int cf_check amd_iommu_get_reserved_device_memory( pcidevs_unlock(); =20 if ( pdev ) - iommu =3D find_iommu_for_device(seg, bdf); + iommu =3D find_iommu_for_device(sbdf); if ( !iommu ) continue; } diff --git a/xen/drivers/passthrough/amd/pci_amd_iommu.c b/xen/drivers/pass= through/amd/pci_amd_iommu.c index 6b58e3380b..3a14770855 100644 --- a/xen/drivers/passthrough/amd/pci_amd_iommu.c +++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c @@ -32,35 +32,35 @@ static bool __read_mostly init_done; =20 static const struct iommu_init_ops _iommu_init_ops; =20 -struct amd_iommu *find_iommu_for_device(int seg, int bdf) +struct amd_iommu *find_iommu_for_device(pci_sbdf_t sbdf) { - struct ivrs_mappings *ivrs_mappings =3D get_ivrs_mappings(seg); + struct ivrs_mappings *ivrs_mappings =3D get_ivrs_mappings(sbdf.seg); =20 - if ( !ivrs_mappings || bdf >=3D ivrs_bdf_entries ) + if ( !ivrs_mappings || sbdf.bdf >=3D ivrs_bdf_entries ) return NULL; =20 - if ( unlikely(!ivrs_mappings[bdf].iommu) && likely(init_done) ) + if ( unlikely(!ivrs_mappings[sbdf.bdf].iommu) && likely(init_done) ) { - unsigned int bd0 =3D bdf & ~PCI_FUNC(~0); + unsigned int bd0 =3D sbdf.bdf & ~PCI_FUNC(~0); =20 - if ( ivrs_mappings[bd0].iommu && ivrs_mappings[bd0].iommu->sbdf.bd= f !=3D bdf ) + if ( ivrs_mappings[bd0].iommu && ivrs_mappings[bd0].iommu->sbdf.bd= f !=3D sbdf.bdf ) { struct ivrs_mappings tmp =3D ivrs_mappings[bd0]; =20 tmp.iommu =3D NULL; if ( tmp.dte_requestor_id =3D=3D bd0 ) - tmp.dte_requestor_id =3D bdf; - ivrs_mappings[bdf] =3D tmp; + tmp.dte_requestor_id =3D sbdf.bdf; + ivrs_mappings[sbdf.bdf] =3D tmp; =20 printk(XENLOG_WARNING "%pp not found in ACPI tables;" - " using same IOMMU as function 0\n", &PCI_SBDF(seg, bdf= )); + " using same IOMMU as function 0\n", &sbdf); =20 /* write iommu field last */ - ivrs_mappings[bdf].iommu =3D ivrs_mappings[bd0].iommu; + ivrs_mappings[sbdf.bdf].iommu =3D ivrs_mappings[bd0].iommu; } } =20 - return ivrs_mappings[bdf].iommu; + return ivrs_mappings[sbdf.bdf].iommu; } =20 /* @@ -107,7 +107,7 @@ static bool any_pdev_behind_iommu(const struct domain *= d, if ( pdev =3D=3D exclude ) continue; =20 - if ( find_iommu_for_device(pdev->seg, pdev->sbdf.bdf) =3D=3D iommu= ) + if ( find_iommu_for_device(pdev->sbdf) =3D=3D iommu ) return true; } =20 @@ -468,7 +468,7 @@ static int cf_check reassign_device( struct amd_iommu *iommu; int rc; =20 - iommu =3D find_iommu_for_device(pdev->seg, pdev->sbdf.bdf); + iommu =3D find_iommu_for_device(pdev->sbdf); if ( !iommu ) { AMD_IOMMU_WARN("failed to find IOMMU: %pp cannot be assigned to %p= d\n", @@ -581,7 +581,7 @@ static int cf_check amd_iommu_add_device(u8 devfn, stru= ct pci_dev *pdev) if ( pdev->sbdf.sbdf =3D=3D iommu->sbdf.sbdf ) return is_hardware_domain(pdev->domain) ? 0 : -ENODEV; =20 - iommu =3D find_iommu_for_device(pdev->seg, pdev->sbdf.bdf); + iommu =3D find_iommu_for_device(pdev->sbdf); if ( unlikely(!iommu) ) { /* Filter bridge devices. */ @@ -666,7 +666,7 @@ static int cf_check amd_iommu_remove_device(u8 devfn, s= truct pci_dev *pdev) if ( !pdev->domain ) return -EINVAL; =20 - iommu =3D find_iommu_for_device(pdev->seg, pdev->sbdf.bdf); + iommu =3D find_iommu_for_device(pdev->sbdf); if ( !iommu ) { AMD_IOMMU_WARN("failed to find IOMMU: %pp cannot be removed from %= pd\n", --=20 2.49.0