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

Commit 13fa95b0 authored by Matt Carlson's avatar Matt Carlson Committed by David S. Miller
Browse files

tg3: Fix std prod ring nicaddr for 5787 and 57765 



Commit 87668d35, titled "tg3: Don't
touch RCB nic addresses", tried to avoid assigning the nic address of
the standard producer ring.  Unfortunately, the default nic address is
not correct for the 5787, the 5755M, or the 57765.  This patch
reenables the old behavior and opts out of the assignment only
for the 5717.

Signed-off-by: default avatarMatt Carlson <mcarlson@broadcom.com>
Reviewed-by: default avatarMichael Chan <mchan@broadcom.com>
Tested-by: default avatarChow Loong Jin <hyperair@ubuntu.com>
Tested-by: default avatarDmitry Torokhov <dtor@mail.ru>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f3766c26

drivers/net/tg3.c

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

	     ((u64) tpr->rx_std_mapping >> 32));

	tw32(RCVDBDI_STD_BD + TG3_BDINFO_HOST_ADDR + TG3_64BIT_REG_LOW,

	tw32(RCVDBDI_STD_BD + TG3_BDINFO_HOST_ADDR + TG3_64BIT_REG_LOW,

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

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

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

	if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5717)

		tw32(RCVDBDI_STD_BD + TG3_BDINFO_NIC_ADDR,

		tw32(RCVDBDI_STD_BD + TG3_BDINFO_NIC_ADDR,

		     NIC_SRAM_RX_BUFFER_DESC);

		     NIC_SRAM_RX_BUFFER_DESC);