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

Commit 87668d35 authored by Matt Carlson's avatar Matt Carlson Committed by David S. Miller
Browse files

tg3: Don't touch RCB nic addresses 



This patch avoids reprogramming the RCB NIC addresses for all 5755 and
later devices.  The address is incorrect for 5717 devices and should be
correct by default for all other affected devices.

Signed-off-by: default avatarMatt Carlson <mcarlson@broadcom.com>
Reviewed-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c2060fe1

drivers/net/tg3.c

+6 −4
Original line number Diff line number Diff line
@@ -7404,6 +7404,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy) 
	     ((u64) tpr->rx_std_mapping >> 32));

	tw32(RCVDBDI_STD_BD + TG3_BDINFO_HOST_ADDR + TG3_64BIT_REG_LOW,

	     ((u64) tpr->rx_std_mapping & 0xffffffff));

	if (!(tp->tg3_flags3 & TG3_FLG3_5755_PLUS))

		tw32(RCVDBDI_STD_BD + TG3_BDINFO_NIC_ADDR,

		     NIC_SRAM_RX_BUFFER_DESC);
@@ -7428,6 +7429,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy) 
			tw32(RCVDBDI_JUMBO_BD + TG3_BDINFO_MAXLEN_FLAGS,

			     (RX_JUMBO_MAX_SIZE << BDINFO_FLAGS_MAXLEN_SHIFT) |

			     BDINFO_FLAGS_USE_EXT_RECV);

			if (!(tp->tg3_flags2 & TG3_FLG2_5705_PLUS))

				tw32(RCVDBDI_JUMBO_BD + TG3_BDINFO_NIC_ADDR,

				     NIC_SRAM_RX_JUMBO_BUFFER_DESC);

		} else {