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

Commit 308f64e7 authored by Ioana Radulescu's avatar Ioana Radulescu Committed by Greg Kroah-Hartman
Browse files

staging: fsl-dpaa2/eth: Split function 



Since setup_dpni() became a bit too long, move the buffer layout
configuration to a separate function.

Signed-off-by: default avatarIoana Radulescu <ruxandra.radulescu@nxp.com>
Signed-off-by: default avatarBogdan Purcareata <bogdan.purcareata@nxp.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f6dda809

drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c

+45 −34
Original line number Diff line number Diff line
@@ -1776,42 +1776,12 @@ static void free_dpbp(struct dpaa2_eth_priv *priv) 
	fsl_mc_object_free(priv->dpbp_dev);

}



/* Configure the DPNI object this interface is associated with */

static int setup_dpni(struct fsl_mc_device *ls_dev)

static int set_buffer_layout(struct dpaa2_eth_priv *priv)

{

	struct device *dev = &ls_dev->dev;

	struct dpaa2_eth_priv *priv;

	struct net_device *net_dev;

	struct device *dev = priv->net_dev->dev.parent;

	struct dpni_buffer_layout buf_layout = {0};

	int err;



	net_dev = dev_get_drvdata(dev);

	priv = netdev_priv(net_dev);



	/* get a handle for the DPNI object */

	err = dpni_open(priv->mc_io, 0, ls_dev->obj_desc.id, &priv->mc_token);

	if (err) {

		dev_err(dev, "dpni_open() failed\n");

		return err;

	}



	ls_dev->mc_io = priv->mc_io;

	ls_dev->mc_handle = priv->mc_token;



	err = dpni_reset(priv->mc_io, 0, priv->mc_token);

	if (err) {

		dev_err(dev, "dpni_reset() failed\n");

		goto close;

	}



	err = dpni_get_attributes(priv->mc_io, 0, priv->mc_token,

				  &priv->dpni_attrs);

	if (err) {

		dev_err(dev, "dpni_get_attributes() failed (err=%d)\n", err);

		goto close;

	}



	/* Configure buffer layouts */

	/* rx buffer */

	buf_layout.pass_parser_result = true;

	buf_layout.pass_frame_status = true;
@@ -1825,7 +1795,7 @@ static int setup_dpni(struct fsl_mc_device *ls_dev) 
				     DPNI_QUEUE_RX, &buf_layout);

	if (err) {

		dev_err(dev, "dpni_set_buffer_layout(RX) failed\n");

		goto close;

		return err;

	}



	/* tx buffer */
@@ -1835,7 +1805,7 @@ static int setup_dpni(struct fsl_mc_device *ls_dev) 
				     DPNI_QUEUE_TX, &buf_layout);

	if (err) {

		dev_err(dev, "dpni_set_buffer_layout(TX) failed\n");

		goto close;

		return err;

	}



	/* tx-confirm buffer */
@@ -1844,9 +1814,50 @@ static int setup_dpni(struct fsl_mc_device *ls_dev) 
				     DPNI_QUEUE_TX_CONFIRM, &buf_layout);

	if (err) {

		dev_err(dev, "dpni_set_buffer_layout(TX_CONF) failed\n");

		return err;

	}



	return 0;

}



/* Configure the DPNI object this interface is associated with */

static int setup_dpni(struct fsl_mc_device *ls_dev)

{

	struct device *dev = &ls_dev->dev;

	struct dpaa2_eth_priv *priv;

	struct net_device *net_dev;

	int err;



	net_dev = dev_get_drvdata(dev);

	priv = netdev_priv(net_dev);



	/* get a handle for the DPNI object */

	err = dpni_open(priv->mc_io, 0, ls_dev->obj_desc.id, &priv->mc_token);

	if (err) {

		dev_err(dev, "dpni_open() failed\n");

		return err;

	}



	ls_dev->mc_io = priv->mc_io;

	ls_dev->mc_handle = priv->mc_token;



	err = dpni_reset(priv->mc_io, 0, priv->mc_token);

	if (err) {

		dev_err(dev, "dpni_reset() failed\n");

		goto close;

	}



	err = dpni_get_attributes(priv->mc_io, 0, priv->mc_token,

				  &priv->dpni_attrs);

	if (err) {

		dev_err(dev, "dpni_get_attributes() failed (err=%d)\n", err);

		goto close;

	}



	err = set_buffer_layout(priv);

	if (err)

		goto close;



	/* Now that we've set our tx buffer layout, retrieve the minimum

	 * required tx data offset.

	 */