diff options
author | Geoff Levand <geoff@infradead.org> | 2011-07-14 16:03:29 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-07-14 16:03:29 -0700 |
commit | ecae42d37045ec71831d0e0e493e00b0e0732edd (patch) | |
tree | 5f02677e563e83f2296ebb8632f7eecb57e15fea /drivers/net/ps3_gelic_net.h | |
parent | 6383c0b35b48bfbd0fc8c6fe126a6603c5a9a4b3 (diff) | |
download | linux-3.10-ecae42d37045ec71831d0e0e493e00b0e0732edd.tar.gz linux-3.10-ecae42d37045ec71831d0e0e493e00b0e0732edd.tar.bz2 linux-3.10-ecae42d37045ec71831d0e0e493e00b0e0732edd.zip |
net/ps3: Fix gelic RX DMA restart
Fix the condition where PS3 network RX hangs when no network
TX is occurring by calling gelic_card_enable_rxdmac() during
RX_DMA_CHAIN_END event processing.
The gelic hardware automatically clears its RX_DMA_EN flag when
it detects an RX_DMA_CHAIN_END event. In its processing of
RX_DMA_CHAIN_END the gelic driver is required to set RX_DMA_EN
(with a call to gelic_card_enable_rxdmac()) to restart RX DMA
transfers. The existing gelic driver code does not set
RX_DMA_EN directly in its processing of the RX_DMA_CHAIN_END
event, but uses a flag variable card->rx_dma_restart_required
to schedule the setting of RX_DMA_EN until next inside the
interrupt handler.
It seems this delayed setting of RX_DMA_EN causes the hang since
the next RX interrupt after the RX_DMA_CHAIN_END event where
RX_DMA_EN is scheduled to be set will not occur since RX_DMA_EN
was not set. In the case were network TX is occuring, RX_DMA_EN
is set in the next TX interrupt and RX processing continues.
Signed-off-by: Geoff Levand <geoff@infradead.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ps3_gelic_net.h')
-rw-r--r-- | drivers/net/ps3_gelic_net.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ps3_gelic_net.h b/drivers/net/ps3_gelic_net.h index d9a55b93898..d3fadfbc3bc 100644 --- a/drivers/net/ps3_gelic_net.h +++ b/drivers/net/ps3_gelic_net.h @@ -289,7 +289,6 @@ struct gelic_card { struct gelic_descr_chain tx_chain; struct gelic_descr_chain rx_chain; - int rx_dma_restart_required; /* * tx_lock guards tx descriptor list and * tx_dma_progress. |