diff options
| author | Niklas Schnelle <schnelle@linux.ibm.com> | 2020-11-02 11:33:04 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-11-10 12:39:08 +0100 |
| commit | 2941054990baffcc94ff16c04d46078ae88d328c (patch) | |
| tree | d9cd5a43651b48fe10c8004a6ace3a31ad57ed2e | |
| parent | 1f7a50f1d7ba92977d6c880aefaad0a6ef234029 (diff) | |
| download | linux-2941054990baffcc94ff16c04d46078ae88d328c.tar.gz linux-2941054990baffcc94ff16c04d46078ae88d328c.tar.bz2 linux-2941054990baffcc94ff16c04d46078ae88d328c.zip | |
s390/pci: fix hot-plug of PCI function missing bus
commit 0b2ca2c7d0c9e2731d01b6c862375d44a7e13923 upstream.
Under some circumstances in particular with "Reconfigure I/O Path"
a zPCI function may first appear in Standby through a PCI event with
PEC 0x0302 which initially makes it visible to the zPCI subsystem,
Only after that is it configured with a zPCI event with PEC 0x0301.
If the zbus is still missing a PCI function zero (devfn == 0) when the
PCI event 0x0301 is handled zdev->zbus->bus is still NULL and gets
dereferenced in common code.
Check for this case and enable but don't scan the zPCI function.
This matches what would happen if we immediately got the 0x0301
configuration request or the function was included in CLP List PCI.
In all cases the PCI functions with devfn != 0 will be scanned once
function 0 appears.
Fixes: 3047766bc6ec ("s390/pci: fix enabling a reserved PCI function")
Cc: <stable@vger.kernel.org> # 5.8
Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com>
Acked-by: Pierre Morel <pmorel@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | arch/s390/pci/pci_event.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/s390/pci/pci_event.c b/arch/s390/pci/pci_event.c index d9ae7456dd4c..40a569b548cc 100644 --- a/arch/s390/pci/pci_event.c +++ b/arch/s390/pci/pci_event.c @@ -101,6 +101,10 @@ static void __zpci_event_availability(struct zpci_ccdf_avail *ccdf) if (ret) break; + /* the PCI function will be scanned once function 0 appears */ + if (!zdev->zbus->bus) + break; + pdev = pci_scan_single_device(zdev->zbus->bus, zdev->devfn); if (!pdev) break; |