From: Prarit Bhargava <prarit@redhat.com>
Date: Mon, 17 May 2010 18:25:14 +0000 (-0400)
Subject: PCI: output FW warning in pci_read/write_vpd
X-Git-Tag: v2.6.35-rc1~433^2~6
X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=5030718ee465c759c2a851851e79039f58b9efb3;p=net-next-2.6.git

PCI: output FW warning in pci_read/write_vpd

pci_read/write_vpd() can fail due to a timeout.  Usually the command
times out because of firmware issues (incorrect vpd length, etc.) on the
PCI card.  Currently, the timeout occurs silently.

Output a message to the user indicating that they should check with
their vendor for new firmware.

Reviewed-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Prarit Bhargava <prarit@redhat.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
---

diff --git a/drivers/pci/access.c b/drivers/pci/access.c
index affb83b42eb..531bc697d80 100644
--- a/drivers/pci/access.c
+++ b/drivers/pci/access.c
@@ -220,8 +220,13 @@ static int pci_vpd_pci22_wait(struct pci_dev *dev)
 			return 0;
 		}
 
-		if (time_after(jiffies, timeout))
+		if (time_after(jiffies, timeout)) {
+			dev_printk(KERN_DEBUG, &dev->dev,
+				   "vpd r/w failed.  This is likely a firmware "
+				   "bug on this device.  Contact the card "
+				   "vendor for a firmware update.");
 			return -ETIMEDOUT;
+		}
 		if (fatal_signal_pending(current))
 			return -EINTR;
 		if (!cond_resched())