linux.git/drivers/net/ethernet, branch v3.2-rc4

sky2: fix hang in napi_disable

2011-11-18T02:43:57+00:00

If IRQ was never initialized, then calling napi_disable() would hang.
Add more bookkeeping to track whether IRQ was ever initialized.

Signed-off-by: Stephen Hemminger 
Signed-off-by: David S. Miller

sky2: enforce minimum ring size

2011-11-18T02:43:57+00:00

The hardware has a restriction that the minimum ring size possible
is 128. The number of elements used is controlled by tx_pending and
the overall number of elements in the ring tx_ring_size, therefore it
is okay to limit the number of elements in use to a small value (63)
but still provide a bigger ring.

Signed-off-by: Stephen Hemminger 
Signed-off-by: David S. Miller

stmmac: fix pm functions avoiding sleep on spinlock

2011-11-17T08:13:42+00:00

This patch fixes the pm functions to avoid the system
sleeps while a spinlock is taken.

Signed-off-by: Francesco Virlinzi 
Signed-off-by: Giuseppe Cavallaro 
Signed-off-by: David S. Miller

stmmac: remove spin_lock in stmmac_ioctl.

2011-11-17T08:13:42+00:00

This patch removes un-needed spin_lock in stmmac_ioctl while reading and
writing mdio registers. While holding spin_lock the code must be
atomic, which is not true in this case as both mdiobus_read and writes
have mutex locks.

Without this patch reading mdio registers via mii-tool results in below
BUG:
mii-tool -vvv eth0"
Using SIOCGMIIPHY=0x8947
BUG: sleeping function called from invalid context at kernel/mutex.c:287
in_atomic(): 1, irqs_disabled(): 0, pid: 614, name: mii-tool
2 locks held by mii-tool/614:
 #0:  (rtnl_mutex){......}, at: [] dev_ioctl+0x550/0x674
 #1:  (&priv->lock){......}, at: [] stmmac_ioctl+0x4c/0x78
[] (unwind_backtrace+0x0/0xcc) from []
(mutex_lock_nested+0x24/0x35c)
[] (mutex_lock_nested+0x24/0x35c) from []
(mdiobus_read+0x44/0x70)
[] (mdiobus_read+0x44/0x70) from []
(phy_mii_ioctl+0x4c/0x138)
[] (phy_mii_ioctl+0x4c/0x138) from []
(stmmac_ioctl+0x5c/0x78)
[] (stmmac_ioctl+0x5c/0x78) from []
(dev_ifsioc+0x2a4/0x2c8)
[] (dev_ifsioc+0x2a4/0x2c8) from []
(dev_ioctl+0x560/0x674)
[] (dev_ioctl+0x560/0x674) from []
(vfs_ioctl+0x2c/0x8c)
[] (vfs_ioctl+0x2c/0x8c) from []
(do_vfs_ioctl+0x530/0x578)
[] (do_vfs_ioctl+0x530/0x578) from []
(sys_ioctl+0x34/0x54)
[] (sys_ioctl+0x34/0x54) from []
(ret_fast_syscall+0x0/0x2c)

Signed-off-by: Srinivas Kandagatla 
Signed-off-by: Giuseppe Cavallaro 
Signed-off-by: David S. Miller

stmmac: parameters auto-tuning through HW cap reg

2011-11-17T08:13:41+00:00

New GMAC devices (newer than the databook 3.50a) have the
HW capability register that provides which features are actually
supported by the hardware.

On old devices many information have to be passed through the
platform, for example: enhanced descriptor structure,
TX COE etc. These are mandatory to properly configure the driver.
This remains still valid because the driver has to support old
Synopsys devices but now it's also able to override them using the
values from the HW capability register if supported.

Signed-off-by: Giuseppe Cavallaro 
Signed-off-by: David S. Miller

stmmac: fix advertising 1000Base capabilties for non GMII iface

2011-11-17T08:13:41+00:00

This patch fixes the way to stop the 1000Base advertising
capabilties for non GMII interfaces.

Signed-off-by: Srinivas Kandagatla 
Acked-by: Giuseppe Cavallaro 
Signed-off-by: David S. Miller

stmmac: use mdelay on timeout of sw reset

2011-11-17T08:13:41+00:00

This patch uses an mdelay to manage the timeout on
sw reset to be independant of cpu_clk.

Signed-off-by: Francesco Virlinzi 
Reviewed-by: Giuseppe Cavallaro 
Signed-off-by: David S. Miller

sky2: version 1.30

2011-11-17T01:27:30+00:00

Update version number.

Signed-off-by: Stephen Hemminger 
Signed-off-by: David S. Miller

sky2: used fixed RSS key

2011-11-17T01:27:28+00:00

Rather than generating a different RSS key on each boot, just use
a predetermined value that will map same flow to same value on
every device.

Signed-off-by: Stephen Hemminger 
Signed-off-by: David S. Miller

sky2: reduce default Tx ring size

2011-11-17T01:27:12+00:00

The default Tx ring size for the sky2 driver is quite large and could
cause excess buffer bloat for many users. The minimum ring size
possible and still allow handling  the worst case packet on 64bit platforms
is 38 which gets rounded up to a power of 2. But most packets only require
a couple of ring elements.

Signed-off-by: Stephen Hemminger 
Signed-off-by: David S. Miller