linux.git/drivers/net/ethernet/stmicro, branch v3.2

stmmac: mask mmc interrupts

2011-11-21T20:31:15+00:00

We need to mask the MMC irq otherwise if we raise the mmc
interrupts that are not handled the driver loops in the
handler.
In fact, by default all mmc counters (only used for stats)
are managed in SW and registers are cleared on each READ.

Signed-off-by: Giuseppe Cavallaro 
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

Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

2011-11-07T02:54:53+00:00

* 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  scsi: drop unused Kconfig symbol
  pci: drop unused Kconfig symbol
  stmmac: drop unused Kconfig symbol
  x86: drop unused Kconfig symbol
  powerpc: drop unused Kconfig symbols
  powerpc: 40x: drop unused Kconfig symbol
  mips: drop unused Kconfig symbols
  openrisc: drop unused Kconfig symbols
  arm: at91: drop unused Kconfig symbol
  samples: drop unused Kconfig symbol
  m32r: drop unused Kconfig symbol
  score: drop unused Kconfig symbols
  sh: drop unused Kconfig symbol
  um: drop unused Kconfig symbol
  sparc: drop unused Kconfig symbol
  alpha: drop unused Kconfig symbol

Fix up trivial conflict in drivers/net/ethernet/stmicro/stmmac/Kconfig
as per Michal: the STMMAC_DUAL_MAC config variable is still unused and
should be deleted.

stmmac: update normal descriptor structure (v2)

2011-10-28T03:17:12+00:00

This patch updates the normal descriptor structure
to work fine on new GMAC Synopsys chips.

Normal descriptors were designed on the old MAC10/100
databook 1.91 where some bits were reserved: for example
the tx checksum insertion and rx checksum offload.

The patch maintains the back-compatibility with old
MAC devices (tested on STx7109 MAC10/100) and adds new
fields that actually new GMAC devices can use.

For example, STx7109 (MAC10/100) will pass from the platform
  tx_coe = 0, enh_desc = 0, has_gmac = 0.
A platform like Loongson1B (GMAC) will pass:
  tx_coe = 1, enh_desc = 0, has_gmac = 1.

Thanks to Kelvin, he enhanced the normal descriptors for
GMAC (on MIPS Loongson1B platform).

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

stmmac: fix NULL pointer dereference in capabilities fixup (v2)

2011-10-28T03:17:11+00:00

Signed-off-by: Angus Clark 
Acked-by: Giuseppe Cavallaro 
Signed-off-by: David S. Miller

stmmac: fix a bug while checking the HW cap reg (v2)

2011-10-28T03:17:11+00:00

The patch fixes a bug while checking the HW cap reg
on old MAC10/100 where this feature is not available.

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