This is a note to let you know that I've just added the patch titled
bnxt_en: Free port stats during firmware reset.
to the 5.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
bnxt_en-free-port-stats-during-firmware-reset.patch
and it can be found in the queue-5.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From foo@baz Sun Nov 22 10:24:40 AM CET 2020
From: Michael Chan <michael.chan@xxxxxxxxxxxx>
Date: Sun, 15 Nov 2020 19:27:50 -0500
Subject: bnxt_en: Free port stats during firmware reset.
From: Michael Chan <michael.chan@xxxxxxxxxxxx>
[ Upstream commit eba93de6d31c1734dee59909020a162de612e41e ]
Firmware is unable to retain the port counters during any kind of
fatal or non-fatal resets, so we must clear the port counters to
avoid false detection of port counter overflow.
Fixes: fea6b3335527 ("bnxt_en: Accumulate all counters.")
Reviewed-by: Edwin Peer <edwin.peer@xxxxxxxxxxxx>
Reviewed-by: Vasundhara Volam <vasundhara-v.volam@xxxxxxxxxxxx>
Signed-off-by: Michael Chan <michael.chan@xxxxxxxxxxxx>
Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -4045,7 +4045,8 @@ static void bnxt_free_mem(struct bnxt *b
bnxt_free_ntp_fltrs(bp, irq_re_init);
if (irq_re_init) {
bnxt_free_ring_stats(bp);
- if (!(bp->fw_cap & BNXT_FW_CAP_PORT_STATS_NO_RESET))
+ if (!(bp->fw_cap & BNXT_FW_CAP_PORT_STATS_NO_RESET) ||
+ test_bit(BNXT_STATE_IN_FW_RESET, &bp->state))
bnxt_free_port_stats(bp);
bnxt_free_ring_grps(bp);
bnxt_free_vnics(bp);
Patches currently in stable-queue which might be from michael.chan@xxxxxxxxxxxx are
queue-5.9/bnxt_en-free-port-stats-during-firmware-reset.patch
queue-5.9/bnxt_en-read-eeprom-a2h-address-using-page-0.patch
queue-5.9/bnxt_en-fix-counter-overflow-logic.patch
queue-5.9/net-b44-fix-error-return-code-in-b44_init_one.patch
