From: Michael Chan Date: Mon, 8 Apr 2019 21:39:55 +0000 (-0400) Subject: bnxt_en: Reset device on RX buffer errors. X-Git-Tag: v4.1.12-124.31.3~122 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=75207e89d96b69a5dad1a09d580a24fe7398691c;p=users%2Fjedix%2Flinux-maple.git bnxt_en: Reset device on RX buffer errors. If the RX completion indicates RX buffers errors, the RX ring will be disabled by firmware and no packets will be received on that ring from that point on. Recover by resetting the device. Fixes: c0c050c58d84 ("bnxt_en: New Broadcom ethernet driver.") Signed-off-by: Michael Chan Signed-off-by: David S. Miller (cherry picked from commit 8e44e96c6c8e8fb80b84a2ca11798a8554f710f2) Orabug: 29651238 Signed-off-by: John Donnelly Reviewed-by: Somasundaram Krishnasamy Signed-off-by: Brian Maly --- diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index bfcd03c7645b..4513635b1245 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -1554,11 +1554,17 @@ static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt_napi *bnapi, u32 *raw_cons, rx_buf->data = NULL; if (rxcmp1->rx_cmp_cfa_code_errors_v2 & RX_CMP_L2_ERRORS) { + u32 rx_err = le32_to_cpu(rxcmp1->rx_cmp_cfa_code_errors_v2); + bnxt_reuse_rx_data(rxr, cons, data); if (agg_bufs) bnxt_reuse_rx_agg_bufs(bnapi, cp_cons, agg_bufs); rc = -EIO; + if (rx_err & RX_CMPL_ERRORS_BUFFER_ERROR_MASK) { + netdev_warn(bp->dev, "RX buffer error %x\n", rx_err); + bnxt_sched_reset(bp, rxr); + } goto next_rx; }