From patchwork Tue Jul 8 16:01:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 367940 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 7AE7B1400A0; Wed, 9 Jul 2014 02:01:32 +1000 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1X4Xpd-0002eV-9g; Tue, 08 Jul 2014 16:01:25 +0000 Received: from mail.tpi.com ([74.45.170.26]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1X4XpX-0002c6-8s for kernel-team@lists.ubuntu.com; Tue, 08 Jul 2014 16:01:19 +0000 Received: from [10.20.69.242] (faun.canonical.com [91.189.93.182]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (Client did not present a certificate) by mail.tpi.com (Postfix) with ESMTP id E81A6357E1A for ; Tue, 8 Jul 2014 08:58:28 -0700 (PDT) Message-ID: <53BC15CB.80808@canonical.com> Date: Tue, 08 Jul 2014 17:01:15 +0100 From: Tim Gardner User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.6.0 MIME-Version: 1.0 To: kernel-team Subject: Trusty SRU - igb: fix stats for i210 rx_fifo_errors X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com From 96068a42e27395bba73f1d2d6a69babc08e04cc3 Mon Sep 17 00:00:00 2001 From: Todd Fujinaka Date: Tue, 8 Apr 2014 05:36:15 +0000 Subject: [PATCH] igb: fix stats for i210 rx_fifo_errors BugLink: http://bugs.launchpad.net/bugs/1338893 RQDPC on i210/i211 is R/W not ReadClear. Clear after reading. Signed-off-by: Todd Fujinaka Tested-by: Aaron Brown Signed-off-by: Jeff Kirsher (cherry picked from commit e66c083aab32842f225bae2a2c30744bf96abaec) Signed-off-by: Tim Gardner --- drivers/net/ethernet/intel/igb/igb_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index 8216825..7094bdc 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -4909,8 +4909,10 @@ void igb_update_stats(struct igb_adapter *adapter, rcu_read_lock(); for (i = 0; i < adapter->num_rx_queues; i++) { - u32 rqdpc = rd32(E1000_RQDPC(i)); struct igb_ring *ring = adapter->rx_ring[i]; + u32 rqdpc = rd32(E1000_RQDPC(i)); + if (hw->mac.type >= e1000_i210) + wr32(E1000_RQDPC(i), 0); if (rqdpc) { ring->rx_stats.drops += rqdpc; -- 2.0.1