From patchwork Sun Mar 28 00:31:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Francois Romieu X-Patchwork-Id: 48765 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D725DB7CF9 for ; Sun, 28 Mar 2010 11:32:35 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754374Ab0C1Acb (ORCPT ); Sat, 27 Mar 2010 20:32:31 -0400 Received: from 55.58.140-88.rev.gaoland.net ([88.140.58.55]:42797 "EHLO electric-eye.fr.zoreil.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1754337Ab0C1Aca (ORCPT ); Sat, 27 Mar 2010 20:32:30 -0400 Received: from electric-eye.fr.zoreil.com (localhost [127.0.0.1]) by electric-eye.fr.zoreil.com (8.14.3/8.14.3) with ESMTP id o2S0VmnW008574; Sun, 28 Mar 2010 01:31:49 +0100 Received: (from romieu@localhost) by electric-eye.fr.zoreil.com (8.14.3/8.14.3/Submit) id o2S0VhTS008572; Sun, 28 Mar 2010 01:31:43 +0100 X-Authentication-Warning: electric-eye.fr.zoreil.com: romieu set sender to romieu@fr.zoreil.com using -f Date: Sun, 28 Mar 2010 01:31:43 +0100 From: =?iso-8859-1?Q?Fran=E7ois?= Romieu To: David Miller Cc: ben@decadent.org.uk, timo.teras@iki.fi, ivecera@redhat.com, netdev@vger.kernel.org Subject: [PATCH] r8169: fix broken register writes Message-ID: <20100328003143.GA8501@electric-eye.fr.zoreil.com> References: <4BAE6C92.2060801@iki.fi> <20100327211133.GA3624@electric-eye.fr.zoreil.com> <1269732054.8653.155.camel@localhost> <20100327.163005.28815553.davem@davemloft.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20100327.163005.28815553.davem@davemloft.net> X-Organisation: Land of Sunshine Inc. User-Agent: Mutt/1.5.20 (2009-08-17) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 for the MAR registers (aka "multicast is broken for ages on ARM) and to Timo Teräs for the MAC registers. Signed-off-by: Francois Romieu --- 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[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);