Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 947b2a80 authored by Eli Cohen's avatar Eli Cohen Committed by Roland Dreier
Browse files

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: default avatarEli Cohen <eli@mellanox.co.il>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 6958e827

drivers/net/mlx4/reset.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -119,6 +119,9 @@ int mlx4_reset(struct mlx4_dev *dev) 
	writel(MLX4_RESET_VALUE, reset + MLX4_RESET_OFFSET);

	writel(MLX4_RESET_VALUE, reset + MLX4_RESET_OFFSET);

	iounmap(reset);

	iounmap(reset);





	/* Docs say to wait one second before accessing device */

	msleep(1000);



	end = jiffies + MLX4_RESET_TIMEOUT_JIFFIES;

	end = jiffies + MLX4_RESET_TIMEOUT_JIFFIES;

	do {

	do {

		if (!pci_read_config_word(dev->pdev, PCI_VENDOR_ID, &vendor) &&

		if (!pci_read_config_word(dev->pdev, PCI_VENDOR_ID, &vendor) &&