Skip to content

Commit 42f5ac7

Browse files
niklas88mehmetb0
authored andcommitted
s390/pci: Fix SR-IOV for PFs initially in standby
BugLink: https://bugs.launchpad.net/bugs/2104091 commit dc287e4 upstream. Since commit 25f39d3 ("s390/pci: Ignore RID for isolated VFs") PFs which are not initially configured but in standby are considered isolated. That is they create only a single function PCI domain. Due to the PCI domains being created on discovery, this means that even if they are configured later on, sibling PFs and their child VFs will not be added to their PCI domain breaking SR-IOV expectations. The reason the referenced commit ignored standby PFs for the creation of multi-function PCI subhierarchies, was to work around a PCI domain renumbering scenario on reboot. The renumbering would occur after removing a previously in standby PF, whose domain number is used for its configured sibling PFs and their child VFs, but which itself remained in standby. When this is followed by a reboot, the sibling PF is used instead to determine the PCI domain number of it and its child VFs. In principle it is not possible to know which standby PFs will be configured later and which may be removed. The PCI domain and root bus are pre-requisites for hotplug slots so the decision of which functions belong to which domain can not be postponed. With the renumbering occurring only in rare circumstances and being generally benign, accept it as an oddity and fix SR-IOV for initially standby PFs simply by allowing them to create PCI domains. Cc: [email protected] Reviewed-by: Gerd Bayer <[email protected]> Fixes: 25f39d3 ("s390/pci: Ignore RID for isolated VFs") Signed-off-by: Niklas Schnelle <[email protected]> Signed-off-by: Alexander Gordeev <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Noah Wager <[email protected]>
1 parent 1bc4356 commit 42f5ac7

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

arch/s390/pci/pci_bus.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,6 @@ void zpci_bus_scan_busses(void)
171171
static bool zpci_bus_is_multifunction_root(struct zpci_dev *zdev)
172172
{
173173
return !s390_pci_no_rid && zdev->rid_available &&
174-
zpci_is_device_configured(zdev) &&
175174
!zdev->vfn;
176175
}
177176

0 commit comments

Comments
 (0)