[net] ixgbe: Fix output from ixgbe_dump

Submitted by Alexander Duyck on March 2, 2017, 11:01 p.m.

Details

Message ID 20170302230136.8845.40421.stgit@localhost.localdomain
State Under Review
Delegated to: Jeff Kirsher
Headers show

Commit Message

Alexander Duyck March 2, 2017, 11:01 p.m.
From: Alexander Duyck <alexander.h.duyck@intel.com>

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 <alexander.h.duyck@intel.com>
---
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Comments

Bowers, AndrewX March 7, 2017, 7:21 p.m.
> -----Original Message-----
> From: Intel-wired-lan [mailto:intel-wired-lan-bounces@lists.osuosl.org] On
> Behalf Of Alexander Duyck
> Sent: Thursday, March 2, 2017 3:02 PM
> To: intel-wired-lan@lists.osuosl.org; Kirsher, Jeffrey T
> <jeffrey.t.kirsher@intel.com>
> Subject: [Intel-wired-lan] [net PATCH] ixgbe: Fix output from ixgbe_dump
> 
> From: Alexander Duyck <alexander.h.duyck@intel.com>
> 
> 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 <alexander.h.duyck@intel.com>
> ---
>  drivers/net/ethernet/intel/ixgbe/ixgbe_main.c |    4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)

Tested-by: Andrew Bowers <andrewx.bowers@intel.com>

Patch hide | download patch | download mbox

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,