aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorPetri Gynther <pgynther@google.com>2015-03-10 18:55:00 -0400
committerDavid S. Miller <davem@davemloft.net>2015-03-11 17:54:55 -0400
commitd26ea6cc48da5a97d8188220c334cf3669fa8dc7 (patch)
treed6408c7ced8b23593c980a9dac69c34a78b5c2ae /drivers/net
parent61f0d861fc6924fa673ecf1128a911d49cb10dc8 (diff)
net: bcmgenet: collect Rx discarded packet count
Bits 31:16 of RDMA_PROD_INDEX contain Rx discarded packet count, which are the Rx packets that had to be dropped by MAC hardware since there was no room on the Rx queue. Add code to collect this information into the netdev stats. Signed-off-by: Petri Gynther <pgynther@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/broadcom/genet/bcmgenet.c18
-rw-r--r--drivers/net/ethernet/broadcom/genet/bcmgenet.h1
2 files changed, 19 insertions, 0 deletions
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index 275be56fd324..d3be1aeb7f47 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -1384,9 +1384,27 @@ static unsigned int bcmgenet_desc_rx(struct bcmgenet_priv *priv,
1384 int len, err; 1384 int len, err;
1385 unsigned int rxpktprocessed = 0, rxpkttoprocess; 1385 unsigned int rxpktprocessed = 0, rxpkttoprocess;
1386 unsigned int p_index; 1386 unsigned int p_index;
1387 unsigned int discards;
1387 unsigned int chksum_ok = 0; 1388 unsigned int chksum_ok = 0;
1388 1389
1389 p_index = bcmgenet_rdma_ring_readl(priv, index, RDMA_PROD_INDEX); 1390 p_index = bcmgenet_rdma_ring_readl(priv, index, RDMA_PROD_INDEX);
1391
1392 discards = (p_index >> DMA_P_INDEX_DISCARD_CNT_SHIFT) &
1393 DMA_P_INDEX_DISCARD_CNT_MASK;
1394 if (discards > ring->old_discards) {
1395 discards = discards - ring->old_discards;
1396 dev->stats.rx_missed_errors += discards;
1397 dev->stats.rx_errors += discards;
1398 ring->old_discards += discards;
1399
1400 /* Clear HW register when we reach 75% of maximum 0xFFFF */
1401 if (ring->old_discards >= 0xC000) {
1402 ring->old_discards = 0;
1403 bcmgenet_rdma_ring_writel(priv, index, 0,
1404 RDMA_PROD_INDEX);
1405 }
1406 }
1407
1390 p_index &= DMA_P_INDEX_MASK; 1408 p_index &= DMA_P_INDEX_MASK;
1391 1409
1392 if (likely(p_index >= ring->c_index)) 1410 if (likely(p_index >= ring->c_index))
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.h b/drivers/net/ethernet/broadcom/genet/bcmgenet.h
index 17443db8dc53..2a8113898aed 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.h
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.h
@@ -548,6 +548,7 @@ struct bcmgenet_rx_ring {
548 unsigned int read_ptr; /* Rx ring read pointer */ 548 unsigned int read_ptr; /* Rx ring read pointer */
549 unsigned int cb_ptr; /* Rx ring initial CB ptr */ 549 unsigned int cb_ptr; /* Rx ring initial CB ptr */
550 unsigned int end_ptr; /* Rx ring end CB ptr */ 550 unsigned int end_ptr; /* Rx ring end CB ptr */
551 unsigned int old_discards;
551}; 552};
552 553
553/* device context */ 554/* device context */