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.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,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 9AF72C43331 for ; Tue, 31 Mar 2020 09:12:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6489220675 for ; Tue, 31 Mar 2020 09:12:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585645966; bh=Mj3QYaMdquQMTJeE6GXk4ab+R6R5s1og9D1PWZ/TTQs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=fbgPmWPlgh3eWoFNGdAnOj66LAndNhkErFbH6cYpjN0FQbuEFcU+Mu2slx88bJH/O 4ARu+fd0cmv6pwEX4cNmmrkA9Rjg/uAgX8GDshPJapCWxGRvbXzxCy+vXRDVqXAJDZ OaU5PIuxEauUkdJu0Hzai1/yis0B/8iT9Z2tukKs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731449AbgCaJMo (ORCPT ); Tue, 31 Mar 2020 05:12:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:59538 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731249AbgCaJMn (ORCPT ); Tue, 31 Mar 2020 05:12:43 -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 8573C20675; Tue, 31 Mar 2020 09:12:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585645963; bh=Mj3QYaMdquQMTJeE6GXk4ab+R6R5s1og9D1PWZ/TTQs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FFMAS3T+A/ckbeXL2pM2WWk8YaSAgZnfsgOFZX+L2VsDV7+FzI/C82LhVdKCuTTsJ OmCL6mVAkoNNQRXZrBxKpq0L2LN5jPrqV4/8QNjBPUXEXg7ILnuZIqAB+Kz/erp3B0 I28zQG0KaPwYzS6W1E0nNhSakgnIn4plIKmHBOj0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vasundhara Volam , Michael Chan , "David S. Miller" Subject: [PATCH 5.4 043/155] bnxt_en: Reset rings if ring reservation fails during open() Date: Tue, 31 Mar 2020 10:58:03 +0200 Message-Id: <20200331085423.254926165@linuxfoundation.org> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200331085418.274292403@linuxfoundation.org> References: <20200331085418.274292403@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: Vasundhara Volam [ Upstream commit 5d765a5e4bd7c368e564e11402bba74cf7f03ac1 ] If ring counts are not reset when ring reservation fails, bnxt_init_dflt_ring_mode() will not be called again to reinitialise IRQs when open() is called and results in system crash as napi will also be not initialised. This patch fixes it by resetting the ring counts. Fixes: 47558acd56a7 ("bnxt_en: Reserve rings at driver open if none was reserved at probe time.") Signed-off-by: Vasundhara Volam Signed-off-by: Michael Chan Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -11603,6 +11603,10 @@ static int bnxt_set_dflt_rings(struct bn bp->rx_nr_rings++; bp->cp_nr_rings++; } + if (rc) { + bp->tx_nr_rings = 0; + bp->rx_nr_rings = 0; + } return rc; }