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

Commit 9e555930 authored by Ayaz Abdulla's avatar Ayaz Abdulla Committed by Jeff Garzik
Browse files

forcedeth boot delay fix 

Fix a long boot delay in the forcedeth driver.  During initialization, the
timeout for the handshake between mgmt unit and driver can be very long.
The patch reduces the timeout by eliminating a extra loop around the
timeout logic.

Addresses http://bugzilla.kernel.org/show_bug.cgi?id=9308



Signed-off-by: default avatarAyaz Abdulla <aabdulla@nvidia.com>
Cc: Alex Howells <astinus@gentoo.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 490dde89

drivers/net/forcedeth.c

+9 −13
Original line number Diff line number Diff line
@@ -5286,8 +5286,6 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i 
		if (readl(base + NvRegTransmitterControl) & NVREG_XMITCTL_SYNC_PHY_INIT) {

			np->mac_in_use = readl(base + NvRegTransmitterControl) & NVREG_XMITCTL_MGMT_ST;

			dprintk(KERN_INFO "%s: mgmt unit is running. mac in use %x.\n", pci_name(pci_dev), np->mac_in_use);

			for (i = 0; i < 5000; i++) {

				msleep(1);

			if (nv_mgmt_acquire_sema(dev)) {

				/* management unit setup the phy already? */

				if ((readl(base + NvRegTransmitterControl) & NVREG_XMITCTL_SYNC_MASK) ==
@@ -5298,8 +5296,6 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i 
				} else {

					/* we need to init the phy */

				}

					break;

				}

			}

		}

	}