Commit 89b12fab authored by Ben Hutchings's avatar Ben Hutchings Committed by David S. Miller
Browse files

3c59x: Fix deadlock in vortex_error()

This fixes a bug introduced in commit

"3c59x: Use fine-grained locks for MII and windowed register access".

vortex_interrupt() holds vp->window_lock over multiple register
accesses to reduce locking overhead.  However it also needs to call
vortex_error() sometimes, and that uses the regular functions for
access to windowed registers, which will try to acquire window_lock

Therefore, drop window_lock around the call to vortex_error() and set
the window afterward reacquiring the lock.  Since vortex_error() may
call vortex_rx(), which *does* require its caller to hold window_lock,
lift that call up into vortex_interrupt().  This also removes the
potential for calling vortex_rx() on a later-generation NIC.

Reported-and-tested-by: Jens Schüßler <> [in Debian's 2.6.32]
Signed-off-by: default avatarBen Hutchings <>
Signed-off-by: default avatarDavid S. Miller <>
parent 1ee89bd0
......@@ -1994,10 +1994,9 @@ vortex_error(struct net_device *dev, int status)
if (status & RxEarly) { /* Rx early is unused. */
if (status & RxEarly) /* Rx early is unused. */
iowrite16(AckIntr | RxEarly, ioaddr + EL3_CMD);
if (status & StatsFull) { /* Empty statistics. */
static int DoneDidThat;
if (vortex_debug > 4)
......@@ -2298,7 +2297,12 @@ vortex_interrupt(int irq, void *dev_id)
if (status & (HostError | RxEarly | StatsFull | TxComplete | IntReq)) {
if (status == 0xffff)
if (status & RxEarly)
vortex_error(dev, status);
window_set(vp, 7);
if (--work_done < 0) {
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment