Commit 08207f42 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'ionic-cleanups' into main 



Shannon Nelson says:

====================
ionic: three little changes

These are three little changes for the code from inspection
and testing.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6d4e01d2 52fdba89

drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c

+1 −0
Original line number Diff line number Diff line
@@ -409,6 +409,7 @@ static void ionic_remove(struct pci_dev *pdev) 
	timer_shutdown_sync(&ionic->watchdog_timer);



	if (ionic->lif) {

		cancel_work_sync(&ionic->lif->deferred.work);

		/* prevent adminq cmds if already known as down */

		if (test_and_clear_bit(IONIC_LIF_F_FW_RESET, ionic->lif->state))

			set_bit(IONIC_LIF_F_FW_STOPPING, ionic->lif->state);

drivers/net/ethernet/pensando/ionic/ionic_dev.c

+2 −2
Original line number Diff line number Diff line
@@ -424,9 +424,9 @@ int ionic_heartbeat_check(struct ionic *ionic) 
	if (fw_hb_ready != idev->fw_hb_ready) {

		idev->fw_hb_ready = fw_hb_ready;

		if (!fw_hb_ready)

			dev_info(ionic->dev, "FW heartbeat stalled at %d\n", fw_hb);

			dev_info(ionic->dev, "FW heartbeat stalled at %u\n", fw_hb);

		else

			dev_info(ionic->dev, "FW heartbeat restored at %d\n", fw_hb);

			dev_info(ionic->dev, "FW heartbeat restored at %u\n", fw_hb);

	}



	if (!fw_hb_ready)

drivers/net/ethernet/pensando/ionic/ionic_lif.c

+3 −4
Original line number Diff line number Diff line
@@ -3526,10 +3526,6 @@ void ionic_lif_free(struct ionic_lif *lif) 
	lif->info = NULL;

	lif->info_pa = 0;



	/* unmap doorbell page */

	ionic_bus_unmap_dbpage(lif->ionic, lif->kern_dbpage);

	lif->kern_dbpage = NULL;



	mutex_destroy(&lif->config_lock);

	mutex_destroy(&lif->queue_lock);
@@ -3555,6 +3551,9 @@ void ionic_lif_deinit(struct ionic_lif *lif) 
	ionic_lif_qcq_deinit(lif, lif->notifyqcq);

	ionic_lif_qcq_deinit(lif, lif->adminqcq);



	ionic_bus_unmap_dbpage(lif->ionic, lif->kern_dbpage);

	lif->kern_dbpage = NULL;



	ionic_lif_reset(lif);

}