mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-07-04 13:21:45 +00:00
PCI/IOV: Introduce pci_iov_sysfs_link() function
Currently pci_iov_add_virtfn() scans the SR-IOV BARs, adds the VF to the bus and also creates the sysfs links between the newly added VF and its parent PF. With pdev->no_vf_scan fencing off the entire pci_iov_add_virtfn() call s390 as the sole pdev->no_vf_scan user thus ends up missing these sysfs links which are required for example by QEMU/libvirt. Instead of duplicating the code refactor pci_iov_add_virtfn() to make sysfs link creation callable separately. Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com> Acked-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Pierre Morel <pmorel@linux.ibm.com> Link: https://lore.kernel.org/r/20200506154139.90609-1-schnelle@linux.ibm.com Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
This commit is contained in:
parent
c70d82e966
commit
a1ceea67f2
2 changed files with 33 additions and 11 deletions
|
@ -133,12 +133,35 @@ static void pci_read_vf_config_common(struct pci_dev *virtfn)
|
||||||
&physfn->sriov->subsystem_device);
|
&physfn->sriov->subsystem_device);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int pci_iov_sysfs_link(struct pci_dev *dev,
|
||||||
|
struct pci_dev *virtfn, int id)
|
||||||
|
{
|
||||||
|
char buf[VIRTFN_ID_LEN];
|
||||||
|
int rc;
|
||||||
|
|
||||||
|
sprintf(buf, "virtfn%u", id);
|
||||||
|
rc = sysfs_create_link(&dev->dev.kobj, &virtfn->dev.kobj, buf);
|
||||||
|
if (rc)
|
||||||
|
goto failed;
|
||||||
|
rc = sysfs_create_link(&virtfn->dev.kobj, &dev->dev.kobj, "physfn");
|
||||||
|
if (rc)
|
||||||
|
goto failed1;
|
||||||
|
|
||||||
|
kobject_uevent(&virtfn->dev.kobj, KOBJ_CHANGE);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
failed1:
|
||||||
|
sysfs_remove_link(&dev->dev.kobj, buf);
|
||||||
|
failed:
|
||||||
|
return rc;
|
||||||
|
}
|
||||||
|
|
||||||
int pci_iov_add_virtfn(struct pci_dev *dev, int id)
|
int pci_iov_add_virtfn(struct pci_dev *dev, int id)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
int rc = -ENOMEM;
|
int rc = -ENOMEM;
|
||||||
u64 size;
|
u64 size;
|
||||||
char buf[VIRTFN_ID_LEN];
|
|
||||||
struct pci_dev *virtfn;
|
struct pci_dev *virtfn;
|
||||||
struct resource *res;
|
struct resource *res;
|
||||||
struct pci_sriov *iov = dev->sriov;
|
struct pci_sriov *iov = dev->sriov;
|
||||||
|
@ -182,23 +205,14 @@ int pci_iov_add_virtfn(struct pci_dev *dev, int id)
|
||||||
}
|
}
|
||||||
|
|
||||||
pci_device_add(virtfn, virtfn->bus);
|
pci_device_add(virtfn, virtfn->bus);
|
||||||
|
rc = pci_iov_sysfs_link(dev, virtfn, id);
|
||||||
sprintf(buf, "virtfn%u", id);
|
|
||||||
rc = sysfs_create_link(&dev->dev.kobj, &virtfn->dev.kobj, buf);
|
|
||||||
if (rc)
|
if (rc)
|
||||||
goto failed1;
|
goto failed1;
|
||||||
rc = sysfs_create_link(&virtfn->dev.kobj, &dev->dev.kobj, "physfn");
|
|
||||||
if (rc)
|
|
||||||
goto failed2;
|
|
||||||
|
|
||||||
kobject_uevent(&virtfn->dev.kobj, KOBJ_CHANGE);
|
|
||||||
|
|
||||||
pci_bus_add_device(virtfn);
|
pci_bus_add_device(virtfn);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
failed2:
|
|
||||||
sysfs_remove_link(&dev->dev.kobj, buf);
|
|
||||||
failed1:
|
failed1:
|
||||||
pci_stop_and_remove_bus_device(virtfn);
|
pci_stop_and_remove_bus_device(virtfn);
|
||||||
pci_dev_put(dev);
|
pci_dev_put(dev);
|
||||||
|
|
|
@ -2048,6 +2048,8 @@ int pci_iov_virtfn_devfn(struct pci_dev *dev, int id);
|
||||||
|
|
||||||
int pci_enable_sriov(struct pci_dev *dev, int nr_virtfn);
|
int pci_enable_sriov(struct pci_dev *dev, int nr_virtfn);
|
||||||
void pci_disable_sriov(struct pci_dev *dev);
|
void pci_disable_sriov(struct pci_dev *dev);
|
||||||
|
|
||||||
|
int pci_iov_sysfs_link(struct pci_dev *dev, struct pci_dev *virtfn, int id);
|
||||||
int pci_iov_add_virtfn(struct pci_dev *dev, int id);
|
int pci_iov_add_virtfn(struct pci_dev *dev, int id);
|
||||||
void pci_iov_remove_virtfn(struct pci_dev *dev, int id);
|
void pci_iov_remove_virtfn(struct pci_dev *dev, int id);
|
||||||
int pci_num_vf(struct pci_dev *dev);
|
int pci_num_vf(struct pci_dev *dev);
|
||||||
|
@ -2073,6 +2075,12 @@ static inline int pci_iov_virtfn_devfn(struct pci_dev *dev, int id)
|
||||||
}
|
}
|
||||||
static inline int pci_enable_sriov(struct pci_dev *dev, int nr_virtfn)
|
static inline int pci_enable_sriov(struct pci_dev *dev, int nr_virtfn)
|
||||||
{ return -ENODEV; }
|
{ return -ENODEV; }
|
||||||
|
|
||||||
|
static inline int pci_iov_sysfs_link(struct pci_dev *dev,
|
||||||
|
struct pci_dev *virtfn, int id)
|
||||||
|
{
|
||||||
|
return -ENODEV;
|
||||||
|
}
|
||||||
static inline int pci_iov_add_virtfn(struct pci_dev *dev, int id)
|
static inline int pci_iov_add_virtfn(struct pci_dev *dev, int id)
|
||||||
{
|
{
|
||||||
return -ENOSYS;
|
return -ENOSYS;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue