Commit 426f0468 authored by Martin Roth's avatar Martin Roth Committed by David S. Miller

82xx: FCC: Fixing a bug causing to FCC port lock-up (second try)

This is an additional patch to the one already submitted recently.
The previous patch was not complete, and the FCC port lock-up scenario
has been reproduced in lab.
I had an opportunity to check the current patch in lab and the FCC
port lock no longer freezes, while the previous patch still locks-up the
FCC port.
The current patch fixes a pointer arithmetic bug (second bug in the same
line), which leads FCC port lock-up during underrun/collision handling.
Within the tx_startup() function in mac-fcc.c, the address of last BD is
not calculated correctly. As a result of wrong calculation of the last BD
address, the next transmitted BD may be set to an area out of the transmit
BD ring. This actually causes to port lock-up and it is not recoverable.
Signed-off-by: default avatarMartin Roth <martin.roth@motorolasolutions.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 32b6170c
...@@ -552,7 +552,7 @@ static void tx_restart(struct net_device *dev) ...@@ -552,7 +552,7 @@ static void tx_restart(struct net_device *dev)
cbd_t __iomem *prev_bd; cbd_t __iomem *prev_bd;
cbd_t __iomem *last_tx_bd; cbd_t __iomem *last_tx_bd;
last_tx_bd = fep->tx_bd_base + ((fpi->tx_ring - 1) * sizeof(cbd_t)); last_tx_bd = fep->tx_bd_base + (fpi->tx_ring - 1);
/* get the current bd held in TBPTR and scan back from this point */ /* get the current bd held in TBPTR and scan back from this point */
recheck_bd = curr_tbptr = (cbd_t __iomem *) recheck_bd = curr_tbptr = (cbd_t __iomem *)
......
Markdown is supported
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