On Sun, 2010-03-28 at 19:06 +0200, Florent Rougon wrote: > Ben Hutchings <email@example.com> wrote: > > > This is now being handled upstream and there is a proposed fix. We will > > apply that once it has been tested across a range of RTL8169-family > > chips. > > Thank you. If it can be of some help, I may test something. I am > currently using upstream 2.6.32 compiled with make-kpkg on lenny. The patch is: From: François Romieu <firstname.lastname@example.org> Subject: [PATCH] r8169: fix broken register writes Date: Sun, 28 Mar 2010 01:31:43 +0100 This is quite similar to b39fe41f481d20c201012e4483e76c203802dda7 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 <email@example.com> for the MAR registers (aka "multicast is broken for ages on ARM) and to Timo Teräs <firstname.lastname@example.org> for the MAC registers. Signed-off-by: Francois Romieu <email@example.com> --- drivers/net/r8169.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index 9d3ebf3..966407c 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -2821,8 +2821,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); @@ -4754,8 +4754,8 @@ static void rtl_set_rx_mode(struct net_device *dev) mc_filter = swab32(data); } - RTL_W32(MAR0 + 0, mc_filter); RTL_W32(MAR0 + 4, mc_filter); + RTL_W32(MAR0 + 0, mc_filter); RTL_W32(RxConfig, tmp); -- 220.127.116.11 -- Ben Hutchings Once a job is fouled up, anything done to improve it makes it worse.
Description: This is a digitally signed message part