Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de682941 authored by Yuval Mintz's avatar Yuval Mintz Committed by David S. Miller
Browse files

bnx2x: Fix UNDI driver unload 



Commit 91ebb928b "bnx2x: Add support for Multi-Function UNDI" contains a bug
which prevent the emptying of the device's Rx buffers before reset.
As a result, on new boards it is likely HW will reach some fatal assertion
once its interfaces load after UNDI was previously loaded.

Signed-off-by: default avatarYuval Mintz <Yuval.Mintz@qlogic.com>
Signed-off-by: default avatarAriel Elior <Ariel.Elior@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 27653053

drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

+7 −3
Original line number Diff line number Diff line
@@ -10051,8 +10051,8 @@ static void bnx2x_prev_unload_close_mac(struct bnx2x *bp, 
#define BCM_5710_UNDI_FW_MF_MAJOR	(0x07)

#define BCM_5710_UNDI_FW_MF_MINOR	(0x08)

#define BCM_5710_UNDI_FW_MF_VERS	(0x05)

#define BNX2X_PREV_UNDI_MF_PORT(p)	(0x1a150c + ((p) << 4))

#define BNX2X_PREV_UNDI_MF_FUNC(f)	(0x1a184c + ((f) << 4))

#define BNX2X_PREV_UNDI_MF_PORT(p) (BAR_TSTRORM_INTMEM + 0x150c + ((p) << 4))

#define BNX2X_PREV_UNDI_MF_FUNC(f) (BAR_TSTRORM_INTMEM + 0x184c + ((f) << 4))

static bool bnx2x_prev_unload_undi_fw_supports_mf(struct bnx2x *bp)

{

	u8 major, minor, version;
@@ -10352,6 +10352,7 @@ static int bnx2x_prev_unload_common(struct bnx2x *bp) 
	/* Reset should be performed after BRB is emptied */

	if (reset_reg & MISC_REGISTERS_RESET_REG_1_RST_BRB1) {

		u32 timer_count = 1000;

		bool need_write = true;



		/* Close the MAC Rx to prevent BRB from filling up */

		bnx2x_prev_unload_close_mac(bp, &mac_vals);
@@ -10398,7 +10399,10 @@ static int bnx2x_prev_unload_common(struct bnx2x *bp) 
			 * cleaning methods - might be redundant but harmless.

			 */

			if (bnx2x_prev_unload_undi_fw_supports_mf(bp)) {

				if (need_write) {

					bnx2x_prev_unload_undi_mf(bp);

					need_write = false;

				}

			} else if (prev_undi) {

				/* If UNDI resides in memory,

				 * manually increment it