diff options
| author | Bert Kenward <bkenward@solarflare.com> | 2018-07-26 16:21:29 +0100 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2018-08-14 16:04:46 -0500 |
| commit | 6eaf2781137842429c447bb491402b231df8a0f1 (patch) | |
| tree | 7028e521afae6241b3a1fc33d0ba2d5988357a5d | |
| parent | b72ae8cac0caff86fe414fceb940655c2d1371c9 (diff) | |
| download | lwn-6eaf2781137842429c447bb491402b231df8a0f1.tar.gz lwn-6eaf2781137842429c447bb491402b231df8a0f1.zip | |
PCI/VPD: Check for VPD access completion before checking for timeout
Previously we checked the timeout before checking the VPD access completion
bit. On a very heavily loaded system this can cause VPD access to timeout.
Check the completion bit before checking the timeout.
Signed-off-by: Bert Kenward <bkenward@solarflare.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
| -rw-r--r-- | drivers/pci/vpd.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/pci/vpd.c b/drivers/pci/vpd.c index 8617565ba561..4963c2e2bd4c 100644 --- a/drivers/pci/vpd.c +++ b/drivers/pci/vpd.c @@ -146,7 +146,7 @@ static int pci_vpd_wait(struct pci_dev *dev) if (!vpd->busy) return 0; - while (time_before(jiffies, timeout)) { + do { ret = pci_user_read_config_word(dev, vpd->cap + PCI_VPD_ADDR, &status); if (ret < 0) @@ -160,10 +160,13 @@ static int pci_vpd_wait(struct pci_dev *dev) if (fatal_signal_pending(current)) return -EINTR; + if (time_after(jiffies, timeout)) + break; + usleep_range(10, max_sleep); if (max_sleep < 1024) max_sleep *= 2; - } + } while (true); pci_warn(dev, "VPD access failed. This is likely a firmware bug on this device. Contact the card vendor for a firmware update\n"); return -ETIMEDOUT; |