From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 195F9C282DA for ; Mon, 15 Apr 2019 18:48:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CEF3E2087C for ; Mon, 15 Apr 2019 18:48:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555354086; bh=3+FY9wMSBEvrKrC+sfq+YzZClW67V6oytCGhxj4+xVA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=u4V63zqabqgkboCFlq6QXejamxSagqLBi+Rf8tCScaDkX6/Si5jlBPi3VSrRIuy3W 8R80fBNqhZyorQ3Oy8E8jtw8/FI/fI4kbZ4xv5W5h4YXbBLwZ9/mOxgc1YDiaxRnMr pSQy6UpNQaXQ15Knxw6SaulGCwgfgncTu3bzqNTw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728555AbfDOSsG (ORCPT ); Mon, 15 Apr 2019 14:48:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:51796 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728203AbfDOSsF (ORCPT ); Mon, 15 Apr 2019 14:48:05 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7E6F8218A1; Mon, 15 Apr 2019 18:48:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555354085; bh=3+FY9wMSBEvrKrC+sfq+YzZClW67V6oytCGhxj4+xVA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OJnFlBZhx13iX43CX6xsW7Q76kC5RvCS7T56l778J50Cw5L9yaiHLqxBtknrDg4AB rD4DVHo64zwO/tVBBytNyAHKPoBXzXDb281Iv8nYWt13QgNKxyeAHKCQ7n5TWQf/Mm 6iRDv8CMl+HGHpqHeO+0otjPWyUGOfj+Vb7ha7GE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Michael Chan , "David S. Miller" Subject: [PATCH 4.9 57/76] bnxt_en: Reset device on RX buffer errors. Date: Mon, 15 Apr 2019 20:44:21 +0200 Message-Id: <20190415183724.396279792@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190415183707.712011689@linuxfoundation.org> References: <20190415183707.712011689@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Michael Chan [ Upstream commit 8e44e96c6c8e8fb80b84a2ca11798a8554f710f2 ] 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 Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 6 ++++++ 1 file changed, 6 insertions(+) --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -1400,11 +1400,17 @@ static int bnxt_rx_pkt(struct bnxt *bp, 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; }