Commit 0a72d833 authored Apr 11, 2019 by Jakub Kicinski Committed by David S. Miller Apr 12, 2019

nfp: move vNIC reset before netdev init



During probe we clear vNIC configuration in case the device
wasn't closed cleanly by previous driver.  Move that code
before netdev init, so netdev init can already try to apply
its config parameters.

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Dirk van der Merwe <dirk.vandermerwe@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent dd5b2498

drivers/net/ethernet/netronome/nfp/nfp_net_common.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -3986,9 +3986,6 @@ int nfp_net_init(struct nfp_net *nn)
		nn->dp.ctrl \|= NFP_NET_CFG_CTRL_IRQMOD;
		}

		if (nn->dp.netdev)
		nfp_net_netdev_init(nn);

		/* Stash the re-configuration queue away. First odd queue in TX Bar */
		nn->qcp_cfg = nn->tx_bar + NFP_QCP_QUEUE_ADDR_SZ;

		@@ -4001,6 +3998,9 @@ int nfp_net_init(struct nfp_net *nn)
		if (err)
		return err;

		if (nn->dp.netdev)
		nfp_net_netdev_init(nn);

		nfp_net_vecs_init(nn);

		if (!nn->dp.netdev)

Admin message