bnxt_en: Allow the user to set ethtool stats-block-usecs to 0.

For debugging purpose, it is sometimes useful to disable periodic
port statistics updates, so that the firmware logs will not be
filled with statistics update messages.

Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 4acaeaf87f188464638e13e0aae7991406b41a04..5df967037d10fc238d47c64e1570c5a148c582e6 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -6843,7 +6843,8 @@ static void bnxt_timer(unsigned long data)
        if (atomic_read(&bp->intr_sem) != 0)
                goto bnxt_restart_timer;
 
-       if (bp->link_info.link_up && (bp->flags & BNXT_FLAG_PORT_STATS)) {
+       if (bp->link_info.link_up && (bp->flags & BNXT_FLAG_PORT_STATS) &&
+           bp->stats_coal_ticks) {
                set_bit(BNXT_PERIODIC_STATS_SP_EVENT, &bp->sp_event);
                schedule_work(&bp->sp_task);
        }

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
index 4661b1185790bc1b4c866cc7a51eefd6a991c5b5..140e76904af92e12454bdb21bf96146bbb156c73 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
@@ -86,9 +86,11 @@ static int bnxt_set_coalesce(struct net_device *dev,
        if (bp->stats_coal_ticks != coal->stats_block_coalesce_usecs) {
                u32 stats_ticks = coal->stats_block_coalesce_usecs;
 
-               stats_ticks = clamp_t(u32, stats_ticks,
-                                     BNXT_MIN_STATS_COAL_TICKS,
-                                     BNXT_MAX_STATS_COAL_TICKS);
+               /* Allow 0, which means disable. */
+               if (stats_ticks)
+                       stats_ticks = clamp_t(u32, stats_ticks,
+                                             BNXT_MIN_STATS_COAL_TICKS,
+                                             BNXT_MAX_STATS_COAL_TICKS);
                stats_ticks = rounddown(stats_ticks, BNXT_MIN_STATS_COAL_TICKS);
                bp->stats_coal_ticks = stats_ticks;
                update_stats = true;