aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2022-02-02 09:14:11 +0000
committerSeongJae Park <sj@kernel.org>2022-02-02 09:14:11 +0000
commitade203c46377f83fccb0be6f8b4c3d396aa97f5e (patch)
treec279fd2833b6d536038edfcdb7cc57ce615d31e4
parent327c651ce31479e2c19bf97413a27663caedd633 (diff)
downloadlinux-mmotm-assembled-by-sj.tar.gz
pci: test for unexpectedly disabled bridgesmmotm-assembled-by-sj-2022-02-02-10-33mmotm-assembled-by-sj
The all-ones value is not just a "device didn't exist" case, it's also potentially a quite valid value, so not restoring it would be wrong. What *would* be interesting is to hear where the bad values came from in the first place. It sounds like the device state is saved after the PCI bus controller in front of the device has been crapped on, resulting in the PCI config cycles never reaching the device at all. Something along this patch (together with suspend/resume debugging output) migth help pinpoint it. But it really sounds like something totally brokenly turned off the PCI bridge (some ACPI shutdown crud? I wouldn't be entirely surprised) Cc: Greg KH <greg@kroah.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-rw-r--r--drivers/pci/pci.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 9ecce435fb3f1..f24986e77195e 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1600,6 +1600,15 @@ static void pci_restore_ltr_state(struct pci_dev *dev)
int pci_save_state(struct pci_dev *dev)
{
int i;
+ u32 val;
+
+ /* Unable to read PCI device/manufacturer state? Something is seriously wrong! */
+ if (pci_read_config_dword(dev, 0, &val) || val == 0xffffffff) {
+ printk("Broken read from PCI device %s\n", pci_name(dev));
+ WARN_ON(1);
+ return -1;
+ }
+
/* XXX: 100% dword access ok here? */
for (i = 0; i < 16; i++) {
pci_read_config_dword(dev, i * 4, &dev->saved_config_space[i]);