PCI/PM: Print the pci config space of devices before suspend
PATCH 1/1 PCI/PM: Print the pci config space of devices before suspend
The pci config space was found to be insane during resume from hibernation(S4, or suspend to disk) on a VM:
serial 0000:00:16.3: restoring config space at offset 0x14 (was 0x9104e000, writing 0xffffffff)
Either the snapshot on the disk has been scribbled or the pci config space becomes invalid before suspend. To narrow down and benefit future debugging, print the pci config space being saved before suspend, which is symmetric to the log in pci_restore_config_dword().
--- drivers/pci/pci.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/pci/pci.c +4 -1
@@ -1372,8 +1372,11 @@ int pci_save_state(struct pci_dev *dev) {int i;/* XXX: 100% dword access ok here? */ -for (i =0 ; i <16 ; i++) +for (i =0 ; i <16 ; i++) {pci_read_config_dword (dev, i *4 , &dev->saved_config_space[i]); +pci_dbg (dev,"saving config space at offset %#x (reading %#x)\n" , + i *4 , dev->saved_config_space[i]); + } dev->state_saved = true; i =pci_save_pcie_state (dev);
Signature · 1 line
2.17.1
Quoted 2 lines · Chen Yu
The pci config space was found to be insane during resume
I wouldn't call it "insane".
It probably means that the device was not present or not accessible during hibernation and now it appears to be present (maybe the restore kernel found it and configured it).
Quoted 7 lines
from
hibernation(S4, or suspend to disk)on a VM:serial 0000:00:16.3: restoring config space at offset
0x14(was0x9104e000, writing0xffffffff)Either the snapshot on the disk has been scribbled or the pci config space becomes invalid before suspend.
Or, most likely, the above.
Quoted 3 lines
To narrow down and benefit future debugging, print the pci config space being saved before suspend, which is symmetric to the log
inpci_restore_config_dword().
But the code change makes sense to me.
Quoted 31 lines
Cc Bjorn Helgaas <[email protected]>Cc "Rafael J. Wysocki" <[email protected]>Cc Len Brown <[email protected]>Signed-off-by Chen Yu <[email protected]>--- drivers/pci/pci.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)drivers/pci/pci.c +4
-2@@ -1372,8 +1372,11 @@ int pci_save_state(struct pci_dev *dev) {int i;/* XXX: 100% dword access ok here? */ -for (i =0 ; i <16 ; i++) +for (i =0 ; i <16 ; i++) {pci_read_config_dword (dev, i *4 , &dev->saved_config_space[i]); +pci_dbg (dev,"saving config space at offset %#x (reading %#x)\n" , + i *4 , dev->saved_config_space[i]); + } dev->state_saved = true; i =pci_save_pcie_state (dev); --2.17.1
Hi Rafael,
Quoted 10 lines · Rafael J. Wysocki
Quoted 2 lines · Chen Yu
The pci config space was found to be insane during resume
I wouldn't call it "insane".
It probably means that the device was not present or not accessible during hibernation and now it appears to be present (maybe the restore kernel found it and configured it).
Right, thanks for the hint. If this is the case, it should not save any pci config settings if that device is not accessible, otherwise there's risk of pci config hard confliction after resumed. I've applied the patch and wait for the issue to be reproduced (not 100%) and will send the result later.
Thanks,
Chenyu
Bjorn Helgaas
AppliedQuoted 12 lines · Chen Yu
The pci config space was found to be insane during resume from
hibernation(S4, or suspend to disk)on a VM:serial 0000:00:16.3: restoring config space at offset
0x14(was0x9104e000, writing0xffffffff)Either the snapshot on the disk has been scribbled or the pci config space becomes invalid before suspend. To narrow down and benefit future debugging, print the pci config space being saved before suspend, which is symmetric to the log in
pci_restore_config_dword().
Quoted 7 lines
Cc Bjorn Helgaas <[email protected]>Cc "Rafael J. Wysocki" <[email protected]>Cc Len Brown <[email protected]>Signed-off-by Chen Yu <[email protected]>
Applied to pci/pm for v5.6, thanks!
Quoted 24 lines
--- drivers/pci/pci.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)drivers/pci/pci.c +4
-1@@ -1372,8 +1372,11 @@ int pci_save_state(struct pci_dev *dev) {int i;/* XXX: 100% dword access ok here? */ -for (i =0 ; i <16 ; i++) +for (i =0 ; i <16 ; i++) {pci_read_config_dword (dev, i *4 , &dev->saved_config_space[i]); +pci_dbg (dev,"saving config space at offset %#x (reading %#x)\n" , + i *4 , dev->saved_config_space[i]); + } dev->state_saved = true; i =pci_save_pcie_state (dev);Signature · 1 line
2.17.1