linux-stable.git/drivers/net/forcedeth.c, branch linux-2.6.26.y

forcedeth: fix checksum flag

2008-09-08T11:44:19+00:00

commit edcfe5f7e307846e578fb88d69fa27051fded0ab upstream

Fix the checksum feature advertised in device flags.  The hardware support
TCP/UDP over IPv4 and TCP/UDP over IPv6 (without IPv6 extension headers).
However, the kernel feature flags do not distinguish IPv6 with/without
extension headers.

Therefore, the driver needs to use NETIF_F_IP_CSUM instead of
NETIF_F_HW_CSUM since the latter includes all IPv6 packets.

A future patch can be created to check for extension headers and perform
software checksum calculation.

Signed-off-by: Ayaz Abdulla 
Cc: Jeff Garzik 
Cc: Manfred Spraul 
Signed-off-by: Andrew Morton 
Signed-off-by: Jeff Garzik 
Signed-off-by: Greg Kroah-Hartman

forcedeth: fix lockdep warning on ethtool -s

2008-07-04T12:09:52+00:00

After enabling CONFIG_LOCKDEP and CONFIG_PROVE_LOCKING I get the
following warning when ethtool -s is first called on one of the
forcedeth ports:

=================================
[ INFO: inconsistent lock state ]
2.6.26-rc4 #28
---------------------------------
inconsistent {in-hardirq-W} -> {hardirq-on-W} usage.
ethtool/1985 [HC0[0]:SC0[1]:HE1:SE0] takes:
 (&np->lock){++..}, at: [] nv_set_settings+0xc8/0x3de [forcedeth]
{in-hardirq-W} state was registered at:
  [] 0xffffffffffffffff
irq event stamp: 3606
hardirqs last  enabled at (3605): [] _spin_unlock_irqrestore+0x3f/0x68
hardirqs last disabled at (3604): [] _spin_lock_irqsave+0x13/0x46
softirqs last  enabled at (3534): [] __do_softirq+0xbc/0xc5
softirqs last disabled at (3606): [] _spin_lock_bh+0x11/0x41

other info that might help us debug this:
2 locks held by ethtool/1985:
 #0:  (rtnl_mutex){--..}, at: [] rtnl_lock+0x12/0x14
 #1:  (_xmit_ETHER){-+..}, at: [] nv_set_settings+0xb3/0x3de [forcedeth]
stack backtrace:
Pid: 1985, comm: ethtool Not tainted 2.6.26-rc4 #28
Call Trace:
 [] print_usage_bug+0x162/0x173
 [] mark_lock+0x231/0x41f
 [] __lock_acquire+0x4e7/0xcac
 [] ? trace_hardirqs_on+0xf1/0x115
 [] ? disable_irq_nosync+0x6f/0x7b
 [] lock_acquire+0x55/0x6e
 [] ? :forcedeth:nv_set_settings+0xc8/0x3de
 [] _spin_lock+0x2f/0x3c
 [] :forcedeth:nv_set_settings+0xc8/0x3de
 [] dev_ethtool+0x186/0xea3
 [] ? mutex_lock_nested+0x243/0x275
 [] ? debug_mutex_free_waiter+0x46/0x4a
 [] ? mutex_lock_nested+0x266/0x275
 [] dev_ioctl+0x4eb/0x600
 [] ? _spin_unlock_irqrestore+0x3f/0x68
 [] sock_ioctl+0x1f5/0x202
 [] vfs_ioctl+0x2a/0x77
 [] do_vfs_ioctl+0x25b/0x270
 [] ? trace_hardirqs_on_thunk+0x35/0x3a
 [] sys_ioctl+0x42/0x65
 [] system_call_after_swapgs+0x7b/0x80

This is caused by the following snippet in nv_set_settings:

	netif_carrier_off(dev);
	if (netif_running(dev)) {
		nv_disable_irq(dev);
		netif_tx_lock_bh(dev);
		spin_lock(&np->lock);
		/* stop engines */
		nv_stop_rxtx(dev);
		spin_unlock(&np->lock);
		netif_tx_unlock_bh(dev);
	}

Because of nv_disable_irq this is probably not really a problem
though (I guess) and replacing the spin_lock with spin_lock_irqsave
could keep interrupts disabled for a longer period of time because
of delays in nv_stop_rx and nv_stop_tx.

Signed-off-by: Tobias Diedrich 
Cc: Ayaz Abdulla 
Signed-off-by: Andrew Morton 
Signed-off-by: Jeff Garzik

forcedeth: msi interrupts

2008-06-10T22:20:13+00:00

Add a workaround for lost MSI interrupts.  There is a race condition in
the HW in which future interrupts could be missed.  The workaround is to
toggle the MSI irq mask.

Added cleanup based on comments from Andrew Morton.

Signed-off-by: Ayaz Abdulla 
Cc: Manfred Spraul 
Cc: Jeff Garzik 
Cc: 
Signed-off-by: Andrew Morton 
Signed-off-by: Jeff Garzik

[netdrvr] forcedeth: Restore multicast settings on resume

2008-05-22T10:18:47+00:00

nv_open() resets multicast settings, call nv_set_multicast(dev)
to restore them.  (Maybe this should rather be moved into nv_open())

Signed-off-by: Tobias Diedrich 
Signed-off-by: Jeff Garzik

forcedeth: realtek phy crossover detection

2008-04-25T06:08:57+00:00

This patch fixes an issue seen with the realtek 8201 phy. This phy has a
problem with crossover detection and it needs to be disabled. The
problem only arises on certain switches. Therefore, a module parameter
has been added to allow enabling crossover detection if needed. The
default will be set to disabled.

Signed-off-by: Ayaz Abdulla 
Signed-off-by: Jeff Garzik

forcedeth: new backoff implementation

2008-04-25T06:08:53+00:00

This patch adds support for a new backoff algorithm for half duplex supported
in newer hardware.  The old method is will be designated as legacy mode.

Re-seeding random values for the backoff algorithms are performed when a
transmit has failed due to a maximum retry count (1 to 15, where max is
considered the wraparound case of 0).

Signed-off-by: Ayaz Abdulla 
Signed-off-by: Andrew Morton 
Signed-off-by: Jeff Garzik

[netdrvr] forcedeth: internal simplifications; changelog removal

2008-04-17T19:31:33+00:00

* remove changelog from source; its kept in git repository

* consolidate descriptor version tests using nv_optimized()

* consolidate NIC DMA start, stop and drain into
  nv_start_txrx(), nv_stop_txrx(), nv_drain_txrx()

Signed-off-by: Jeff Garzik

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2008-04-14T09:30:23+00:00

Conflicts:

	drivers/net/ehea/ehea_main.c
	drivers/net/wireless/iwlwifi/Kconfig
	drivers/net/wireless/rt2x00/rt61pci.c
	net/ipv4/inet_timewait_sock.c
	net/ipv6/raw.c
	net/mac80211/ieee80211_sta.c

forcedeth: mac address fix

2008-04-12T08:38:12+00:00

This critical patch fixes a mac address issue recently introduced.  If the
device's mac address was in correct order and the flag
NVREG_TRANSMITPOLL_MAC_ADDR_REV was set, during nv_remove the flag would get
cleared.  During next load, the mac address would get reversed because the
flag is missing.

As it has been indicated previously, the flag is cleared across a low power
transition.  Therefore, the driver should set the mac address back into the
reversed order when clearing the flag.

Also, the driver should set back the flag after a low power transition to
protect against kexec command calling nv_probe a second time.

Signed-off-by: Ayaz Abdulla 
Cc: "Yinghai Lu" 
Signed-off-by: Andrew Morton 
Signed-off-by: Jeff Garzik

fix endian lossage in forcedeth

2008-04-04T21:26:16+00:00

a) if you initialize something with le32_to_cpu(...), then |= it
with host-endian and feed to cpu_to_le32(), it's most definitely
*not* __le32.  As sparse would've told you...

b) the whole sequence is |= cpu_to_le32(host-endian constant)

Signed-off-by: Al Viro 
Signed-off-by: Jeff Garzik