Commit 21f64e72 authored by Jose Abreu's avatar Jose Abreu Committed by David S. Miller
Browse files

net: stmmac: xgmac: Fix VLAN register handling 



Commit 907a0768, forgot that we need to clear old values of
XGMAC_VLAN_TAG register when we switch from VLAN perfect matching to
HASH matching.

Fix it.

Fixes: 907a0768 ("net: stmmac: xgmac: fix incorrect XGMAC_VLAN_TAG register writting")
Signed-off-by: default avatarJose Abreu <Jose.Abreu@synopsys.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a7d40cbb

drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c

+11 −0
Original line number Diff line number Diff line
@@ -577,8 +577,13 @@ static void dwxgmac2_update_vlan_hash(struct mac_device_info *hw, u32 hash, 
			value |= XGMAC_VLAN_EDVLP;

			value |= XGMAC_VLAN_ESVL;

			value |= XGMAC_VLAN_DOVLTC;

		} else {

			value &= ~XGMAC_VLAN_EDVLP;

			value &= ~XGMAC_VLAN_ESVL;

			value &= ~XGMAC_VLAN_DOVLTC;

		}



		value &= ~XGMAC_VLAN_VID;

		writel(value, ioaddr + XGMAC_VLAN_TAG);

	} else if (perfect_match) {

		u32 value = readl(ioaddr + XGMAC_PACKET_FILTER);
@@ -589,13 +594,19 @@ static void dwxgmac2_update_vlan_hash(struct mac_device_info *hw, u32 hash, 


		value = readl(ioaddr + XGMAC_VLAN_TAG);



		value &= ~XGMAC_VLAN_VTHM;

		value |= XGMAC_VLAN_ETV;

		if (is_double) {

			value |= XGMAC_VLAN_EDVLP;

			value |= XGMAC_VLAN_ESVL;

			value |= XGMAC_VLAN_DOVLTC;

		} else {

			value &= ~XGMAC_VLAN_EDVLP;

			value &= ~XGMAC_VLAN_ESVL;

			value &= ~XGMAC_VLAN_DOVLTC;

		}



		value &= ~XGMAC_VLAN_VID;

		writel(value | perfect_match, ioaddr + XGMAC_VLAN_TAG);

	} else {

		u32 value = readl(ioaddr + XGMAC_PACKET_FILTER);

CRA Git | Maintained and supported by SUSTech CRA and CCSE