fm10k: introduce ITR_IS_ADAPTIVE macro

Define a macro for identifying when the itr value is dynamic or
adaptive. The concept was taken from i40e. This helps make clear what
the check is, and reduces the line length to something more reasonable
in a few places.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Reviewed-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Krishneil Singh <krishneil.k.singh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Orabug: 25394529

(cherry picked from commit 584373f5b98aed81ff5a432d91b6e16d7554a5c9)
Signed-off-by: Jack Vogel <jack.vogel@oracle.com>

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k.h b/drivers/net/ethernet/intel/fm10k/fm10k.h
index 14440200499b0300978caabc6d877a91f4ca91a9..a88b8adce44b02f568b6b8c92bcbfd63647c324a 100644 (file)
--- a/drivers/net/ethernet/intel/fm10k/fm10k.h
+++ b/drivers/net/ethernet/intel/fm10k/fm10k.h
@@ -172,6 +172,8 @@ struct fm10k_ring_container {
 #define FM10K_ITR_20K          50      /* 50us */
 #define FM10K_ITR_ADAPTIVE     0x8000  /* adaptive interrupt moderation flag */
 
+#define ITR_IS_ADAPTIVE(itr) (!!(itr & FM10K_ITR_ADAPTIVE))
+
 #define FM10K_ITR_ENABLE       (FM10K_ITR_AUTOMASK | FM10K_ITR_MASK_CLEAR)
 
 static inline struct netdev_queue *txring_txq(const struct fm10k_ring *ring)

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c
index 4ef2fbd229119578ca8681294556c5d906335814..e0adf280586bac17fd2e2f7f69709edf513c4426 100644 (file)
--- a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c
@@ -703,12 +703,10 @@ static int fm10k_get_coalesce(struct net_device *dev,
 {
        struct fm10k_intfc *interface = netdev_priv(dev);
 
-       ec->use_adaptive_tx_coalesce =
-               !!(interface->tx_itr & FM10K_ITR_ADAPTIVE);
+       ec->use_adaptive_tx_coalesce = ITR_IS_ADAPTIVE(interface->tx_itr);
        ec->tx_coalesce_usecs = interface->tx_itr & ~FM10K_ITR_ADAPTIVE;
 
-       ec->use_adaptive_rx_coalesce =
-               !!(interface->rx_itr & FM10K_ITR_ADAPTIVE);
+       ec->use_adaptive_rx_coalesce = ITR_IS_ADAPTIVE(interface->rx_itr);
        ec->rx_coalesce_usecs = interface->rx_itr & ~FM10K_ITR_ADAPTIVE;
 
        return 0;

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_main.c b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
index 4b2f0ea54cdf1fe188d54f140723134128722175..4610110c3727feb9dde40ff74597142190d28243 100644 (file)
--- a/drivers/net/ethernet/intel/fm10k/fm10k_main.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
@@ -1392,7 +1392,7 @@ static void fm10k_update_itr(struct fm10k_ring_container *ring_container)
        unsigned int avg_wire_size, packets;
 
        /* Only update ITR if we are using adaptive setting */
-       if (!(ring_container->itr & FM10K_ITR_ADAPTIVE))
+       if (!ITR_IS_ADAPTIVE(ring_container->itr))
                goto clear_counts;
 
        packets = ring_container->total_packets;