aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2007-10-02 17:26:30 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:54:24 -0400
commit9a50bebda95745d312c69d3bb6d788067cbefb84 (patch)
tree5aaa75097fb0b62b22c0d833282fcb28a49a9d5c
parentad3c20d1ab586884f1815c315e3f303a8b8a7d7d (diff)
pasemi_mac: workaround for erratum 5971
pasemi_mac: workaround for erratum 5971 Implement workarounds for erratum 5971, where L2 hints aren't considered properly unless the way hint is enabled on the interface. Since L2 isn't setup to dedicate a way to headers, we need to reset the packet count by hand so it won't run out of credits. Signed-off-by: Olof Johansson <olof@lixom.net> Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r--drivers/net/pasemi_mac.c9
-rw-r--r--drivers/net/pasemi_mac.h8
2 files changed, 16 insertions, 1 deletions
diff --git a/drivers/net/pasemi_mac.c b/drivers/net/pasemi_mac.c
index 5eb5e47120d0..c538c66d4b4f 100644
--- a/drivers/net/pasemi_mac.c
+++ b/drivers/net/pasemi_mac.c
@@ -239,7 +239,9 @@ static int pasemi_mac_setup_rx_resources(struct net_device *dev)
239 PAS_DMA_RXINT_BASEU_SIZ(RX_RING_SIZE >> 3)); 239 PAS_DMA_RXINT_BASEU_SIZ(RX_RING_SIZE >> 3));
240 240
241 write_dma_reg(mac, PAS_DMA_RXINT_CFG(mac->dma_if), 241 write_dma_reg(mac, PAS_DMA_RXINT_CFG(mac->dma_if),
242 PAS_DMA_RXINT_CFG_DHL(2)); 242 PAS_DMA_RXINT_CFG_DHL(3) |
243 PAS_DMA_RXINT_CFG_L2 |
244 PAS_DMA_RXINT_CFG_LW);
243 245
244 ring->next_to_fill = 0; 246 ring->next_to_fill = 0;
245 ring->next_to_clean = 0; 247 ring->next_to_clean = 0;
@@ -589,6 +591,11 @@ static int pasemi_mac_clean_rx(struct pasemi_mac *mac, int limit)
589 n += 2; 591 n += 2;
590 } 592 }
591 593
594 if (n > RX_RING_SIZE) {
595 /* Errata 5971 workaround: L2 target of headers */
596 write_iob_reg(mac, PAS_IOB_COM_PKTHDRCNT, 0);
597 n &= (RX_RING_SIZE-1);
598 }
592 mac->rx->next_to_clean = n; 599 mac->rx->next_to_clean = n;
593 pasemi_mac_replenish_rx_ring(mac->netdev, limit-count); 600 pasemi_mac_replenish_rx_ring(mac->netdev, limit-count);
594 601
diff --git a/drivers/net/pasemi_mac.h b/drivers/net/pasemi_mac.h
index 5a896aa87a99..db3393674ae7 100644
--- a/drivers/net/pasemi_mac.h
+++ b/drivers/net/pasemi_mac.h
@@ -210,6 +210,8 @@ enum {
210#define PAS_DMA_RXINT_CFG_DHL_S 24 210#define PAS_DMA_RXINT_CFG_DHL_S 24
211#define PAS_DMA_RXINT_CFG_DHL(x) (((x) << PAS_DMA_RXINT_CFG_DHL_S) & \ 211#define PAS_DMA_RXINT_CFG_DHL(x) (((x) << PAS_DMA_RXINT_CFG_DHL_S) & \
212 PAS_DMA_RXINT_CFG_DHL_M) 212 PAS_DMA_RXINT_CFG_DHL_M)
213#define PAS_DMA_RXINT_CFG_LW 0x00200000
214#define PAS_DMA_RXINT_CFG_L2 0x00100000
213#define PAS_DMA_RXINT_CFG_WIF 0x00000002 215#define PAS_DMA_RXINT_CFG_WIF 0x00000002
214#define PAS_DMA_RXINT_CFG_WIL 0x00000001 216#define PAS_DMA_RXINT_CFG_WIL 0x00000001
215 217
@@ -315,6 +317,12 @@ enum {
315#define PAS_STATUS_SOFT 0x4000000000000000ull 317#define PAS_STATUS_SOFT 0x4000000000000000ull
316#define PAS_STATUS_INT 0x8000000000000000ull 318#define PAS_STATUS_INT 0x8000000000000000ull
317 319
320#define PAS_IOB_COM_PKTHDRCNT 0x120
321#define PAS_IOB_COM_PKTHDRCNT_PKTHDR1_M 0x0fff0000
322#define PAS_IOB_COM_PKTHDRCNT_PKTHDR1_S 16
323#define PAS_IOB_COM_PKTHDRCNT_PKTHDR0_M 0x00000fff
324#define PAS_IOB_COM_PKTHDRCNT_PKTHDR0_S 0
325
318#define PAS_IOB_DMA_RXCH_CFG(i) (0x1100 + (i)*4) 326#define PAS_IOB_DMA_RXCH_CFG(i) (0x1100 + (i)*4)
319#define PAS_IOB_DMA_RXCH_CFG_CNTTH_M 0x00000fff 327#define PAS_IOB_DMA_RXCH_CFG_CNTTH_M 0x00000fff
320#define PAS_IOB_DMA_RXCH_CFG_CNTTH_S 0 328#define PAS_IOB_DMA_RXCH_CFG_CNTTH_S 0