]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
net: ena: fix update of interrupt moderation register
authorArthur Kiyanovski <akiyano@amazon.com>
Mon, 16 Sep 2019 11:31:34 +0000 (14:31 +0300)
committerDavid S. Miller <davem@davemloft.net>
Mon, 16 Sep 2019 20:06:02 +0000 (22:06 +0200)
Current implementation always updates the interrupt register with
the smoothed_interval of the rx_ring. However this should be
done only in case of adaptive interrupt moderation. If non-adaptive
interrupt moderation is used, the non-adaptive interrupt moderation
interval should be used. This commit fixes that.

Signed-off-by: Arthur Kiyanovski <akiyano@amazon.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/amazon/ena/ena_netdev.c

index 8b9f8b90e5258c2383d39476582ff3cc1f972973..54539e57aa73a5252c5d27f37eb54308455444ef 100644 (file)
@@ -1187,12 +1187,15 @@ static void ena_unmask_interrupt(struct ena_ring *tx_ring,
                                        struct ena_ring *rx_ring)
 {
        struct ena_eth_io_intr_reg intr_reg;
+       u32 rx_interval = ena_com_get_adaptive_moderation_enabled(rx_ring->ena_dev) ?
+               rx_ring->smoothed_interval :
+               ena_com_get_nonadaptive_moderation_interval_rx(rx_ring->ena_dev);
 
        /* Update intr register: rx intr delay,
         * tx intr delay and interrupt unmask
         */
        ena_com_update_intr_reg(&intr_reg,
-                               rx_ring->smoothed_interval,
+                               rx_interval,
                                tx_ring->smoothed_interval,
                                true);