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

Commit 757677d0 authored by Sean Wang's avatar Sean Wang Committed by Greg Kroah-Hartman
Browse files

net: mediatek: setup proper state for disabled GMAC on the default 




[ Upstream commit 7352e252b5bf40d59342494a70354a2d436fd0cd ]

The current solution would setup fixed and force link of 1Gbps to the both
GMAC on the default. However, The GMAC should always be put to link down
state when the GMAC is disabled on certain target boards. Otherwise,
the driver possibly receives unexpected data from the floating hardware
connection through the unused GMAC. Although the driver had been added
certain protection in RX path to get rid of such kind of unexpected data
sent to the upper stack.

Signed-off-by: default avatarSean Wang <sean.wang@mediatek.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1ec97b2a

drivers/net/ethernet/mediatek/mtk_eth_soc.c

+6 −5
Original line number Diff line number Diff line
@@ -1842,11 +1842,12 @@ static int mtk_hw_init(struct mtk_eth *eth) 
	/* set GE2 TUNE */

	regmap_write(eth->pctl, GPIO_BIAS_CTRL, 0x0);



	/* GE1, Force 1000M/FD, FC ON */

	mtk_w32(eth, MAC_MCR_FIXED_LINK, MTK_MAC_MCR(0));



	/* GE2, Force 1000M/FD, FC ON */

	mtk_w32(eth, MAC_MCR_FIXED_LINK, MTK_MAC_MCR(1));

	/* Set linkdown as the default for each GMAC. Its own MCR would be set

	 * up with the more appropriate value when mtk_phy_link_adjust call is

	 * being invoked.

	 */

	for (i = 0; i < MTK_MAC_COUNT; i++)

		mtk_w32(eth, 0, MTK_MAC_MCR(i));



	/* Enable RX VLan Offloading */

	mtk_w32(eth, 1, MTK_CDMP_EG_CTRL);