From patchwork Thu Mar 2 23:01:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander H Duyck X-Patchwork-Id: 734853 X-Patchwork-Delegate: jeffrey.t.kirsher@intel.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vZ79P53Sjz9s7n for ; Fri, 3 Mar 2017 10:01:45 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="DYpM323V"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id E31A988D98; Thu, 2 Mar 2017 23:01:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3BHb66hKwCs2; Thu, 2 Mar 2017 23:01:43 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0A19088D73; Thu, 2 Mar 2017 23:01:43 +0000 (UTC) X-Original-To: intel-wired-lan@lists.osuosl.org Delivered-To: intel-wired-lan@lists.osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 2B7971C26EA for ; Thu, 2 Mar 2017 23:01:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id D5B6930D72 for ; Thu, 2 Mar 2017 23:01:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id AYDq8wLvlvBz for ; Thu, 2 Mar 2017 23:01:37 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by silver.osuosl.org (Postfix) with ESMTPS id AE16725E0B for ; Thu, 2 Mar 2017 23:01:37 +0000 (UTC) Received: by mail-pf0-f194.google.com with SMTP id e66so2334437pfe.0 for ; Thu, 02 Mar 2017 15:01:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:date:message-id:user-agent:mime-version :content-transfer-encoding; bh=YPLL8zeJqYWHJjl92gDtsthn/jRJ0zNMt7YLLhMAUEo=; b=DYpM323VB2bdcsuVVAGjK2LyfFOedPb/ii/vrUiwJRdD2oqqGX+nnQBwNd0Yolyw2e Sr2vpxuEyPjTV7rxhk0VnAjNljYk+2Oq2H6T3Bzy0Spegki8CMj73kwiNVKNM2CIdJrB gvf5kBMv782Vt6+nUyV6+uv9hMFeLJC2DPapBVotKzCCj/szZcKsMYQMyhMP7YlPbMha 19Mcng2c6LV2vkecW7AapjmqCIkAJrcn728AHBd/Q4VtBjUHAhE6aI0vAEyxuuuQ6md6 29l1yjbf8QZPrVTpAsjpdIbmVAyPoJV0szriiE94ULuOpOKTHlgM3T3qvp6dVRlVZVEn h7sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:date:message-id:user-agent :mime-version:content-transfer-encoding; bh=YPLL8zeJqYWHJjl92gDtsthn/jRJ0zNMt7YLLhMAUEo=; b=KhDRlitY/Kuzl6R4pumF+BrEhVH9gjVK+oY3sJCrIMHIucIAnnSBWEaVUxWeui+bLT FoqCLg2vXHD4fbl2brVpSShhPLu8nKErthLJMt61fLsOMvMl9xcYiMGH1EbxSih97z3B mgfmBBgGjG4SjPhzW3H+zYbhfVdV9JBzW6MiREtUqIAwpbK3u/mGXmUHM2t5OsFmSEnl 8t9jvYA48KfULXb+d1wYknK9ES8svQX88DghZz0mQP1687JQEVyQc18l16f2FimwhK5F F8ohdqGGj63S22Ln1xBJKuxor/mf96Da90aepf5W5cP7Ezzc+Q4HIly6/VQcMbFJzAPI qn8w== X-Gm-Message-State: AMke39nE4hSu6bz32RtOfYlQar+rsup2howjTFAk6IJRfuy9L7UjVND5N1eDM678fvKDyg== X-Received: by 10.84.168.131 with SMTP id f3mr22259853plb.163.1488495697264; Thu, 02 Mar 2017 15:01:37 -0800 (PST) Received: from localhost.localdomain ([2001:470:b:9c3:9e5c:8eff:fe4f:f2d0]) by smtp.gmail.com with ESMTPSA id v186sm19141805pgv.44.2017.03.02.15.01.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Mar 2017 15:01:36 -0800 (PST) From: Alexander Duyck To: intel-wired-lan@lists.osuosl.org, jeffrey.t.kirsher@intel.com Date: Thu, 02 Mar 2017 15:01:36 -0800 Message-ID: <20170302230136.8845.40421.stgit@localhost.localdomain> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Subject: [Intel-wired-lan] [net PATCH] ixgbe: Fix output from ixgbe_dump X-BeenThere: intel-wired-lan@lists.osuosl.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-wired-lan-bounces@lists.osuosl.org Sender: "Intel-wired-lan" From: Alexander Duyck I just found that when we had changed the Rx path to check for length instead of the DD bit we introduced an issue in ixgbe_dump since we were no longer clearing the status bits. To correct this I am updating ixgbe_dump to look for the length bits in the descriptor since that is what we are using in the Rx path. Fixes: c3630cc40b4f ("ixgbe: Use length to determine if descriptor is done") Signed-off-by: Alexander Duyck Tested-by: Andrew Bowers --- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index a922a2c2e4b6..b58f4b255e4e 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -601,7 +601,6 @@ static void ixgbe_dump(struct ixgbe_adapter *adapter) struct ixgbe_ring *rx_ring; union ixgbe_adv_rx_desc *rx_desc; struct ixgbe_rx_buffer *rx_buffer_info; - u32 staterr; int i = 0; if (!netif_msg_hw(adapter)) @@ -810,8 +809,7 @@ static void ixgbe_dump(struct ixgbe_adapter *adapter) rx_buffer_info = &rx_ring->rx_buffer_info[i]; rx_desc = IXGBE_RX_DESC(rx_ring, i); u0 = (struct my_u0 *)rx_desc; - staterr = le32_to_cpu(rx_desc->wb.upper.status_error); - if (staterr & IXGBE_RXD_STAT_DD) { + if (rx_desc->wb.upper.length) { /* Descriptor Done */ pr_info("RWB[0x%03X] %016llX " "%016llX ---------------- %p", i,