You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
64 lines
2.6 KiB
64 lines
2.6 KiB
5 years ago
|
From 97b39f6254351e160a853289bd1e3336ce6f83d3 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jonathan Toppins <jtoppins@redhat.com>
|
||
|
|
Date: Wed, 2 Oct 2019 18:22:51 -0400
|
||
|
|
Subject: [PATCH 36/96] [netdrv] bnxt_en: Fix handling FRAG_ERR when
|
||
|
|
NVM_INSTALL_UPDATE cmd fails
|
||
|
|
|
||
|
|
Message-id: <d28a29162a175429aacb2655353fe0c537ccec7e.1570027456.git.jtoppins@redhat.com>
|
||
|
|
Patchwork-id: 276455
|
||
|
|
O-Subject: [RHEL-8.2 PATCH 29/78] bnxt_en: Fix handling FRAG_ERR when NVM_INSTALL_UPDATE cmd fails
|
||
|
|
Bugzilla: 1724766
|
||
|
|
RH-Acked-by: John Linville <linville@redhat.com>
|
||
|
|
RH-Acked-by: Jarod Wilson <jarod@redhat.com>
|
||
|
|
|
||
|
|
If FW returns FRAG_ERR in response error code, driver is resending the
|
||
|
|
command only when HWRM command returns success. Fix the code to resend
|
||
|
|
NVM_INSTALL_UPDATE command with DEFRAG install flags, if FW returns
|
||
|
|
FRAG_ERR in its response error code.
|
||
|
|
|
||
|
|
Fixes: cb4d1d626145 ("bnxt_en: Retry failed NVM_INSTALL_UPDATE with defragmentation flag enabled.")
|
||
|
|
Signed-off-by: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
|
||
|
|
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
|
||
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||
|
|
(cherry picked from commit dd2ebf3404c7c295014bc025dea23960960ceb1a)
|
||
|
|
Bugzilla: 1724766
|
||
|
|
Build Info: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=23809532
|
||
|
|
Tested: build, boot, basic ping
|
||
|
|
Signed-off-by: Jonathan Toppins <jtoppins@redhat.com>
|
||
|
|
Signed-off-by: Bruno Meneguele <bmeneg@redhat.com>
|
||
|
|
---
|
||
|
|
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 12 +++++-------
|
||
|
|
1 file changed, 5 insertions(+), 7 deletions(-)
|
||
|
|
|
||
|
|
Index: src/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
|
||
|
|
===================================================================
|
||
|
|
--- src.orig/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c 2020-02-06 16:23:14.228526755 +0100
|
||
|
|
+++ src/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c 2020-02-06 16:23:15.223517622 +0100
|
||
|
|
@@ -2016,21 +2016,19 @@
|
||
|
|
mutex_lock(&bp->hwrm_cmd_lock);
|
||
|
|
hwrm_err = _hwrm_send_message(bp, &install, sizeof(install),
|
||
|
|
INSTALL_PACKAGE_TIMEOUT);
|
||
|
|
- if (hwrm_err)
|
||
|
|
- goto flash_pkg_exit;
|
||
|
|
-
|
||
|
|
- if (resp->error_code) {
|
||
|
|
+ if (hwrm_err) {
|
||
|
|
u8 error_code = ((struct hwrm_err_output *)resp)->cmd_err;
|
||
|
|
|
||
|
|
- if (error_code == NVM_INSTALL_UPDATE_CMD_ERR_CODE_FRAG_ERR) {
|
||
|
|
+ if (resp->error_code && error_code ==
|
||
|
|
+ NVM_INSTALL_UPDATE_CMD_ERR_CODE_FRAG_ERR) {
|
||
|
|
install.flags |= cpu_to_le16(
|
||
|
|
NVM_INSTALL_UPDATE_REQ_FLAGS_ALLOWED_TO_DEFRAG);
|
||
|
|
hwrm_err = _hwrm_send_message(bp, &install,
|
||
|
|
sizeof(install),
|
||
|
|
INSTALL_PACKAGE_TIMEOUT);
|
||
|
|
- if (hwrm_err)
|
||
|
|
- goto flash_pkg_exit;
|
||
|
|
}
|
||
|
|
+ if (hwrm_err)
|
||
|
|
+ goto flash_pkg_exit;
|
||
|
|
}
|
||
|
|
|
||
|
|
if (resp->result) {
|