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

ionic: call ionic_port_init after fw-upgrade 



Since the fw has been re-inited, we need to refresh the port
information dma address so we can see fresh port information.
Let's call ionic_port_init again, and tweak it to allow for
a call to simply refresh the existing dma address.

Fixes: c672412f ("ionic: remove lifs on fw reset")
Signed-off-by: default avatarShannon Nelson <snelson@pensando.io>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f20a4d40

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

+1 −0
Original line number Diff line number Diff line
@@ -2118,6 +2118,7 @@ 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_qcqs_alloc(lif);

	if (err)

		goto err_out;

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

+9 −9
Original line number Diff line number Diff line
@@ -509,17 +509,17 @@ int ionic_port_init(struct ionic *ionic) 
	size_t sz;

	int err;



	if (idev->port_info)

		return 0;



	if (!idev->port_info) {

		idev->port_info_sz = ALIGN(sizeof(*idev->port_info), PAGE_SIZE);

	idev->port_info = dma_alloc_coherent(ionic->dev, idev->port_info_sz,

		idev->port_info = dma_alloc_coherent(ionic->dev,

						     idev->port_info_sz,

						     &idev->port_info_pa,

						     GFP_KERNEL);

		if (!idev->port_info) {

		dev_err(ionic->dev, "Failed to allocate port info, aborting\n");

			dev_err(ionic->dev, "Failed to allocate port info\n");

			return -ENOMEM;

		}

	}



	sz = min(sizeof(ident->port.config), sizeof(idev->dev_cmd_regs->data));

CRA Git | Maintained and supported by SUSTech CRA and CCSE