From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Garzik Subject: Re: [PATCH 1/1] r8169: fix RxMissed register access Date: Sat, 13 Sep 2008 15:12:42 -0400 Message-ID: <48CC10AA.7000204@garzik.org> References: <20080910202856.GA22884@electric-eye.fr.zoreil.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: netdev@vger.kernel.org, Adam Huffman , Hermann Gausterer , Edward Hsu , David Miller , Andrew Morton , Ivan Vecera To: Francois Romieu Return-path: Received: from srv5.dvmed.net ([207.36.208.214]:59915 "EHLO mail.dvmed.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752541AbYIMTMt (ORCPT ); Sat, 13 Sep 2008 15:12:49 -0400 In-Reply-To: <20080910202856.GA22884@electric-eye.fr.zoreil.com> Sender: netdev-owner@vger.kernel.org List-ID: Francois Romieu wrote: > - the register is defined for the 8169 chipset only and there is > no 8169 beyond RTL_GIGA_MAC_VER_06. > - only the lower 3 bytes of the register are valid > > Fixes: > 1. http://bugzilla.kernel.org/show_bug.cgi?id=10180 > 2. http://bugzilla.kernel.org/show_bug.cgi?id=11062 (bits of) > > Tested by Hermann Gausterer and Adam Huffman. > > Signed-off-by: Francois Romieu > Cc: Edward Hsu > --- > drivers/net/r8169.c | 25 ++++++++++++++----------- > 1 files changed, 14 insertions(+), 11 deletions(-) > > diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c > index 0f6f974..4190ee7 100644 > --- a/drivers/net/r8169.c > +++ b/drivers/net/r8169.c > @@ -2099,8 +2099,6 @@ static void rtl_hw_start_8168(struct net_device *dev) > > RTL_R8(IntrMask); > > - RTL_W32(RxMissed, 0); > - > rtl_set_rx_mode(dev); > > RTL_W8(ChipCmd, CmdTxEnb | CmdRxEnb); > @@ -2143,8 +2141,6 @@ static void rtl_hw_start_8101(struct net_device *dev) > > RTL_R8(IntrMask); > > - RTL_W32(RxMissed, 0); > - > rtl_set_rx_mode(dev); > > RTL_W8(ChipCmd, CmdTxEnb | CmdRxEnb); > @@ -2922,6 +2918,17 @@ static int rtl8169_poll(struct napi_struct *napi, int budget) > return work_done; > } > > +static void rtl8169_rx_missed(struct net_device *dev, void __iomem *ioaddr) > +{ > + struct rtl8169_private *tp = netdev_priv(dev); > + > + if (tp->mac_version > RTL_GIGA_MAC_VER_06) > + return; > + > + dev->stats.rx_missed_errors += (RTL_R32(RxMissed) & 0xffffff); > + RTL_W32(RxMissed, 0); > +} > + > static void rtl8169_down(struct net_device *dev) > { > struct rtl8169_private *tp = netdev_priv(dev); > @@ -2939,9 +2946,7 @@ core_down: > > rtl8169_asic_down(ioaddr); > > - /* Update the error counts. */ > - dev->stats.rx_missed_errors += RTL_R32(RxMissed); > - RTL_W32(RxMissed, 0); > + rtl8169_rx_missed(dev, ioaddr); > > spin_unlock_irq(&tp->lock); > > @@ -3063,8 +3068,7 @@ static struct net_device_stats *rtl8169_get_stats(struct net_device *dev) > > if (netif_running(dev)) { > spin_lock_irqsave(&tp->lock, flags); > - dev->stats.rx_missed_errors += RTL_R32(RxMissed); > - RTL_W32(RxMissed, 0); > + rtl8169_rx_missed(dev, ioaddr); > spin_unlock_irqrestore(&tp->lock, flags); > } > > @@ -3089,8 +3093,7 @@ static int rtl8169_suspend(struct pci_dev *pdev, pm_message_t state) > > rtl8169_asic_down(ioaddr); > > - dev->stats.rx_missed_errors += RTL_R32(RxMissed); > - RTL_W32(RxMissed, 0); > + rtl8169_rx_missed(dev, ioaddr); > > spin_unlock_irq(&tp->lock); applied