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

Commit c28aa385 authored by françois romieu's avatar françois romieu Committed by David S. Miller
Browse files

r8169 : MAC address change fix for the 8168e-vl. 

Addresses https://bugzilla.kernel.org/show_bug.cgi?id=39252



Hayes suggested that the usual MAC{0, 4} register writes be completed
with writes to extended GigaMAC registers :
- 0xe0 .. 0xe5
- 0xf2 .. 0xf7

Registers 0xf0 and 0xf1 should be set to 0.

Signed-off-by: default avatarFrancois Romieu <romieu@fr.zoreil.com>
Cc: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 87b7ba3d

drivers/net/r8169.c

+27 −0
Original line number Diff line number Diff line
@@ -1092,6 +1092,21 @@ rtl_w1w0_eri(void __iomem *ioaddr, int addr, u32 mask, u32 p, u32 m, int type) 
	rtl_eri_write(ioaddr, addr, mask, (val & ~m) | p, type);

}



struct exgmac_reg {

	u16 addr;

	u16 mask;

	u32 val;

};



static void rtl_write_exgmac_batch(void __iomem *ioaddr,

				   const struct exgmac_reg *r, int len)

{

	while (len-- > 0) {

		rtl_eri_write(ioaddr, r->addr, r->mask, r->val, ERIAR_EXGMAC);

		r++;

	}

}



static u8 rtl8168d_efuse_read(void __iomem *ioaddr, int reg_addr)

{

	u8 value = 0xff;
@@ -3117,6 +3132,18 @@ static void rtl_rar_set(struct rtl8169_private *tp, u8 *addr) 
	RTL_W32(MAC0, low);

	RTL_R32(MAC0);



	if (tp->mac_version == RTL_GIGA_MAC_VER_34) {

		const struct exgmac_reg e[] = {

			{ .addr = 0xe0, ERIAR_MASK_1111, .val = low },

			{ .addr = 0xe4, ERIAR_MASK_1111, .val = high },

			{ .addr = 0xf0, ERIAR_MASK_1111, .val = low << 16 },

			{ .addr = 0xf4, ERIAR_MASK_1111, .val = high << 16 |

								low  >> 16 },

		};



		rtl_write_exgmac_batch(ioaddr, e, ARRAY_SIZE(e));

	}



	RTL_W8(Cfg9346, Cfg9346_Lock);



	spin_unlock_irq(&tp->lock);