netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [net 1/2] ixgbe: Fix Tx Hang issue with lldpad on 82598EB
@ 2013-07-26 12:46 Jeff Kirsher
  2013-07-26 12:46 ` [net 2/2] igb: fix vlan filtering in promisc mode when not in VT mode Jeff Kirsher
  2013-07-28 20:17 ` [net 1/2] ixgbe: Fix Tx Hang issue with lldpad on 82598EB David Miller
  0 siblings, 2 replies; 4+ messages in thread
From: Jeff Kirsher @ 2013-07-26 12:46 UTC (permalink / raw)
  To: davem; +Cc: Jacob Keller, netdev, gospo, sassmann, Stable, Jeff Kirsher

From: Jacob Keller <jacob.e.keller@intel.com>

This patch fixes an issue with the 82598EB device, where lldpad is causing Tx
Hangs on the card as soon as it attempts to configure DCB for the device. The
adapter will continually Tx hang and reset in a loop.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Cc: Stable <stable@vger.kernel.org>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Tested-by: Jack Morgan <jack.morgan@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c
index ac78077..7a77f37 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c
@@ -108,9 +108,8 @@ s32 ixgbe_dcb_config_tx_desc_arbiter_82598(struct ixgbe_hw *hw,
 
 	/* Enable arbiter */
 	reg &= ~IXGBE_DPMCS_ARBDIS;
-	/* Enable DFP and Recycle mode */
-	reg |= (IXGBE_DPMCS_TDPAC | IXGBE_DPMCS_TRM);
 	reg |= IXGBE_DPMCS_TSOEF;
+
 	/* Configure Max TSO packet size 34KB including payload and headers */
 	reg |= (0x4 << IXGBE_DPMCS_MTSOS_SHIFT);
 
-- 
1.7.11.7

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [net 2/2] igb: fix vlan filtering in promisc mode when not in VT mode
  2013-07-26 12:46 [net 1/2] ixgbe: Fix Tx Hang issue with lldpad on 82598EB Jeff Kirsher
@ 2013-07-26 12:46 ` Jeff Kirsher
  2013-07-28 20:17   ` David Miller
  2013-07-28 20:17 ` [net 1/2] ixgbe: Fix Tx Hang issue with lldpad on 82598EB David Miller
  1 sibling, 1 reply; 4+ messages in thread
From: Jeff Kirsher @ 2013-07-26 12:46 UTC (permalink / raw)
  To: davem; +Cc: Emil Tantilov, netdev, gospo, sassmann, Jeff Kirsher

From: Emil Tantilov <emil.s.tantilov@intel.com>

This patch fixes a VT mode check to make sure VLAN filters are disabled when
in promisc mode and VT is not enabled.

The problem with the previous check was that:
E1000_MRQC_ENABLE_VMDQ is defined as 0x00000003

but when not in VT mode:
mrqc |= E1000_MRQC_ENABLE_RSS_4Q (0x00000002)

So the above check will trigger regardless if VT mode is being used or not.

Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/ethernet/intel/igb/igb_main.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 6a0c1b6..c1d72c0 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -3739,9 +3739,8 @@ static void igb_set_rx_mode(struct net_device *netdev)
 	rctl &= ~(E1000_RCTL_UPE | E1000_RCTL_MPE | E1000_RCTL_VFE);
 
 	if (netdev->flags & IFF_PROMISC) {
-		u32 mrqc = rd32(E1000_MRQC);
 		/* retain VLAN HW filtering if in VT mode */
-		if (mrqc & E1000_MRQC_ENABLE_VMDQ)
+		if (adapter->vfs_allocated_count)
 			rctl |= E1000_RCTL_VFE;
 		rctl |= (E1000_RCTL_UPE | E1000_RCTL_MPE);
 		vmolr |= (E1000_VMOLR_ROPE | E1000_VMOLR_MPME);
-- 
1.7.11.7

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [net 1/2] ixgbe: Fix Tx Hang issue with lldpad on 82598EB
  2013-07-26 12:46 [net 1/2] ixgbe: Fix Tx Hang issue with lldpad on 82598EB Jeff Kirsher
  2013-07-26 12:46 ` [net 2/2] igb: fix vlan filtering in promisc mode when not in VT mode Jeff Kirsher
@ 2013-07-28 20:17 ` David Miller
  1 sibling, 0 replies; 4+ messages in thread
From: David Miller @ 2013-07-28 20:17 UTC (permalink / raw)
  To: jeffrey.t.kirsher; +Cc: jacob.e.keller, netdev, gospo, sassmann, stable

From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Fri, 26 Jul 2013 05:46:35 -0700

> From: Jacob Keller <jacob.e.keller@intel.com>
> 
> This patch fixes an issue with the 82598EB device, where lldpad is causing Tx
> Hangs on the card as soon as it attempts to configure DCB for the device. The
> adapter will continually Tx hang and reset in a loop.
> 
> Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
> Cc: Stable <stable@vger.kernel.org>
> Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
> Tested-by: Jack Morgan <jack.morgan@intel.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

Applied.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [net 2/2] igb: fix vlan filtering in promisc mode when not in VT mode
  2013-07-26 12:46 ` [net 2/2] igb: fix vlan filtering in promisc mode when not in VT mode Jeff Kirsher
@ 2013-07-28 20:17   ` David Miller
  0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2013-07-28 20:17 UTC (permalink / raw)
  To: jeffrey.t.kirsher; +Cc: emil.s.tantilov, netdev, gospo, sassmann

From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Fri, 26 Jul 2013 05:46:36 -0700

> From: Emil Tantilov <emil.s.tantilov@intel.com>
> 
> This patch fixes a VT mode check to make sure VLAN filters are disabled when
> in promisc mode and VT is not enabled.
> 
> The problem with the previous check was that:
> E1000_MRQC_ENABLE_VMDQ is defined as 0x00000003
> 
> but when not in VT mode:
> mrqc |= E1000_MRQC_ENABLE_RSS_4Q (0x00000002)
> 
> So the above check will trigger regardless if VT mode is being used or not.
> 
> Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com>
> Tested-by: Aaron Brown <aaron.f.brown@intel.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

Applied.

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2013-07-28 20:17 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-07-26 12:46 [net 1/2] ixgbe: Fix Tx Hang issue with lldpad on 82598EB Jeff Kirsher
2013-07-26 12:46 ` [net 2/2] igb: fix vlan filtering in promisc mode when not in VT mode Jeff Kirsher
2013-07-28 20:17   ` David Miller
2013-07-28 20:17 ` [net 1/2] ixgbe: Fix Tx Hang issue with lldpad on 82598EB David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).