i40e: Fix Adaptive ITR enabling

This patch fixes a bug introduced with the addition of the per queue
ITR feature support in ethtool.  With that addition, there were
functions added which converted the ITR settings to binary values.
The IS_ENABLED macros that run on those values check whether a bit
is set or not and with the value being binary, the bit check always
returned ITR disabled which prevents any updating of the ITR rate.
This patch fixes the problem by changing the functions to return the
current ITR value instead and renaming it to better reflect
its function.  These functions now provide a value which will be
accurately asessed and update the ITR as intended.

Change-ID: I14f1d088d052e27f652aaa3113e186415ddea1fc
Signed-off-by: Carolyn Wyborny <carolyn.wyborny@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
index 09f09ea7a5e55b4e5da927f6a78947d9fe5e47d8..4dc993bb16bf2a3eebfcca568ffe1326640d04c0 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
@@ -1864,14 +1864,14 @@ static u32 i40e_buildreg_itr(const int type, const u16 itr)
 
 /* a small macro to shorten up some long lines */
 #define INTREG I40E_PFINT_DYN_CTLN
-static inline int get_rx_itr_enabled(struct i40e_vsi *vsi, int idx)
+static inline int get_rx_itr(struct i40e_vsi *vsi, int idx)
 {
-       return !!(vsi->rx_rings[idx]->rx_itr_setting);
+       return vsi->rx_rings[idx]->rx_itr_setting;
 }
 
-static inline int get_tx_itr_enabled(struct i40e_vsi *vsi, int idx)
+static inline int get_tx_itr(struct i40e_vsi *vsi, int idx)
 {
-       return !!(vsi->tx_rings[idx]->tx_itr_setting);
+       return vsi->tx_rings[idx]->tx_itr_setting;
 }
 
 /**
@@ -1897,8 +1897,8 @@ static inline void i40e_update_enable_itr(struct i40e_vsi *vsi,
         */
        rxval = txval = i40e_buildreg_itr(I40E_ITR_NONE, 0);
 
-       rx_itr_setting = get_rx_itr_enabled(vsi, idx);
-       tx_itr_setting = get_tx_itr_enabled(vsi, idx);
+       rx_itr_setting = get_rx_itr(vsi, idx);
+       tx_itr_setting = get_tx_itr(vsi, idx);
 
        if (q_vector->itr_countdown > 0 ||
            (!ITR_IS_DYNAMIC(rx_itr_setting) &&

diff --git a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
index b758846d4dc5d29858799beea8de3b8f0eec5f66..7cd28ef6e7140c443a3e461d3f7fd567e3b07f3e 100644 (file)
--- a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
@@ -1324,18 +1324,18 @@ static u32 i40e_buildreg_itr(const int type, const u16 itr)
 
 /* a small macro to shorten up some long lines */
 #define INTREG I40E_VFINT_DYN_CTLN1
-static inline int get_rx_itr_enabled(struct i40e_vsi *vsi, int idx)
+static inline int get_rx_itr(struct i40e_vsi *vsi, int idx)
 {
        struct i40evf_adapter *adapter = vsi->back;
 
-       return !!(adapter->rx_rings[idx].rx_itr_setting);
+       return adapter->rx_rings[idx].rx_itr_setting;
 }
 
-static inline int get_tx_itr_enabled(struct i40e_vsi *vsi, int idx)
+static inline int get_tx_itr(struct i40e_vsi *vsi, int idx)
 {
        struct i40evf_adapter *adapter = vsi->back;
 
-       return !!(adapter->tx_rings[idx].tx_itr_setting);
+       return adapter->tx_rings[idx].tx_itr_setting;
 }
 
 /**
@@ -1361,8 +1361,8 @@ static inline void i40e_update_enable_itr(struct i40e_vsi *vsi,
         */
        rxval = txval = i40e_buildreg_itr(I40E_ITR_NONE, 0);
 
-       rx_itr_setting = get_rx_itr_enabled(vsi, idx);
-       tx_itr_setting = get_tx_itr_enabled(vsi, idx);
+       rx_itr_setting = get_rx_itr(vsi, idx);
+       tx_itr_setting = get_tx_itr(vsi, idx);
 
        if (q_vector->itr_countdown > 0 ||
            (!ITR_IS_DYNAMIC(rx_itr_setting) &&