From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 31ECE12D1E8; Tue, 30 Apr 2024 11:08:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714475288; cv=none; b=RpdZqgbqGcFU1vlVUMrEKUk4CeVEg6MepAjj3IbRjxYKMhoDb/4W09ZVMaJB0LGgybRmZAeaGHDI+ur6hyNQ3x8AeZc1FOPcH8dEZM742xykx6Xvxd2mGmIbGa5AExMJJXuiZej6mkciUAEd9u8Ee8jR419E2OBm4urZtv+AKEk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714475288; c=relaxed/simple; bh=swF9UoJpOGcVFvBue55Jk6ugeaTqFKF8jgdH2G4giqs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=X8FDrModrWM4j7RJ7KM9Vzb23NVzhcNG0dIQAKbplhRPwS+hEVPQDHUck3DzsKuznEUr/Kt+96SnbitVsNRXN/GLxDr6hxHdGmNdZKsQfI0XFfS+hh+ODiZFbwF0kyRXB6Hfnr7mdOetg1JlU86KioSB8AO+FIUE5DM+2ULnuxA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ohlctfzF; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ohlctfzF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 97644C2BBFC; Tue, 30 Apr 2024 11:08:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1714475288; bh=swF9UoJpOGcVFvBue55Jk6ugeaTqFKF8jgdH2G4giqs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ohlctfzFhwCMwpRR6qsXLuOhCBBo7k0N4xJZjWaUuzdm3PLKz+uevQIaFLqSmdRpq Bn70iTcGgNweFq+YRcCg0dAaIXGDSj5p3G7nLSKiWLFc70ITQSjippuioJik31dgXE lXyrykAMx3qKCXDWBiKXJnKPYIMH5Vh+oXaW9h8M= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Vikas Gupta , Michael Chan , "David S. Miller" , Sasha Levin Subject: [PATCH 6.6 052/186] bnxt_en: refactor reset close code Date: Tue, 30 Apr 2024 12:38:24 +0200 Message-ID: <20240430103059.542414673@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240430103058.010791820@linuxfoundation.org> References: <20240430103058.010791820@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Vikas Gupta [ Upstream commit 7474b1c82be3780692d537d331f9aa7fc1e5a368 ] Introduce bnxt_fw_fatal_close() API which can be used to stop data path and disable device when firmware is in fatal state. Signed-off-by: Vikas Gupta Signed-off-by: Michael Chan Signed-off-by: David S. Miller Stable-dep-of: a1acdc226bae ("bnxt_en: Fix the PCI-AER routines") Signed-off-by: Sasha Levin --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 38e3b2225ff1c..1cf4aae8702b4 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -11807,6 +11807,16 @@ static void bnxt_rx_ring_reset(struct bnxt *bp) bnxt_rtnl_unlock_sp(bp); } +static void bnxt_fw_fatal_close(struct bnxt *bp) +{ + bnxt_tx_disable(bp); + bnxt_disable_napi(bp); + bnxt_disable_int_sync(bp); + bnxt_free_irq(bp); + bnxt_clear_int_mode(bp); + pci_disable_device(bp->pdev); +} + static void bnxt_fw_reset_close(struct bnxt *bp) { bnxt_ulp_stop(bp); @@ -11820,12 +11830,7 @@ static void bnxt_fw_reset_close(struct bnxt *bp) pci_read_config_word(bp->pdev, PCI_SUBSYSTEM_ID, &val); if (val == 0xffff) bp->fw_reset_min_dsecs = 0; - bnxt_tx_disable(bp); - bnxt_disable_napi(bp); - bnxt_disable_int_sync(bp); - bnxt_free_irq(bp); - bnxt_clear_int_mode(bp); - pci_disable_device(bp->pdev); + bnxt_fw_fatal_close(bp); } __bnxt_close_nic(bp, true, false); bnxt_vf_reps_free(bp); -- 2.43.0