Commit 30a1e6d0 authored by Shannon Nelson's avatar Shannon Nelson Committed by David S. Miller
Browse files

ionic: keep ionic dev on lif init fail 



If the basic ionic interface works but the lif creation fails,
don't fail the probe.  This will allow us to use the driver to
help inspect the hw/fw/pci interface for debugging purposes.

Signed-off-by: default avatarShannon Nelson <snelson@pensando.io>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c8e98343

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

+16 −5
Original line number Diff line number Diff line
@@ -37,6 +37,9 @@ int ionic_bus_alloc_irq_vectors(struct ionic *ionic, unsigned int nintrs) 


void ionic_bus_free_irq_vectors(struct ionic *ionic)

{

	if (!ionic->nintrs)

		return;



	pci_free_irq_vectors(ionic->pdev);

}
@@ -346,6 +349,11 @@ err_out_reset: 
	ionic_reset(ionic);

err_out_teardown:

	ionic_dev_teardown(ionic);

	/* Don't fail the probe for these errors, keep

	 * the hw interface around for inspection

	 */

	return 0;



err_out_unmap_bars:

	ionic_unmap_bars(ionic);

	pci_release_regions(pdev);
@@ -369,11 +377,14 @@ static void ionic_remove(struct pci_dev *pdev) 
	if (!ionic)

		return;



	if (ionic->master_lif) {

		ionic_devlink_unregister(ionic);

		ionic_lifs_unregister(ionic);

		ionic_lifs_deinit(ionic);

		ionic_lifs_free(ionic);

		ionic_bus_free_irq_vectors(ionic);

	}



	ionic_port_reset(ionic);

	ionic_reset(ionic);

	ionic_dev_teardown(ionic);

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

+3 −0
Original line number Diff line number Diff line
@@ -2408,6 +2408,9 @@ void ionic_lifs_unregister(struct ionic *ionic) 
	 * current model, so don't bother searching the

	 * ionic->lif for candidates to unregister

	 */

	if (!ionic->master_lif)

		return;



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

	cancel_work_sync(&ionic->master_lif->tx_timeout_work);

	if (ionic->master_lif->netdev->reg_state == NETREG_REGISTERED)

CRA Git | Maintained and supported by SUSTech CRA and CCSE