Patchwork [RFC,v3,01/21] PCI: Fix writing invalid BARs during pci_restore_state()

login
register
mail settings
Submitter Sergey Miroshnichenko
Date Feb. 4, 2019, 3:35 p.m.
Message ID <20190204153601.7576-2-s.miroshnichenko@yadro.com>
Download mbox | patch
Permalink /patch/717443/
State New
Headers show

Comments

Sergey Miroshnichenko - Feb. 4, 2019, 3:35 p.m.
If BAR movement has happened (due to PCIe hotplug) after pci_save_state(),
the saved addresses will become outdated. Restore them the most recently
calculated values, not the ones stored in an arbitrary moment.

Signed-off-by: Sergey Miroshnichenko <s.miroshnichenko@yadro.com>
---
 drivers/pci/pci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index c25acace7d91..e1fc93c9eea1 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1337,7 +1337,7 @@  static void pci_restore_config_space(struct pci_dev *pdev)
 	if (pdev->hdr_type == PCI_HEADER_TYPE_NORMAL) {
 		pci_restore_config_space_range(pdev, 10, 15, 0, false);
 		/* Restore BARs before the command register. */
-		pci_restore_config_space_range(pdev, 4, 9, 10, false);
+		pci_restore_bars(pdev);
 		pci_restore_config_space_range(pdev, 0, 3, 0, false);
 	} else if (pdev->hdr_type == PCI_HEADER_TYPE_BRIDGE) {
 		pci_restore_config_space_range(pdev, 12, 15, 0, false);