mirror of
https://github.com/torvalds/linux.git
synced 2024-12-29 14:21:47 +00:00
r8169: workaround for missing extended GigaMAC registers
GigaMAC registers have been reported left unitialized in several situations: - after cold boot from power-off state - after S3 resume Tweaking rtl_hw_phy_config takes care of both. This patch removes an excess entry (",") at the end of the exgmac_reg array as well. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Signed-off-by: Wang YanQing <udknight@gmail.com> Cc: Hayes Wang <hayeswang@realtek.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
ba501666fa
commit
9ecb9aabaf
@ -3120,6 +3120,23 @@ static void rtl8168e_1_hw_phy_config(struct rtl8169_private *tp)
|
||||
rtl_writephy(tp, 0x0d, 0x0000);
|
||||
}
|
||||
|
||||
static void rtl_rar_exgmac_set(struct rtl8169_private *tp, u8 *addr)
|
||||
{
|
||||
const u16 w[] = {
|
||||
addr[0] | (addr[1] << 8),
|
||||
addr[2] | (addr[3] << 8),
|
||||
addr[4] | (addr[5] << 8)
|
||||
};
|
||||
const struct exgmac_reg e[] = {
|
||||
{ .addr = 0xe0, ERIAR_MASK_1111, .val = w[0] | (w[1] << 16) },
|
||||
{ .addr = 0xe4, ERIAR_MASK_1111, .val = w[2] },
|
||||
{ .addr = 0xf0, ERIAR_MASK_1111, .val = w[0] << 16 },
|
||||
{ .addr = 0xf4, ERIAR_MASK_1111, .val = w[1] | (w[2] << 16) }
|
||||
};
|
||||
|
||||
rtl_write_exgmac_batch(tp, e, ARRAY_SIZE(e));
|
||||
}
|
||||
|
||||
static void rtl8168e_2_hw_phy_config(struct rtl8169_private *tp)
|
||||
{
|
||||
static const struct phy_reg phy_reg_init[] = {
|
||||
@ -3204,6 +3221,9 @@ static void rtl8168e_2_hw_phy_config(struct rtl8169_private *tp)
|
||||
rtl_writephy(tp, 0x1f, 0x0000);
|
||||
|
||||
r8168_aldps_enable_1(tp);
|
||||
|
||||
/* Broken BIOS workaround: feed GigaMAC registers with MAC address. */
|
||||
rtl_rar_exgmac_set(tp, tp->dev->dev_addr);
|
||||
}
|
||||
|
||||
static void rtl8168f_hw_phy_config(struct rtl8169_private *tp)
|
||||
@ -3740,33 +3760,19 @@ static void rtl8169_init_phy(struct net_device *dev, struct rtl8169_private *tp)
|
||||
static void rtl_rar_set(struct rtl8169_private *tp, u8 *addr)
|
||||
{
|
||||
void __iomem *ioaddr = tp->mmio_addr;
|
||||
u32 high;
|
||||
u32 low;
|
||||
|
||||
low = addr[0] | (addr[1] << 8) | (addr[2] << 16) | (addr[3] << 24);
|
||||
high = addr[4] | (addr[5] << 8);
|
||||
|
||||
rtl_lock_work(tp);
|
||||
|
||||
RTL_W8(Cfg9346, Cfg9346_Unlock);
|
||||
|
||||
RTL_W32(MAC4, high);
|
||||
RTL_W32(MAC4, addr[4] | addr[5] << 8);
|
||||
RTL_R32(MAC4);
|
||||
|
||||
RTL_W32(MAC0, low);
|
||||
RTL_W32(MAC0, addr[0] | addr[1] << 8 | addr[2] << 16 | addr[3] << 24);
|
||||
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(tp, e, ARRAY_SIZE(e));
|
||||
}
|
||||
if (tp->mac_version == RTL_GIGA_MAC_VER_34)
|
||||
rtl_rar_exgmac_set(tp, addr);
|
||||
|
||||
RTL_W8(Cfg9346, Cfg9346_Lock);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user