[RFC 02/12] PCI: Convert iov.c to pci_is_sriov_* helpers
From: Dimitri Daskalakis <hidden>
Date: 2026-06-04 15:01:58
Also in:
kvm, linux-pci, linux-s390, xen-devel
Subsystem:
pci subsystem, the rest · Maintainers:
Bjorn Helgaas, Linus Torvalds
From: Dimitri Daskalakis <redacted> No functional changes. Assisted-by: Claude:claude-opus-4.7 Signed-off-by: Dimitri Daskalakis <redacted> --- drivers/pci/iov.c | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c
index 91ac4e37ecb9..5de26057b99a 100644
--- a/drivers/pci/iov.c
+++ b/drivers/pci/iov.c@@ -23,7 +23,7 @@ int pci_iov_virtfn_bus(struct pci_dev *dev, int vf_id) { - if (!dev->is_physfn) + if (!pci_is_sriov_physfn(dev)) return -EINVAL; return dev->bus->number + ((dev->devfn + dev->sriov->offset + dev->sriov->stride * vf_id) >> 8);
@@ -31,7 +31,7 @@ int pci_iov_virtfn_bus(struct pci_dev *dev, int vf_id) int pci_iov_virtfn_devfn(struct pci_dev *dev, int vf_id) { - if (!dev->is_physfn) + if (!pci_is_sriov_physfn(dev)) return -EINVAL; return (dev->devfn + dev->sriov->offset + dev->sriov->stride * vf_id) & 0xff;
@@ -42,7 +42,7 @@ int pci_iov_vf_id(struct pci_dev *dev) { struct pci_dev *pf; - if (!dev->is_virtfn) + if (!pci_is_sriov_virtfn(dev)) return -EINVAL; pf = pci_physfn(dev);
@@ -71,7 +71,7 @@ void *pci_iov_get_pf_drvdata(struct pci_dev *dev, struct pci_driver *pf_driver) { struct pci_dev *pf_dev; - if (!dev->is_virtfn) + if (!pci_is_sriov_virtfn(dev)) return ERR_PTR(-EINVAL); pf_dev = dev->physfn; if (pf_dev->driver != pf_driver)
@@ -152,7 +152,7 @@ static void virtfn_remove_bus(struct pci_bus *physbus, struct pci_bus *virtbus) resource_size_t pci_iov_resource_size(struct pci_dev *dev, int resno) { - if (!dev->is_physfn) + if (!pci_is_sriov_physfn(dev)) return 0; return dev->sriov->barsz[pci_resource_num_to_vf_bar(resno)];
@@ -300,7 +300,7 @@ static umode_t sriov_vf_attrs_are_visible(struct kobject *kobj, struct device *dev = kobj_to_dev(kobj); struct pci_dev *pdev = to_pci_dev(dev); - if (!pdev->is_virtfn) + if (!pci_is_sriov_virtfn(pdev)) return 0; return a->mode;
@@ -604,7 +604,7 @@ static umode_t sriov_pf_attrs_are_visible(struct kobject *kobj, { struct device *dev = kobj_to_dev(kobj); - if (!dev_is_pf(dev)) + if (!dev_is_sriov_pf(dev)) return 0; return a->mode;
@@ -707,7 +707,7 @@ static int sriov_enable(struct pci_dev *dev, int nr_virtfn) if (!pdev) return -ENODEV; - if (!pdev->is_physfn) { + if (!pci_is_sriov_physfn(pdev)) { pci_dev_put(pdev); return -ENOSYS; }
@@ -814,7 +814,7 @@ static int sriov_init(struct pci_dev *dev, int pos) ctrl = 0; list_for_each_entry(pdev, &dev->bus->devices, bus_list) - if (pdev->is_physfn) + if (pci_is_sriov_physfn(pdev)) goto found; pdev = NULL;
@@ -1006,7 +1006,7 @@ int pci_iov_init(struct pci_dev *dev) */ void pci_iov_release(struct pci_dev *dev) { - if (dev->is_physfn) + if (pci_is_sriov_physfn(dev)) sriov_release(dev); }
@@ -1018,7 +1018,7 @@ void pci_iov_remove(struct pci_dev *dev) { struct pci_sriov *iov = dev->sriov; - if (!dev->is_physfn) + if (!pci_is_sriov_physfn(dev)) return; iov->driver_max_VFs = iov->total_VFs;
@@ -1035,7 +1035,7 @@ void pci_iov_remove(struct pci_dev *dev) */ void pci_iov_update_resource(struct pci_dev *dev, int resno) { - struct pci_sriov *iov = dev->is_physfn ? dev->sriov : NULL; + struct pci_sriov *iov = pci_is_sriov_physfn(dev) ? dev->sriov : NULL; struct resource *res = pci_resource_n(dev, resno); int vf_bar = pci_resource_num_to_vf_bar(resno); struct pci_bus_region region;
@@ -1111,7 +1111,7 @@ resource_size_t pci_sriov_resource_alignment(struct pci_dev *dev, int resno) */ void pci_restore_iov_state(struct pci_dev *dev) { - if (dev->is_physfn) { + if (pci_is_sriov_physfn(dev)) { sriov_restore_vf_rebar_state(dev); sriov_restore_state(dev); }
@@ -1124,7 +1124,7 @@ void pci_restore_iov_state(struct pci_dev *dev) */ void pci_vf_drivers_autoprobe(struct pci_dev *dev, bool auto_probe) { - if (dev->is_physfn) + if (pci_is_sriov_physfn(dev)) dev->sriov->drivers_autoprobe = auto_probe; }
@@ -1141,7 +1141,7 @@ int pci_iov_bus_range(struct pci_bus *bus) struct pci_dev *dev; list_for_each_entry(dev, &bus->devices, bus_list) { - if (!dev->is_physfn) + if (!pci_is_sriov_physfn(dev)) continue; if (dev->sriov->max_VF_buses > max) max = dev->sriov->max_VF_buses;
@@ -1161,7 +1161,7 @@ int pci_enable_sriov(struct pci_dev *dev, int nr_virtfn) { might_sleep(); - if (!dev->is_physfn) + if (!pci_is_sriov_physfn(dev)) return -ENOSYS; return sriov_enable(dev, nr_virtfn);
@@ -1176,7 +1176,7 @@ void pci_disable_sriov(struct pci_dev *dev) { might_sleep(); - if (!dev->is_physfn) + if (!pci_is_sriov_physfn(dev)) return; sriov_disable(dev);
@@ -1191,7 +1191,7 @@ EXPORT_SYMBOL_GPL(pci_disable_sriov); */ int pci_num_vf(struct pci_dev *dev) { - if (!dev->is_physfn) + if (!pci_is_sriov_physfn(dev)) return 0; return dev->sriov->num_VFs;
@@ -1212,7 +1212,7 @@ int pci_vfs_assigned(struct pci_dev *dev) unsigned short dev_id; /* only search if we are a PF */ - if (!dev->is_physfn) + if (!pci_is_sriov_physfn(dev)) return 0; /*
@@ -1228,7 +1228,7 @@ int pci_vfs_assigned(struct pci_dev *dev) * It is considered assigned if it is a virtual function with * our dev as the physical function and the assigned bit is set */ - if (vfdev->is_virtfn && (vfdev->physfn == dev) && + if (pci_is_sriov_virtfn(vfdev) && (vfdev->physfn == dev) && pci_is_dev_assigned(vfdev)) vfs_assigned++;
@@ -1254,7 +1254,7 @@ EXPORT_SYMBOL_GPL(pci_vfs_assigned); */ int pci_sriov_set_totalvfs(struct pci_dev *dev, u16 numvfs) { - if (!dev->is_physfn) + if (!pci_is_sriov_physfn(dev)) return -ENOSYS; if (numvfs > dev->sriov->total_VFs)
@@ -1279,7 +1279,7 @@ EXPORT_SYMBOL_GPL(pci_sriov_set_totalvfs); */ int pci_sriov_get_totalvfs(struct pci_dev *dev) { - if (!dev->is_physfn) + if (!pci_is_sriov_physfn(dev)) return 0; return dev->sriov->driver_max_VFs;
@@ -1301,7 +1301,7 @@ int pci_sriov_configure_simple(struct pci_dev *dev, int nr_virtfn) might_sleep(); - if (!dev->is_physfn) + if (!pci_is_sriov_physfn(dev)) return -ENODEV; if (pci_vfs_assigned(dev)) {
--
2.52.0