ionic: check for linkup in watchdog

emusln · davem330 · commit 987c0871e8ae · 2020-03-30T11:40:50.000-07:00
Add a link_status_check to the heartbeat watchdog.

Signed-off-by: Shannon Nelson &lt;snelson@pensando.io&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/ethernet/pensando/ionic/ionic_dev.c b/drivers/net/ethernet/pensando/ionic/ionic_dev.c
@@ -14,11 +14,15 @@
 static void ionic_watchdog_cb(struct timer_list *t)
 {
 	struct ionic *ionic = from_timer(ionic, t, watchdog_timer);
+	int hb;
 
 	mod_timer(&ionic->watchdog_timer,
 		  round_jiffies(jiffies + ionic->watchdog_period));
 
-	ionic_heartbeat_check(ionic);
+	hb = ionic_heartbeat_check(ionic);
+
+	if (hb >= 0 && ionic->master_lif)
+		ionic_link_status_check_request(ionic->master_lif);
 }
 
 void ionic_init_devinfo(struct ionic *ionic)
diff --git a/drivers/net/ethernet/pensando/ionic/ionic_lif.c b/drivers/net/ethernet/pensando/ionic/ionic_lif.c
@@ -105,7 +105,7 @@ static void ionic_link_status_check(struct ionic_lif *lif)
 	clear_bit(IONIC_LIF_F_LINK_CHECK_REQUESTED, lif->state);
 }
 
-static void ionic_link_status_check_request(struct ionic_lif *lif)
+void ionic_link_status_check_request(struct ionic_lif *lif)
 {
 	struct ionic_deferred_work *work;
 
diff --git a/drivers/net/ethernet/pensando/ionic/ionic_lif.h b/drivers/net/ethernet/pensando/ionic/ionic_lif.h
@@ -224,6 +224,7 @@ static inline u32 ionic_coal_hw_to_usec(struct ionic *ionic, u32 units)
 	return (units * div) / mult;
 }
 
+void ionic_link_status_check_request(struct ionic_lif *lif);
 int ionic_lifs_alloc(struct ionic *ionic);
 void ionic_lifs_free(struct ionic *ionic);
 void ionic_lifs_deinit(struct ionic *ionic);

Original file line number	Diff line number	Diff line change
`@@ -14,11 +14,15 @@`
`14`	`14`	`static void ionic_watchdog_cb(struct timer_list *t)`
`15`	`15`	`{`
`16`	`16`	`struct ionic *ionic = from_timer(ionic, t, watchdog_timer);`
	`17`	`+ int hb;`
`17`	`18`
`18`	`19`	`mod_timer(&ionic->watchdog_timer,`
`19`	`20`	`round_jiffies(jiffies + ionic->watchdog_period));`
`20`	`21`
`21`		`- ionic_heartbeat_check(ionic);`
	`22`	`+ hb = ionic_heartbeat_check(ionic);`
	`23`	`+`
	`24`	`+ if (hb >= 0 && ionic->master_lif)`
	`25`	`+ ionic_link_status_check_request(ionic->master_lif);`
`22`	`26`	`}`
`23`	`27`
`24`	`28`	`void ionic_init_devinfo(struct ionic *ionic)`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ static void ionic_link_status_check(struct ionic_lif *lif)`
`105`	`105`	`clear_bit(IONIC_LIF_F_LINK_CHECK_REQUESTED, lif->state);`
`106`	`106`	`}`
`107`	`107`
`108`		`-static void ionic_link_status_check_request(struct ionic_lif *lif)`
	`108`	`+void ionic_link_status_check_request(struct ionic_lif *lif)`
`109`	`109`	`{`
`110`	`110`	`struct ionic_deferred_work *work;`
`111`	`111`
Original file line number	Diff line number	Diff line change
`@@ -224,6 +224,7 @@ static inline u32 ionic_coal_hw_to_usec(struct ionic *ionic, u32 units)`
`224`	`224`	`return (units * div) / mult;`
`225`	`225`	`}`
`226`	`226`
	`227`	`+void ionic_link_status_check_request(struct ionic_lif *lif);`
`227`	`228`	`int ionic_lifs_alloc(struct ionic *ionic);`
`228`	`229`	`void ionic_lifs_free(struct ionic *ionic);`
`229`	`230`	`void ionic_lifs_deinit(struct ionic *ionic);`