Commit a1f47752 authored by Arınç ÜNAL's avatar Arınç ÜNAL Committed by Jakub Kicinski
Browse files

net: ethernet: mtk_eth_soc: disable hardware DSA untagging for second MAC 

According to my tests on MT7621AT and MT7623NI SoCs, hardware DSA untagging
won't work on the second MAC. Therefore, disable this feature when the
second MAC of the MT7621 and MT7623 SoCs is being used.

Fixes: 2d7605a7 ("net: ethernet: mtk_eth_soc: enable hardware DSA untagging")
Link: https://lore.kernel.org/netdev/6249fc14-b38a-c770-36b4-5af6d41c21d3@arinc9.com/


Tested-by: default avatarArınç ÜNAL <arinc.unal@arinc9.com>
Signed-off-by: default avatarArınç ÜNAL <arinc.unal@arinc9.com>
Link: https://lore.kernel.org/r/20230128094232.2451947-1-arinc.unal@arinc9.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 63b11404

drivers/net/ethernet/mediatek/mtk_eth_soc.c

+4 −2
Original line number Diff line number Diff line
@@ -3177,7 +3177,8 @@ static int mtk_open(struct net_device *dev) 
	struct mtk_eth *eth = mac->hw;

	int i, err;



	if (mtk_uses_dsa(dev) && !eth->prog) {

	if ((mtk_uses_dsa(dev) && !eth->prog) &&

	    !(mac->id == 1 && MTK_HAS_CAPS(eth->soc->caps, MTK_GMAC1_TRGMII))) {

		for (i = 0; i < ARRAY_SIZE(eth->dsa_meta); i++) {

			struct metadata_dst *md_dst = eth->dsa_meta[i];
@@ -3194,7 +3195,8 @@ static int mtk_open(struct net_device *dev) 
		}

	} else {

		/* Hardware special tag parsing needs to be disabled if at least

		 * one MAC does not use DSA.

		 * one MAC does not use DSA, or the second MAC of the MT7621 and

		 * MT7623 SoCs is being used.

		 */

		u32 val = mtk_r32(eth, MTK_CDMP_IG_CTRL);

		val &= ~MTK_CDMP_STAG_EN;