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

Commit 2040bd57 authored by Joakim Tjernlund's avatar Joakim Tjernlund Committed by David S. Miller
Browse files

ucc_geth: Do not bring the whole IF down when TX failure. 



ucc_geth_close lacks a cancel_work_sync(&ugeth->timeout_work)
to stop any outstanding processing of TX fail. However, one
can not call cancel_work_sync without fixing the timeout function
otherwise it will deadlock. This patch brings ucc_geth in line with
gianfar:

Don't bring the interface down and up, just reinit controller HW
and PHY.

Signed-off-by: default avatarJoakim Tjernlund <Joakim.Tjernlund@transmode.se>
Reviewed-by: default avatarAnton Vorontsov <cbouatmailru@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1f18b717

drivers/net/ucc_geth.c

+9 −6
Original line number Diff line number Diff line
@@ -2065,9 +2065,6 @@ static void ucc_geth_stop(struct ucc_geth_private *ugeth) 
	/* Disable Rx and Tx */

	clrbits32(&ug_regs->maccfg1, MACCFG1_ENABLE_RX | MACCFG1_ENABLE_TX);



	phy_disconnect(ugeth->phydev);

	ugeth->phydev = NULL;



	ucc_geth_memclean(ugeth);

}
@@ -3550,7 +3547,10 @@ static int ucc_geth_close(struct net_device *dev) 


	napi_disable(&ugeth->napi);



	cancel_work_sync(&ugeth->timeout_work);

	ucc_geth_stop(ugeth);

	phy_disconnect(ugeth->phydev);

	ugeth->phydev = NULL;



	free_irq(ugeth->ug_info->uf_info.irq, ugeth->ndev);
@@ -3579,8 +3579,12 @@ static void ucc_geth_timeout_work(struct work_struct *work) 
		 * Must reset MAC *and* PHY. This is done by reopening

		 * the device.

		 */

		ucc_geth_close(dev);

		ucc_geth_open(dev);

		netif_tx_stop_all_queues(dev);

		ucc_geth_stop(ugeth);

		ucc_geth_init_mac(ugeth);

		/* Must start PHY here */

		phy_start(ugeth->phydev);

		netif_tx_start_all_queues(dev);

	}



	netif_tx_schedule_all(dev);
@@ -3594,7 +3598,6 @@ static void ucc_geth_timeout(struct net_device *dev) 
{

	struct ucc_geth_private *ugeth = netdev_priv(dev);



	netif_carrier_off(dev);

	schedule_work(&ugeth->timeout_work);

}