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

Commit 1b1b3c9b authored by Manfred Spraul's avatar Manfred Spraul Committed by Jeff Garzik
Browse files

[PATCH] forcedeth: Initialize link settings in every nv_open() 



Rüdiger found a bug in nv_open that explains some of the reports
with duplex mismatches:
nv_open calls nv_update_link_speed for initializing the hardware link speed
registers. If current link setting matches the values in np->linkspeed and
np->duplex, then the function does nothing.
Usually, doing nothing is the right thing, but not in nv_open: During
nv_open, the registers must be initialized because the nic was reset.

The attached patch fixes that by setting np->linkspeed to an invalid value
before calling nv_update_link_speed from nv_open.

Signed-Off-By: default avatarManfred Spraul <manfred@colorfullife.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent a3bc0680

drivers/net/forcedeth.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -93,6 +93,8 @@ 
 *      0.40: 19 Jul 2005: Add support for mac address change.

 *      0.40: 19 Jul 2005: Add support for mac address change.

 *      0.41: 30 Jul 2005: Write back original MAC in nv_close instead

 *      0.41: 30 Jul 2005: Write back original MAC in nv_close instead

 *			   of nv_remove

 *			   of nv_remove

 *      0.42: 06 Aug 2005: Fix lack of link speed initialization

 *			   in the second (and later) nv_open call

 *

 *

 * Known bugs:

 * Known bugs:

 * We suspect that on some hardware no TX done interrupts are generated.

 * We suspect that on some hardware no TX done interrupts are generated.
@@ -2178,6 +2180,9 @@ static int nv_open(struct net_device *dev) 
		writel(NVREG_MIISTAT_MASK, base + NvRegMIIStatus);

		writel(NVREG_MIISTAT_MASK, base + NvRegMIIStatus);

		dprintk(KERN_INFO "startup: got 0x%08x.\n", miistat);

		dprintk(KERN_INFO "startup: got 0x%08x.\n", miistat);

	}

	}

	/* set linkspeed to invalid value, thus force nv_update_linkspeed

	 * to init hw */

	np->linkspeed = 0;

	ret = nv_update_linkspeed(dev);

	ret = nv_update_linkspeed(dev);

	nv_start_rx(dev);

	nv_start_rx(dev);

	nv_start_tx(dev);

	nv_start_tx(dev);