[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v3 02/18] pci: Use pci_sbdf_t in pci_add_device()
- To: Teddy Astie <teddy.astie@xxxxxxxxxx>, xen-devel@xxxxxxxxxxxxxxxxxxxx
- From: "Daniel P. Smith" <dpsmith@xxxxxxxxxxxxxxxxxxxx>
- Date: Sat, 4 Jul 2026 08:18:20 -0400
- Arc-authentication-results: i=1; mx.zohomail.com; dkim=pass header.i=apertussolutions.com; spf=pass smtp.mailfrom=dpsmith@xxxxxxxxxxxxxxxxxxxx; dmarc=pass header.from=<dpsmith@xxxxxxxxxxxxxxxxxxxx>
- Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1783167505; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=nvPyqzORMvUik+ZDU3iWG4TakUWWBCyUbCCHGUSGanU=; b=nPafiV32pAQA0w9x0f04xLvE3aVCmBt61a/FUdGukPWoMk1Y/Tkj65eh31SxRQEIUpPCU/Cws1YBjYfE269Sbu1ORWuYyPnUX4Jyg2HptcUbj15M98/Rx+LbkMKSmJqWTy3GnTAfC2U0yslYRmaH9534/eKjdLKTEi+Tthn880s=
- Arc-seal: i=1; a=rsa-sha256; t=1783167505; cv=none; d=zohomail.com; s=zohoarc; b=EfZ9cGjuuv37D6ppIlfjx5EWNVOZLItHTlo2+Y2K7x9cGFZeI9S1RZATbtdhq1o6vDNeU1sRTwRVPO0EsdLekXQv7zFgGGGAl+dmPJnbxS1HyUeCypznftabO8yRYJgwok5PBGmAe/enqeMAjx9A0T110IfGKica3BRn8vfwKgc=
- Authentication-results: eu.smtp.expurgate.cloud; dkim=pass header.s=zoho header.d=apertussolutions.com header.i="dpsmith@xxxxxxxxxxxxxxxxxxxx" header.h="Message-ID:Date:MIME-Version:Subject:To:Cc:References:From:In-Reply-To:Content-Type:Content-Transfer-Encoding"
- Cc: Jan Beulich <jbeulich@xxxxxxxx>, Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, Roger Pau Monné <roger.pau@xxxxxxxxxx>, Anthony PERARD <anthony.perard@xxxxxxxxxx>, Michal Orzel <michal.orzel@xxxxxxx>, Julien Grall <julien@xxxxxxx>, Stefano Stabellini <sstabellini@xxxxxxxxxx>
- Delivery-date: Sat, 04 Jul 2026 12:19:03 +0000
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
On 6/29/26 1:21 PM, Teddy Astie wrote:
Signed-off-by: Teddy Astie <teddy.astie@xxxxxxxxxx>
---
v3: Don't adjust adjacent code.
---
xen/arch/x86/physdev.c | 6 +++---
xen/drivers/passthrough/pci.c | 36 +++++++++++++++++------------------
xen/drivers/pci/physdev.c | 3 ++-
xen/include/xen/pci.h | 4 ++--
4 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/xen/arch/x86/physdev.c b/xen/arch/x86/physdev.c
index 5bbcf3b530..60c02076d6 100644
--- a/xen/arch/x86/physdev.c
+++ b/xen/arch/x86/physdev.c
@@ -472,7 +472,7 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void)
arg)
if ( copy_from_guest(&manage_pci, arg, 1) != 0 )
break;
- ret = pci_add_device(0, manage_pci.bus, manage_pci.devfn,
+ ret = pci_add_device(PCI_SBDF(0, manage_pci.bus, manage_pci.devfn),
NULL, NUMA_NO_NODE);
break;
}
@@ -503,8 +503,8 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void)
arg)
pdev_info.is_virtfn = manage_pci_ext.is_virtfn;
pdev_info.physfn.bus = manage_pci_ext.physfn.bus;
pdev_info.physfn.devfn = manage_pci_ext.physfn.devfn;
- ret = pci_add_device(0, manage_pci_ext.bus,
- manage_pci_ext.devfn,
+ ret = pci_add_device(PCI_SBDF(0, manage_pci_ext.bus,
+ manage_pci_ext.devfn),
&pdev_info, NUMA_NO_NODE);
break;
}
diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c
index 0adf573150..3038827e28 100644
--- a/xen/drivers/passthrough/pci.c
+++ b/xen/drivers/passthrough/pci.c
@@ -662,12 +662,11 @@ unsigned int pci_size_mem_bar(pci_sbdf_t sbdf, unsigned
int pos,
return is64bits ? 2 : 1;
}
-int pci_add_device(u16 seg, u8 bus, u8 devfn,
- const struct pci_dev_info *info, nodeid_t node)
+int pci_add_device(pci_sbdf_t sbdf, const struct pci_dev_info *info, nodeid_t
node)
{
struct pci_seg *pseg;
struct pci_dev *pdev;
- unsigned int slot = PCI_SLOT(devfn), func = PCI_FUNC(devfn);
+ unsigned int slot = sbdf.devfn, func = sbdf.fn;
const char *type;
int ret;
@@ -680,17 +679,17 @@ int pci_add_device(u16 seg, u8 bus, u8 devfn,
else
type = "device";
- ret = xsm_resource_plug_pci(XSM_PRIV, (seg << 16) | (bus << 8) | devfn);
+ ret = xsm_resource_plug_pci(XSM_PRIV, sbdf.sbdf);
if ( ret )
return ret;
Acked-by: Daniel P. Smith <dpsmith@xxxxxxxxxxxxxxxxxxxx>
|
