ionic: fire watchdog again after fw_down

In some cases of fw_down it was called because there was a
fw_generation change, and the firmware is already back up.
In order to keep the down time to a minimum, don't wait for
the next watchdog polling cycle, fire another watchdog off
as soon as we can - an out-of-cycle check won't hurt, and
may well speed up the recovery.

Signed-off-by: Shannon Nelson <snelson@pensando.io>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/pensando/ionic/ionic_lif.c b/drivers/net/ethernet/pensando/ionic/ionic_lif.c
index e494d6b909c764137862ca4600e0416e80a2e234..df0137044c033a361ae80eefd786dc6b1de3a9b1 100644 (file)
--- a/drivers/net/ethernet/pensando/ionic/ionic_lif.c
+++ b/drivers/net/ethernet/pensando/ionic/ionic_lif.c
@@ -93,10 +93,17 @@ static void ionic_lif_deferred_work(struct work_struct *work)
                        ionic_link_status_check(lif);
                        break;
                case IONIC_DW_TYPE_LIF_RESET:
-                       if (w->fw_status)
+                       if (w->fw_status) {
                                ionic_lif_handle_fw_up(lif);
-                       else
+                       } else {
                                ionic_lif_handle_fw_down(lif);
+
+                               /* Fire off another watchdog to see
+                                * if the FW is already back rather than
+                                * waiting another whole cycle
+                                */
+                               mod_timer(&lif->ionic->watchdog_timer, jiffies + 1);
+                       }
                        break;
                default:
                        break;