summaryrefslogtreecommitdiffstats
path: root/drivers/net/mlx4/reset.c
diff options
context:
space:
mode:
authorEli Cohen2007-08-13 16:57:03 +0200
committerRoland Dreier2007-08-13 17:47:44 +0200
commit947b2a8083a03e6fff448ce8928956015614855e (patch)
treea5dc653181c0029c11c2d45ac417c67a15573b21 /drivers/net/mlx4/reset.c
parentIPoIB: Fix leak in ipoib_transport_dev_init() error path (diff)
downloadkernel-qcow2-linux-947b2a8083a03e6fff448ce8928956015614855e.tar.gz
kernel-qcow2-linux-947b2a8083a03e6fff448ce8928956015614855e.tar.xz
kernel-qcow2-linux-947b2a8083a03e6fff448ce8928956015614855e.zip
mlx4_core: Wait 1 second after reset before accessing device
Put a 1000 msec delay after resetting the device before attempting to do config cycles on it. Not waiting causes system hangs on some chipsets, e.g. Intel E7520, when the driver is loaded. Signed-off-by: Eli Cohen <eli@mellanox.co.il> Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/net/mlx4/reset.c')
-rw-r--r--drivers/net/mlx4/reset.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/mlx4/reset.c b/drivers/net/mlx4/reset.c
index e4dfd4b11a4a..e199715fabd0 100644
--- a/drivers/net/mlx4/reset.c
+++ b/drivers/net/mlx4/reset.c
@@ -119,6 +119,9 @@ int mlx4_reset(struct mlx4_dev *dev)
writel(MLX4_RESET_VALUE, reset + MLX4_RESET_OFFSET);
iounmap(reset);
+ /* Docs say to wait one second before accessing device */
+ msleep(1000);
+
end = jiffies + MLX4_RESET_TIMEOUT_JIFFIES;
do {
if (!pci_read_config_word(dev->pdev, PCI_VENDOR_ID, &vendor) &&