Commit 78f1cd02 authored Mar 27, 2010 by Francois Romieu Committed by David S. Miller Mar 27, 2010

r8169: fix broken register writes



This is quite similar to b39fe41f
though said registers are not even documented as 64-bit registers
- as opposed to the initial TxDescStartAddress ones - but as single
bytes which must be combined into 32 bits at the MMIO read/write
level before being merged into a 64 bit logical entity.

Credits go to Ben Hutchings <ben@decadent.org.uk> for the MAR
registers (aka "multicast is broken for ages on ARM) and to
Timo Teräs <timo.teras@iki.fi> for the MAC registers.

Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 1546a713

drivers/net/r8169.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2820,8 +2820,8 @@ static void rtl_rar_set(struct rtl8169_private tp, u8 addr)
		spin_lock_irq(&tp->lock);

		RTL_W8(Cfg9346, Cfg9346_Unlock);
		RTL_W32(MAC0, low);
		RTL_W32(MAC4, high);
		RTL_W32(MAC0, low);
		RTL_W8(Cfg9346, Cfg9346_Lock);

		spin_unlock_irq(&tp->lock);
		@@ -4747,8 +4747,8 @@ static void rtl_set_rx_mode(struct net_device *dev)
		mc_filter[1] = swab32(data);
		}

		RTL_W32(MAR0 + 0, mc_filter[0]);
		RTL_W32(MAR0 + 4, mc_filter[1]);
		RTL_W32(MAR0 + 0, mc_filter[0]);

		RTL_W32(RxConfig, tmp);