Commit 2bf27a0d authored by Linas Vepstas's avatar Linas Vepstas Committed by Jeff Garzik

spidernet: Don't terminate the RX ring

The terminated RX ring will cause trouble during the RX ram full
conditions, leading to a hung driver, as the hardware can't find
the next descr.  There is no real reason to terminate the RX ring;
it doesn't make the operation any smooother, and it does
require an extra sync. So don't do it.
Signed-off-by: default avatarLinas Vepstas <linas@austin.ibm.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 4c4bd5a9
...@@ -460,13 +460,9 @@ spider_net_prepare_rx_descr(struct spider_net_card *card, ...@@ -460,13 +460,9 @@ spider_net_prepare_rx_descr(struct spider_net_card *card,
hwdescr->dmac_cmd_status = SPIDER_NET_DESCR_NOT_IN_USE; hwdescr->dmac_cmd_status = SPIDER_NET_DESCR_NOT_IN_USE;
} else { } else {
hwdescr->buf_addr = buf; hwdescr->buf_addr = buf;
hwdescr->next_descr_addr = 0;
wmb(); wmb();
hwdescr->dmac_cmd_status = SPIDER_NET_DESCR_CARDOWNED | hwdescr->dmac_cmd_status = SPIDER_NET_DESCR_CARDOWNED |
SPIDER_NET_DMAC_NOINTR_COMPLETE; SPIDER_NET_DMAC_NOINTR_COMPLETE;
wmb();
descr->prev->hwdescr->next_descr_addr = descr->bus_addr;
} }
return 0; return 0;
...@@ -541,12 +537,16 @@ spider_net_refill_rx_chain(struct spider_net_card *card) ...@@ -541,12 +537,16 @@ spider_net_refill_rx_chain(struct spider_net_card *card)
static int static int
spider_net_alloc_rx_skbs(struct spider_net_card *card) spider_net_alloc_rx_skbs(struct spider_net_card *card)
{ {
int result; struct spider_net_descr_chain *chain = &card->rx_chain;
struct spider_net_descr_chain *chain; struct spider_net_descr *start = chain->tail;
struct spider_net_descr *descr = start;
result = -ENOMEM; /* Link up the hardware chain pointers */
do {
descr->prev->hwdescr->next_descr_addr = descr->bus_addr;
descr = descr->next;
} while (descr != start);
chain = &card->rx_chain;
/* Put at least one buffer into the chain. if this fails, /* Put at least one buffer into the chain. if this fails,
* we've got a problem. If not, spider_net_refill_rx_chain * we've got a problem. If not, spider_net_refill_rx_chain
* will do the rest at the end of this function. */ * will do the rest at the end of this function. */
...@@ -563,7 +563,7 @@ spider_net_alloc_rx_skbs(struct spider_net_card *card) ...@@ -563,7 +563,7 @@ spider_net_alloc_rx_skbs(struct spider_net_card *card)
error: error:
spider_net_free_rx_chain_contents(card); spider_net_free_rx_chain_contents(card);
return result; return -ENOMEM;
} }
/** /**
......
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