ixgbe: Address issues with Tx WHTRESH value not being set correctly

[~andy/linux] / drivers / net / ethernet / intel / ixgbe / ixgbe_main.c

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index a2c14bfd4b3f372f544deccbfd2e88bdbeb6e86f..fc3c33a2c205cd097120424c9cd4907c311a5039 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -2595,12 +2595,15 @@ void ixgbe_configure_tx_ring(struct ixgbe_adapter *adapter,
         * to or less than the number of on chip descriptors, which is
         * currently 40.
         */
-       if (!adapter->tx_itr_setting || !adapter->rx_itr_setting)
+       if (!ring->q_vector || (ring->q_vector->itr < 8))
                txdctl |= (1 << 16);    /* WTHRESH = 1 */
        else
                txdctl |= (8 << 16);    /* WTHRESH = 8 */
 
-       /* PTHRESH=32 is needed to avoid a Tx hang with DFP enabled. */
+       /*
+        * Setting PTHRESH to 32 both improves performance
+        * and avoids a TX hang with DFP enabled
+        */
        txdctl |= (1 << 8) |    /* HTHRESH = 1 */
                   32;          /* PTHRESH = 32 */