summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-02-15 00:09:39 +0000
committerJérôme Glisse <jglisse@redhat.com>2019-02-19 08:41:02 -0500
commite82bdf2c7f18e339532aaf8807d32bb83a9075e9 (patch)
treefc460cd1851e113be7a1034f7c8212928dffa6e6
parentaeeed7f8eeba8f286da802e63536ddaf01dbfa69 (diff)
pci: test for unexpectedly disabled bridges
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 ae8db8a3d196..cb5804da8aae 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1316,6 +1316,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]);