forked from luck/tmp_suning_uos_patched
b97bf44f99
Currently there are four places in which a PCI function is scanned
and made available to drivers:
1. In pci_scan_root_bus() as part of the initial zbus
creation.
2. In zpci_bus_add_devices() when registering
a device in configured state on a zbus that has already been
scanned.
3. When a function is already known to zPCI (in reserved/standby state)
and configuration is triggered through firmware by PEC 0x301.
4. When a device is already known to zPCI (in standby/reserved state)
and configuration is triggered from within Linux using
enable_slot().
The PF/VF linking step and setting of pdev->is_virtfn introduced with
commit e5794cf1a2 ("s390/pci: create links between PFs and VFs") was
only triggered for the second case, which is where VFs created through
sriov_numvfs usually land. However unlike some other platforms but like
POWER VFs can be individually enabled/disabled through
/sys/bus/pci/slots.
Fix this by doing VF setup as part of pcibios_bus_add_device() which is
called in all of the above cases.
Finally to remove the PF/VF links call the common code
pci_iov_remove_virtfn() function to remove linked VFs.
This takes care of the necessary sysfs cleanup.
Fixes: e5794cf1a2 ("s390/pci: create links between PFs and VFs")
Cc: <stable@vger.kernel.org> # 5.8: 2f0230b2f2d5: s390/pci: re-introduce zpci_remove_device()
Cc: <stable@vger.kernel.org> # 5.8
Acked-by: Pierre Morel <pmorel@linux.ibm.com>
Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
45 lines
1.2 KiB
C
45 lines
1.2 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/*
|
|
* Copyright IBM Corp. 2020
|
|
*
|
|
* Author(s):
|
|
* Pierre Morel <pmorel@linux.ibm.com>
|
|
*
|
|
*/
|
|
|
|
int zpci_bus_device_register(struct zpci_dev *zdev, struct pci_ops *ops);
|
|
void zpci_bus_device_unregister(struct zpci_dev *zdev);
|
|
int zpci_bus_init(void);
|
|
|
|
void zpci_release_device(struct kref *kref);
|
|
static inline void zpci_zdev_put(struct zpci_dev *zdev)
|
|
{
|
|
kref_put(&zdev->kref, zpci_release_device);
|
|
}
|
|
|
|
int zpci_alloc_domain(int domain);
|
|
void zpci_free_domain(int domain);
|
|
int zpci_setup_bus_resources(struct zpci_dev *zdev,
|
|
struct list_head *resources);
|
|
|
|
static inline struct zpci_dev *get_zdev_by_bus(struct pci_bus *bus,
|
|
unsigned int devfn)
|
|
{
|
|
struct zpci_bus *zbus = bus->sysdata;
|
|
|
|
return (devfn >= ZPCI_FUNCTIONS_PER_BUS) ? NULL : zbus->function[devfn];
|
|
}
|
|
|
|
#ifdef CONFIG_PCI_IOV
|
|
static inline void zpci_remove_virtfn(struct pci_dev *pdev, int vfn)
|
|
{
|
|
|
|
pci_lock_rescan_remove();
|
|
/* Linux' vfid's start at 0 vfn at 1 */
|
|
pci_iov_remove_virtfn(pdev->physfn, vfn - 1);
|
|
pci_unlock_rescan_remove();
|
|
}
|
|
#else /* CONFIG_PCI_IOV */
|
|
static inline void zpci_remove_virtfn(struct pci_dev *pdev, int vfn) {}
|
|
#endif /* CONFIG_PCI_IOV */
|