Skip to contentSkip to conversation

bnxt: revert hastily merged uAPI aberrations

PATCH Applied Jakub Kicinski 3 participants 3 messages Mar 8, 2022 – Mar 10, 2022

Subsystems (3)
lore
Share & tools
lore

Jakub Kicinski

author maintainer
#0 lore raw

PATCH 1/1 bnxt: revert hastily merged uAPI aberrations

This reverts:
commit 02acd399533e ("bnxt_en: parse result field when NVRAM package install fails") commit 22f5dba5065d ("bnxt_en: add an nvm test for hw diagnose") commit bafed3f231f7 ("bnxt_en: implement hw health reporter")

These patches are still under discussion / I don't think they are right, and since the authors don't reply promptly let me lessen my load of "things I need to resolve before next release" and revert them.

---
 drivers/net/ethernet/broadcom/bnxt/bnxt.c     |  19 ---
 drivers/net/ethernet/broadcom/bnxt/bnxt.h     |  45 ------
 .../net/ethernet/broadcom/bnxt/bnxt_devlink.c | 153 ------------------
 .../net/ethernet/broadcom/bnxt/bnxt_devlink.h |   1 -
 .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c |  66 ++------
 .../net/ethernet/broadcom/bnxt/bnxt_ethtool.h |   7 -
 6 files changed, 14 insertions(+), 277 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +0 -19
index 63b8fc4f9d42..2de02950086f 100644
@@ -2061,22 +2061,6 @@ static void bnxt_event_error_report(struct bnxt *bp, u32 data1, u32 data2)
 	case ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_EVENT_DATA1_ERROR_TYPE_DOORBELL_DROP_THRESHOLD:
 		netdev_warn(bp->dev, "One or more MMIO doorbells dropped by the device!\n");
 		break;
-	case ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_EVENT_DATA1_ERROR_TYPE_NVM: {
-		struct bnxt_hw_health *hw_health = &bp->hw_health;
-
-		hw_health->nvm_err_address = EVENT_DATA2_NVM_ERR_ADDR(data2);
-		if (EVENT_DATA1_NVM_ERR_TYPE_WRITE(data1)) {
-			hw_health->synd = BNXT_HW_STATUS_NVM_WRITE_ERR;
-			hw_health->nvm_write_errors++;
-		} else if (EVENT_DATA1_NVM_ERR_TYPE_ERASE(data1)) {
-			hw_health->synd = BNXT_HW_STATUS_NVM_ERASE_ERR;
-			hw_health->nvm_erase_errors++;
-		} else {
-			hw_health->synd = BNXT_HW_STATUS_NVM_UNKNOWN_ERR;
-		}
-		set_bit(BNXT_FW_NVM_ERR_SP_EVENT, &bp->sp_event);
-		break;
-	}
 	default:
 		netdev_err(bp->dev, "FW reported unknown error type %u\n",
 			   err_type);
@@ -11903,9 +11887,6 @@ static void bnxt_sp_task(struct work_struct *work)
 	if (test_and_clear_bit(BNXT_FW_ECHO_REQUEST_SP_EVENT, &bp->sp_event))
 		bnxt_fw_echo_reply(bp);
 
-	if (test_and_clear_bit(BNXT_FW_NVM_ERR_SP_EVENT, &bp->sp_event))
-		bnxt_devlink_health_hw_report(bp);
-
 	/* These functions below will clear BNXT_STATE_IN_SP_TASK.  They
 	 * must be the last functions to be called before exiting.
 	 */
drivers/net/ethernet/broadcom/bnxt/bnxt.h +0 -45

69 lines not on this page · raw message

drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c +0 -153

177 lines not on this page · raw message

drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.h +0 -1
index 056962e4b177..b8105065367b 100644
@@ -74,7 +74,6 @@ enum bnxt_dl_version_type {
 void bnxt_devlink_health_fw_report(struct bnxt *bp);
 void bnxt_dl_health_fw_status_update(struct bnxt *bp, bool healthy);
 void bnxt_dl_health_fw_recovery_done(struct bnxt *bp);
-void bnxt_devlink_health_hw_report(struct bnxt *bp);
 void bnxt_dl_fw_reporters_create(struct bnxt *bp);
 void bnxt_dl_fw_reporters_destroy(struct bnxt *bp);
 int bnxt_dl_register(struct bnxt *bp);
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +14 -52

96 lines not on this page · raw message

drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h +0 -7
index 2593e0049582..6aa44840f13a 100644
@@ -56,13 +56,6 @@ int bnxt_hwrm_firmware_reset(struct net_device *dev, u8 proc_type,
 int bnxt_flash_package_from_fw_obj(struct net_device *dev, const struct firmware *fw,
 				   u32 install_type);
 int bnxt_get_pkginfo(struct net_device *dev, char *ver, int size);
-int bnxt_find_nvram_item(struct net_device *dev, u16 type, u16 ordinal, u16 ext,
-			 u16 *index, u32 *item_length, u32 *data_length);
-int bnxt_get_nvram_item(struct net_device *dev, u32 index, u32 offset,
-			u32 length, u8 *data);
-int bnxt_flash_nvram(struct net_device *dev, u16 dir_type, u16 dir_ordinal,
-		     u16 dir_ext, u16 dir_attr, u32 dir_item_len,
-		     const u8 *data, size_t data_len);
 void bnxt_ethtool_init(struct bnxt *bp);
 void bnxt_ethtool_free(struct bnxt *bp);
 
Signature · 1 line
2.34.1
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 6 lines · Jakub Kicinski

This reverts:
commit 02acd399533e ("bnxt_en: parse result field when NVRAM package install fails") commit 22f5dba5065d ("bnxt_en: add an nvm test for hw diagnose") commit bafed3f231f7 ("bnxt_en: implement hw health reporter")

Quoted 6 lines

These patches are still under discussion / I don't think they are right, and since the authors don't reply promptly let me lessen my load of "things I need to resolve before next release" and revert them.

OK. We'll rework these patches.

#2 lore raw
In reply to Jakub Kicinski
This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:

Hello:

This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:

Quoted 11 lines · On Tue, 8 Mar 2022 09:36:59 -0800 you wrote:

This reverts:
commit 02acd399533e ("bnxt_en: parse result field when NVRAM package install fails") commit 22f5dba5065d ("bnxt_en: add an nvm test for hw diagnose") commit bafed3f231f7 ("bnxt_en: implement hw health reporter")

These patches are still under discussion / I don't think they are right, and since the authors don't reply promptly let me lessen my load of "things I need to resolve before next release" and revert them.

[...]

Here is the summary with links:
- [net-next] bnxt: revert hastily merged uAPI aberrations

    https://git.kernel.org/netdev/net-next/c/4a5eaa2fde59

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html