Commit 26f41062 authored by Kay, Allen M's avatar Kay, Allen M Committed by Jesse Barnes
Browse files

PCI: check for pci bar restore completion and retry

On some OEM systems, pci_restore_state() is called while FLR has not yet
completed.  As a result, PCI BAR register restore is not successful.  This fix
reads back the restored value and compares it with saved value and re-tries 10
times before giving up.
Signed-off-by: default avatarJean Guyader <>
Signed-off-by: default avatarEric Chanudet <>
Signed-off-by: default avatarAllen Kay <>
Signed-off-by: default avatarJesse Barnes <>
parent 2debd928
......@@ -959,6 +959,7 @@ void pci_restore_state(struct pci_dev *dev)
int i;
u32 val;
int tries;
if (!dev->state_saved)
......@@ -973,12 +974,16 @@ void pci_restore_state(struct pci_dev *dev)
for (i = 15; i >= 0; i--) {
pci_read_config_dword(dev, i * 4, &val);
if (val != dev->saved_config_space[i]) {
tries = 10;
while (tries && val != dev->saved_config_space[i]) {
dev_dbg(&dev->dev, "restoring config "
"space at offset %#x (was %#x, writing %#x)\n",
i, val, (int)dev->saved_config_space[i]);
pci_write_config_dword(dev,i * 4,
pci_read_config_dword(dev, i * 4, &val);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment