From e79c2b3d99cd36cc85cf1a4acb2f9ac86ce10620 Mon Sep 17 00:00:00 2001 From: Cedric Schieli Date: Wed, 21 Apr 2010 08:05:41 +0000 Subject: main/linux-pae: sync with main/linux-grsec --- .../0005-r8169-fix-broken-register-writes.patch | 52 ++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 main/linux-pae/0005-r8169-fix-broken-register-writes.patch (limited to 'main/linux-pae/0005-r8169-fix-broken-register-writes.patch') diff --git a/main/linux-pae/0005-r8169-fix-broken-register-writes.patch b/main/linux-pae/0005-r8169-fix-broken-register-writes.patch new file mode 100644 index 00000000..bfa8df29 --- /dev/null +++ b/main/linux-pae/0005-r8169-fix-broken-register-writes.patch @@ -0,0 +1,52 @@ +From 89f350c4ec426b4c1db6ef269546940365d918e1 Mon Sep 17 00:00:00 2001 +From: Francois Romieu +Date: Sat, 27 Mar 2010 19:35:46 -0700 +Subject: [PATCH 05/18] r8169: fix broken register writes +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +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 +Signed-off-by: David S. Miller +(cherry picked from commit 78f1cd02457252e1ffbc6caa44a17424a45286b8) +--- + 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 0fe2fc9..24599b5 100644 +--- a/drivers/net/r8169.c ++++ b/drivers/net/r8169.c +@@ -2827,8 +2827,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); +@@ -4795,8 +4795,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); + +-- +1.7.0.2 + -- cgit v1.2.3