This is a note to let you know that I've just added the patch titled r8169: Config1 is read-only on 8168c and later.
to the 3.4-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: r8169-config1-is-read-only-on-8168c-and-later.patch and it can be found in the queue-3.4 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@vger.kernel.org> know about it. >From stable-ow...@vger.kernel.org Sat Oct 6 18:39:51 2012 From: Francois Romieu <rom...@fr.zoreil.com> Date: Sat, 6 Oct 2012 11:19:52 +0200 Subject: r8169: Config1 is read-only on 8168c and later. To: stable@vger.kernel.org Cc: Hayes Wang <hayesw...@realtek.com> From: Francois Romieu <rom...@fr.zoreil.com> commit 851e60221926a53344b4227879858bef841b0477 upstream. Suggested by Hayes. Signed-off-by: Francois Romieu <rom...@fr.zoreil.com> Cc: Hayes Wang <hayesw...@realtek.com> Acked-by: David S. Miller <da...@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org> --- drivers/net/ethernet/realtek/r8169.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -1400,7 +1400,6 @@ static void __rtl8169_set_wol(struct rtl u16 reg; u8 mask; } cfg[] = { - { WAKE_ANY, Config1, PMEnable }, { WAKE_PHY, Config3, LinkUp }, { WAKE_MAGIC, Config3, MagicPacket }, { WAKE_UCAST, Config5, UWF }, @@ -1408,16 +1407,28 @@ static void __rtl8169_set_wol(struct rtl { WAKE_MCAST, Config5, MWF }, { WAKE_ANY, Config5, LanWake } }; + u8 options; RTL_W8(Cfg9346, Cfg9346_Unlock); for (i = 0; i < ARRAY_SIZE(cfg); i++) { - u8 options = RTL_R8(cfg[i].reg) & ~cfg[i].mask; + options = RTL_R8(cfg[i].reg) & ~cfg[i].mask; if (wolopts & cfg[i].opt) options |= cfg[i].mask; RTL_W8(cfg[i].reg, options); } + switch (tp->mac_version) { + case RTL_GIGA_MAC_VER_01 ... RTL_GIGA_MAC_VER_17: + options = RTL_R8(Config1) & ~PMEnable; + if (wolopts) + options |= PMEnable; + RTL_W8(Config1, options); + break; + default: + break; + } + RTL_W8(Cfg9346, Cfg9346_Lock); } Patches currently in stable-queue which might be from rom...@fr.zoreil.com are queue-3.4/r8169-8168c-and-later-require-bit-0x20-to-be-set-in-config2-for-pme-signaling.patch queue-3.4/r8169-config1-is-read-only-on-8168c-and-later.patch -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html