igb: set default thresholds based on MAC type

This brings the DPDK igb driver inline with the behavior used by
the current Linux driver. The IGB hardware has several different
MAC types and the threshold values that work vary based on the hardware.

Since DPDK 1.8 it has been up to devices to provide the correct default
configuration parameter. But the igb driver gives values that are broken
on some devices, and always causes a warning message at startup.

Please test this on real hardware, I don't have the luxury of a
hardware lab full of variations of this chip.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Wenzhuo Lu <wenzhuo.lu@intel.com>

diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c
index e3f50cc7ba64265c18b6fe5da61ef6934590ec66..9a34d0113e26d9917f622f2679cd61f6df2c8d22 100644 (file)
--- a/drivers/net/e1000/igb_ethdev.c
+++ b/drivers/net/e1000/igb_ethdev.c
@@ -61,13 +61,14 @@
  * Default values for port configuration
  */
 #define IGB_DEFAULT_RX_FREE_THRESH  32
-#define IGB_DEFAULT_RX_PTHRESH      8
+
+#define IGB_DEFAULT_RX_PTHRESH      ((hw->mac.type == e1000_i354) ? 12 : 8)
 #define IGB_DEFAULT_RX_HTHRESH      8
-#define IGB_DEFAULT_RX_WTHRESH      0
+#define IGB_DEFAULT_RX_WTHRESH      ((hw->mac.type == e1000_82576) ? 1 : 4)
 
-#define IGB_DEFAULT_TX_PTHRESH      32
-#define IGB_DEFAULT_TX_HTHRESH      0
-#define IGB_DEFAULT_TX_WTHRESH      0
+#define IGB_DEFAULT_TX_PTHRESH      ((hw->mac.type == e1000_i354) ? 20 : 8)
+#define IGB_DEFAULT_TX_HTHRESH      1
+#define IGB_DEFAULT_TX_WTHRESH      ((hw->mac.type == e1000_82576) ? 1 : 16)
 
 #define IGB_HKEY_MAX_INDEX 10
 

diff --git a/drivers/net/e1000/igb_rxtx.c b/drivers/net/e1000/igb_rxtx.c
index 74587b524a6f378626c3d378eee86bb524a61ed5..e527895e49d7a682995d8f7010a5bd12d1275e7f 100644 (file)
--- a/drivers/net/e1000/igb_rxtx.c
+++ b/drivers/net/e1000/igb_rxtx.c
@@ -1309,13 +1309,13 @@ eth_igb_tx_queue_setup(struct rte_eth_dev *dev,
         * driver.
         */
        if (tx_conf->tx_free_thresh != 0)
-               PMD_INIT_LOG(WARNING, "The tx_free_thresh parameter is not "
+               PMD_INIT_LOG(INFO, "The tx_free_thresh parameter is not "
                             "used for the 1G driver.");
        if (tx_conf->tx_rs_thresh != 0)
-               PMD_INIT_LOG(WARNING, "The tx_rs_thresh parameter is not "
+               PMD_INIT_LOG(INFO, "The tx_rs_thresh parameter is not "
                             "used for the 1G driver.");
-       if (tx_conf->tx_thresh.wthresh == 0)
-               PMD_INIT_LOG(WARNING, "To improve 1G driver performance, "
+       if (tx_conf->tx_thresh.wthresh == 0 && hw->mac.type != e1000_82576)
+               PMD_INIT_LOG(INFO, "To improve 1G driver performance, "
                             "consider setting the TX WTHRESH value to 4, 8, "
                             "or 16.");