Commit 230bd958 authored by Matteo Croce's avatar Matteo Croce Committed by David S. Miller
Browse files

mvpp2: refactor MTU change code 



The MTU change code can call napi_disable() with the device already down,
leading to a deadlock. Also, lot of code is duplicated unnecessarily.

Rework mvpp2_change_mtu() to avoid the deadlock and remove duplicated code.

Fixes: 3f518509 ("ethernet: Add new driver for Marvell Armada 375 network unit")
Signed-off-by: default avatarMatteo Croce <mcroce@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 011f1754

drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c

+13 −28
Original line number Diff line number Diff line
@@ -3700,6 +3700,7 @@ static int mvpp2_set_mac_address(struct net_device *dev, void *p) 
static int mvpp2_change_mtu(struct net_device *dev, int mtu)

{

	struct mvpp2_port *port = netdev_priv(dev);

	bool running = netif_running(dev);

	int err;



	if (!IS_ALIGNED(MVPP2_RX_PKT_SIZE(mtu), 8)) {
@@ -3708,40 +3709,24 @@ static int mvpp2_change_mtu(struct net_device *dev, int mtu) 
		mtu = ALIGN(MVPP2_RX_PKT_SIZE(mtu), 8);

	}



	if (!netif_running(dev)) {

		err = mvpp2_bm_update_mtu(dev, mtu);

		if (!err) {

			port->pkt_size =  MVPP2_RX_PKT_SIZE(mtu);

			return 0;

		}



		/* Reconfigure BM to the original MTU */

		err = mvpp2_bm_update_mtu(dev, dev->mtu);

		if (err)

			goto log_error;

	}



	if (running)

		mvpp2_stop_dev(port);



	err = mvpp2_bm_update_mtu(dev, mtu);

	if (!err) {

	if (err) {

		netdev_err(dev, "failed to change MTU\n");

		/* Reconfigure BM to the original MTU */

		mvpp2_bm_update_mtu(dev, dev->mtu);

	} else {

		port->pkt_size =  MVPP2_RX_PKT_SIZE(mtu);

		goto out_start;

	}



	/* Reconfigure BM to the original MTU */

	err = mvpp2_bm_update_mtu(dev, dev->mtu);

	if (err)

		goto log_error;



out_start:

	if (running) {

		mvpp2_start_dev(port);

		mvpp2_egress_enable(port);

		mvpp2_ingress_enable(port);

	}



	return 0;

log_error:

	netdev_err(dev, "failed to change MTU\n");

	return err;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE