Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 545bfa7a authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

nfp: split reading capabilities out of nfp_net_init() 



nfp_net_init() is a little long and we are about to add more
code to reading capabilties.  Move the capability reading,
parsing and validating out.  Only actual initialization
will stay in nfp_net_init().

No functional changes.

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarDirk van der Merwe <dirk.vandermerwe@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 527d7d1b

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

+20 −11
Original line number Diff line number Diff line
@@ -3756,18 +3756,8 @@ static void nfp_net_netdev_init(struct nfp_net *nn) 
	nfp_net_set_ethtool_ops(netdev);

}



/**

 * nfp_net_init() - Initialise/finalise the nfp_net structure

 * @nn:		NFP Net device structure

 *

 * Return: 0 on success or negative errno on error.

 */

int nfp_net_init(struct nfp_net *nn)

static int nfp_net_read_caps(struct nfp_net *nn)

{

	int err;



	nn->dp.rx_dma_dir = DMA_FROM_DEVICE;



	/* Get some of the read-only fields from the BAR */

	nn->cap = nn_readl(nn, NFP_NET_CFG_CAP);

	nn->max_mtu = nn_readl(nn, NFP_NET_CFG_MAX_MTU);
@@ -3800,6 +3790,25 @@ int nfp_net_init(struct nfp_net *nn) 
		nn->dp.rx_offset = NFP_NET_RX_OFFSET;

	}



	return 0;

}



/**

 * nfp_net_init() - Initialise/finalise the nfp_net structure

 * @nn:		NFP Net device structure

 *

 * Return: 0 on success or negative errno on error.

 */

int nfp_net_init(struct nfp_net *nn)

{

	int err;



	nn->dp.rx_dma_dir = DMA_FROM_DEVICE;



	err = nfp_net_read_caps(nn);

	if (err)

		return err;



	/* Set default MTU and Freelist buffer size */

	if (nn->max_mtu < NFP_NET_DEFAULT_MTU)

		nn->dp.mtu = nn->max_mtu;