ice: Add ability to update rx-usecs-high

Currently the driver allows rx-usecs-high values to be set,
but when querying the device for rx-usecs-high the value
does not stick. This is because it was not yet implemented.
Add code to allow the user to change rx-usecs-high and
use this to set the q_vector's intrl value.

Signed-off-by: Brett Creeley <brett.creeley@intel.com>
Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@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/ice/ice_ethtool.c b/drivers/net/ethernet/intel/ice/ice_ethtool.c
index 64a4c4456ba016ba221cd065c1d86b545fa5f799..f995ed599cd990c5ba4ea79211766f32b996e9b7 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_ethtool.c
+++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c
@@ -2228,12 +2228,18 @@ static int
 ice_get_rc_coalesce(struct ethtool_coalesce *ec, enum ice_container_type c_type,
                    struct ice_ring_container *rc)
 {
-       struct ice_pf *pf = rc->ring->vsi->back;
+       struct ice_pf *pf;
+
+       if (!rc->ring)
+               return -EINVAL;
+
+       pf = rc->ring->vsi->back;
 
        switch (c_type) {
        case ICE_RX_CONTAINER:
                ec->use_adaptive_rx_coalesce = ITR_IS_DYNAMIC(rc->itr_setting);
                ec->rx_coalesce_usecs = rc->itr_setting & ~ICE_ITR_DYNAMIC;
+               ec->rx_coalesce_usecs_high = rc->ring->q_vector->intrl;
                break;
        case ICE_TX_CONTAINER:
                ec->use_adaptive_tx_coalesce = ITR_IS_DYNAMIC(rc->itr_setting);
@@ -2342,6 +2348,23 @@ ice_set_rc_coalesce(enum ice_container_type c_type, struct ethtool_coalesce *ec,
 
        switch (c_type) {
        case ICE_RX_CONTAINER:
+               if (ec->rx_coalesce_usecs_high > ICE_MAX_INTRL ||
+                   (ec->rx_coalesce_usecs_high &&
+                    ec->rx_coalesce_usecs_high < pf->hw.intrl_gran)) {
+                       netdev_info(vsi->netdev,
+                                   "Invalid value, rx-usecs-high valid values are 0 (disabled), %d-%d\n",
+                                   pf->hw.intrl_gran, ICE_MAX_INTRL);
+                       return -EINVAL;
+               }
+
+               if (ec->rx_coalesce_usecs_high != rc->ring->q_vector->intrl) {
+                       rc->ring->q_vector->intrl = ec->rx_coalesce_usecs_high;
+                       wr32(&pf->hw, GLINT_RATE(vsi->hw_base_vector +
+                                                rc->ring->q_vector->v_idx),
+                            ice_intrl_usec_to_reg(ec->rx_coalesce_usecs_high,
+                                                  pf->hw.intrl_gran));
+               }
+
                if (ec->rx_coalesce_usecs != itr_setting &&
                    ec->use_adaptive_rx_coalesce) {
                        netdev_info(vsi->netdev,
@@ -2364,6 +2387,12 @@ ice_set_rc_coalesce(enum ice_container_type c_type, struct ethtool_coalesce *ec,
                }
                break;
        case ICE_TX_CONTAINER:
+               if (ec->tx_coalesce_usecs_high) {
+                       netdev_info(vsi->netdev,
+                                   "setting tx-usecs-high is not supported\n");
+                       return -EINVAL;
+               }
+
                if (ec->tx_coalesce_usecs != itr_setting &&
                    ec->use_adaptive_tx_coalesce) {
                        netdev_info(vsi->netdev,

diff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c
index 982a3a9e9b8d62b97b8aac0cfb0eca033a6de3ae..4c6ecc25aaa05cfffd7572b3baea8e30ae2e0143 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_lib.c
+++ b/drivers/net/ethernet/intel/ice/ice_lib.c
@@ -1764,7 +1764,7 @@ int ice_vsi_cfg_lan_txqs(struct ice_vsi *vsi)
  * This function converts a decimal interrupt rate limit in usecs to the format
  * expected by firmware.
  */
-static u32 ice_intrl_usec_to_reg(u8 intrl, u8 gran)
+u32 ice_intrl_usec_to_reg(u8 intrl, u8 gran)
 {
        u32 val = intrl / gran;
 

diff --git a/drivers/net/ethernet/intel/ice/ice_lib.h b/drivers/net/ethernet/intel/ice/ice_lib.h
index 714ace0777961dda979c315f6a61d6cd06003d15..a91d3553cc89bd53ff2042cc5dc33ea2d6b21ebe 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_lib.h
+++ b/drivers/net/ethernet/intel/ice/ice_lib.h
@@ -80,4 +80,5 @@ void ice_vsi_free_tx_rings(struct ice_vsi *vsi);
 
 int ice_vsi_manage_rss_lut(struct ice_vsi *vsi, bool ena);
 
+u32 ice_intrl_usec_to_reg(u8 intrl, u8 gran);
 #endif /* !_ICE_LIB_H_ */

diff --git a/drivers/net/ethernet/intel/ice/ice_txrx.h b/drivers/net/ethernet/intel/ice/ice_txrx.h
index c75d9fd12a68136c74111c6d09a6217edd87a9da..66e05032ee56709a96f98785a195becd22670f11 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_txrx.h
+++ b/drivers/net/ethernet/intel/ice/ice_txrx.h
@@ -142,6 +142,7 @@ enum ice_rx_dtype {
 #define ICE_ITR_ADAPTIVE_BULK          0x0000
 
 #define ICE_DFLT_INTRL 0
+#define ICE_MAX_INTRL  236
 
 /* Legacy or Advanced Mode Queue */
 #define ICE_TX_ADVANCED        0