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

ionic: refill lif identity after fw_up 



After we do a fw upgrade and refill the ionic->ident.dev, we
also need to update the other identity info.  Since the lif
identity needs to be updated each time the ionic identity is
refreshed, we can pull it into ionic_identify().

The debugfs entry is moved so that it doesn't cause an
error message when the data is refreshed after the fw upgrade.

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

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

+2 −8
Original line number Diff line number Diff line
@@ -266,6 +266,7 @@ static int ionic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		dev_err(dev, "Cannot identify device: %d, aborting\n", err);

		goto err_out_teardown;

	}

	ionic_debugfs_add_ident(ionic);



	err = ionic_init(ionic);

	if (err) {
@@ -286,14 +287,7 @@ static int ionic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		goto err_out_reset;

	}



	/* Configure LIFs */

	err = ionic_lif_identify(ionic, IONIC_LIF_TYPE_CLASSIC,

				 &ionic->ident.lif);

	if (err) {

		dev_err(dev, "Cannot identify LIFs: %d, aborting\n", err);

		goto err_out_port_reset;

	}



	/* Allocate and init the LIF */

	err = ionic_lif_size(ionic);

	if (err) {

		dev_err(dev, "Cannot size LIF: %d, aborting\n", err);

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

+9 −1
Original line number Diff line number Diff line
@@ -2556,7 +2556,15 @@ static void ionic_lif_handle_fw_up(struct ionic_lif *lif) 
	dev_info(ionic->dev, "FW Up: restarting LIFs\n");



	ionic_init_devinfo(ionic);

	ionic_port_init(ionic);

	err = ionic_identify(ionic);

	if (err)

		goto err_out;

	err = ionic_port_identify(ionic);

	if (err)

		goto err_out;

	err = ionic_port_init(ionic);

	if (err)

		goto err_out;

	err = ionic_qcqs_alloc(lif);

	if (err)

		goto err_out;

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

+11 −5
Original line number Diff line number Diff line
@@ -429,17 +429,23 @@ int ionic_identify(struct ionic *ionic) 
		sz = min(sizeof(ident->dev), sizeof(idev->dev_cmd_regs->data));

		memcpy_fromio(&ident->dev, &idev->dev_cmd_regs->data, sz);

	}



	mutex_unlock(&ionic->dev_cmd_lock);



	if (err)

		goto err_out_unmap;

	if (err) {

		dev_err(ionic->dev, "Cannot identify ionic: %dn", err);

		goto err_out;

	}



	ionic_debugfs_add_ident(ionic);

	err = ionic_lif_identify(ionic, IONIC_LIF_TYPE_CLASSIC,

				 &ionic->ident.lif);

	if (err) {

		dev_err(ionic->dev, "Cannot identify LIFs: %d\n", err);

		goto err_out;

	}



	return 0;



err_out_unmap:

err_out:

	return err;

}