Commit 907a0768 authored by Ong Boon Leong's avatar Ong Boon Leong Committed by David S. Miller
Browse files

net: stmmac: xgmac: fix incorrect XGMAC_VLAN_TAG register writting 



We should always do a read of current value of XGMAC_VLAN_TAG instead of
directly overwriting the register value.

Fixes: 3cd1cfcb ("net: stmmac: Implement VLAN Hash Filtering in XGMAC")
Signed-off-by: default avatarOng Boon Leong <boon.leong.ong@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9eeeb3c9

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

+6 −2
Original line number Diff line number Diff line
@@ -569,7 +569,9 @@ static void dwxgmac2_update_vlan_hash(struct mac_device_info *hw, u32 hash, 


		writel(value, ioaddr + XGMAC_PACKET_FILTER);



		value = XGMAC_VLAN_VTHM | XGMAC_VLAN_ETV;

		value = readl(ioaddr + XGMAC_VLAN_TAG);



		value |= XGMAC_VLAN_VTHM | XGMAC_VLAN_ETV;

		if (is_double) {

			value |= XGMAC_VLAN_EDVLP;

			value |= XGMAC_VLAN_ESVL;
@@ -584,7 +586,9 @@ static void dwxgmac2_update_vlan_hash(struct mac_device_info *hw, u32 hash, 


		writel(value, ioaddr + XGMAC_PACKET_FILTER);



		value = XGMAC_VLAN_ETV;

		value = readl(ioaddr + XGMAC_VLAN_TAG);



		value |= XGMAC_VLAN_ETV;

		if (is_double) {

			value |= XGMAC_VLAN_EDVLP;

			value |= XGMAC_VLAN_ESVL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE