mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-28 11:18:45 +07:00
Merge branch 'ionic-fw-upgrade-bug-fixes'
Shannon Nelson says: ==================== ionic: fw upgrade bug fixes These patches address issues found in additional internal fw-upgrade testing. v2: - replaced extra state flag with postponing first link check - added device reset patch ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
de04604e23
@ -2101,6 +2101,7 @@ static void ionic_lif_handle_fw_down(struct ionic_lif *lif)
|
|||||||
ionic_txrx_free(lif);
|
ionic_txrx_free(lif);
|
||||||
}
|
}
|
||||||
ionic_lifs_deinit(ionic);
|
ionic_lifs_deinit(ionic);
|
||||||
|
ionic_reset(ionic);
|
||||||
ionic_qcqs_free(lif);
|
ionic_qcqs_free(lif);
|
||||||
|
|
||||||
dev_info(ionic->dev, "FW Down: LIFs stopped\n");
|
dev_info(ionic->dev, "FW Down: LIFs stopped\n");
|
||||||
@ -2116,6 +2117,7 @@ static void ionic_lif_handle_fw_up(struct ionic_lif *lif)
|
|||||||
|
|
||||||
dev_info(ionic->dev, "FW Up: restarting LIFs\n");
|
dev_info(ionic->dev, "FW Up: restarting LIFs\n");
|
||||||
|
|
||||||
|
ionic_init_devinfo(ionic);
|
||||||
err = ionic_qcqs_alloc(lif);
|
err = ionic_qcqs_alloc(lif);
|
||||||
if (err)
|
if (err)
|
||||||
goto err_out;
|
goto err_out;
|
||||||
@ -2549,8 +2551,6 @@ int ionic_lifs_register(struct ionic *ionic)
|
|||||||
dev_err(ionic->dev, "Cannot register net device, aborting\n");
|
dev_err(ionic->dev, "Cannot register net device, aborting\n");
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
ionic_link_status_check_request(ionic->master_lif);
|
|
||||||
ionic->master_lif->registered = true;
|
ionic->master_lif->registered = true;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
Loading…
Reference in New Issue
Block a user