From patchwork Sat Jan 5 16:57:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Francois Romieu X-Patchwork-Id: 209687 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 143A12C0082 for ; Sun, 6 Jan 2013 04:25:36 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755837Ab3AERZT (ORCPT ); Sat, 5 Jan 2013 12:25:19 -0500 Received: from violet.fr.zoreil.com ([92.243.8.30]:43718 "EHLO violet.fr.zoreil.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755802Ab3AERZR (ORCPT ); Sat, 5 Jan 2013 12:25:17 -0500 Received: from violet.fr.zoreil.com (localhost [127.0.0.1]) by violet.fr.zoreil.com (8.13.8/8.13.8) with ESMTP id r05GvagH005077; Sat, 5 Jan 2013 17:57:36 +0100 Received: (from romieu@localhost) by violet.fr.zoreil.com (8.13.8/8.13.8/Submit) id r05GvZZb005076; Sat, 5 Jan 2013 17:57:35 +0100 Date: Sat, 5 Jan 2013 17:57:35 +0100 From: Francois Romieu To: =?utf-8?B?SsO2cmc=?= Otte Cc: Linux Kernel Mailing List , "David S. Miller" , netdev@vger.kernel.org Subject: Re: [3.8-rc] regression: NETDEV WATCHDOG: eth0 (r8169): transmit queue 0 timed out Message-ID: <20130105165735.GB4906@electric-eye.fr.zoreil.com> References: <20130105093718.GA938@electric-eye.fr.zoreil.com> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.4.2.2i X-Organisation: Land of Sunshine Inc. Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Jörg Otte : [...] > jojo@ahorn:~$ dmesg | grep XID > [ 1.808847] r8169 0000:02:00.0 eth0: RTL8168evl/8111evl at > 0xffffc90000054000, 5c:9a:d8:69:2b:39, XID 0c900800 IRQ 42 Can you check if things improve with v3.8-rc2 after removing : 1. 9ecb9aabaf634677c77af467f4e3028b09d7bcda r8169: workaround for missing extended GigaMAC registers 2. d64ec841517a25f6d468bde9f67e5b4cffdc67c7 r8169: enable internal ASPM and clock request settings 3. e0c075577965d1c01b30038d38bf637b027a1df3 r8169: enable ALDPS for power saving (you can directly try v3.7 r8169.c with v3.8-rc2 if it worked for you so far) If the regression is still there, please apply the patch below to both v3.8-rc2 unpatched and a known working version then send me their dmesg after you 'ip link set dev eth0 up'. --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index ed96f30..3d2d2446 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -90,10 +90,28 @@ static const int multicast_filter_limit = 32; #define RTL8169_TX_TIMEOUT (6*HZ) #define RTL8169_PHY_TIMEOUT (10*HZ) +static void rw8(void __iomem *ioaddr, u8 b) +{ + printk(KERN_DEBUG PFX "w %p %02x\n", ioaddr, b); + writeb(b, ioaddr); +} + +static void rw16(void __iomem *ioaddr, u16 w) +{ + printk(KERN_DEBUG PFX "w %p %04x\n", ioaddr, w); + writew(w, ioaddr); +} + +static void rw32(void __iomem *ioaddr, u32 d) +{ + printk(KERN_DEBUG PFX "w %p %08x\n", ioaddr, d); + writel(d, ioaddr); +} + /* write/read MMIO register */ -#define RTL_W8(reg, val8) writeb ((val8), ioaddr + (reg)) -#define RTL_W16(reg, val16) writew ((val16), ioaddr + (reg)) -#define RTL_W32(reg, val32) writel ((val32), ioaddr + (reg)) +#define RTL_W8(reg, val8) rw8(ioaddr + (reg), (val8)) +#define RTL_W16(reg, val16) rw16(ioaddr + (reg), (val16)) +#define RTL_W32(reg, val32) rw32(ioaddr + (reg), (val32)) #define RTL_R8(reg) readb (ioaddr + (reg)) #define RTL_R16(reg) readw (ioaddr + (reg)) #define RTL_R32(reg) readl (ioaddr + (reg))