Re: [PATCH] forcedeth boot delay fix

[Ayaz Abdulla <aabdulla@nvidia.com>]

[-- Attachment #1: Type: text/plain, Size: 2145 bytes --]

Missed that "break". Here is the corrected patch.

Signed-off-by: Ayaz Abdulla <aabdulla@nvidia.com>



Andrew Morton wrote:
> On Sun, 18 Nov 2007 14:13:41 -0500 Ayaz Abdulla <aabdulla@nvidia.com> wrote:
> 
> 
>>This patch fixes 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.
>>
>>Signed-off-by: Ayaz Abdulla <aabdulla@nvidia.com>
>>
>>
>>
>>[patch-forcedeth-sema-fix  text/plain (1.3KB)]
>>--- old/drivers/net/forcedeth.c	2007-11-08 17:33:00.000000000 -0500
>>+++ new/drivers/net/forcedeth.c	2007-11-08 17:34:25.000000000 -0500
>>@@ -5286,20 +5286,17 @@
>> 		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) ==
>>-					    NVREG_XMITCTL_SYNC_PHY_INIT) {
>>-						/* phy is inited by mgmt unit */
>>-						phyinitialized = 1;
>>-						dprintk(KERN_INFO "%s: Phy already initialized by mgmt unit.\n", pci_name(pci_dev));
>>-					} else {
>>-						/* we need to init the phy */
>>-					}
>>-					break;
>>+			if (nv_mgmt_acquire_sema(dev)) {
>>+				/* management unit setup the phy already? */
>>+				if ((readl(base + NvRegTransmitterControl) & NVREG_XMITCTL_SYNC_MASK) ==
>>+				    NVREG_XMITCTL_SYNC_PHY_INIT) {
>>+					/* phy is inited by mgmt unit */
>>+					phyinitialized = 1;
>>+					dprintk(KERN_INFO "%s: Phy already initialized by mgmt unit.\n", pci_name(pci_dev));
>>+				} else {
>>+					/* we need to init the phy */
>> 				}
>>+				break;
>> 			}
>> 		}
>> 	}
> 
> 
> drivers/net/forcedeth.c: In function 'nv_probe':
> drivers/net/forcedeth.c:5307: error: break statement not within loop or switch  

[-- Attachment #2: patch-forcedeth-sema-fix --]
[-- Type: text/plain, Size: 1345 bytes --]

--- old/drivers/net/forcedeth.c	2007-11-08 17:33:00.000000000 -0500
+++ new/drivers/net/forcedeth.c	2007-11-19 13:09:03.000000000 -0500
@@ -5286,19 +5286,15 @@
 		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) ==
-					    NVREG_XMITCTL_SYNC_PHY_INIT) {
-						/* phy is inited by mgmt unit */
-						phyinitialized = 1;
-						dprintk(KERN_INFO "%s: Phy already initialized by mgmt unit.\n", pci_name(pci_dev));
-					} else {
-						/* we need to init the phy */
-					}
-					break;
+			if (nv_mgmt_acquire_sema(dev)) {
+				/* management unit setup the phy already? */
+				if ((readl(base + NvRegTransmitterControl) & NVREG_XMITCTL_SYNC_MASK) ==
+				    NVREG_XMITCTL_SYNC_PHY_INIT) {
+					/* phy is inited by mgmt unit */
+					phyinitialized = 1;
+					dprintk(KERN_INFO "%s: Phy already initialized by mgmt unit.\n", pci_name(pci_dev));
+				} else {
+					/* we need to init the phy */
 				}
 			}
 		}