]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
net: stmmac: xgmac: fix incorrect XGMAC_VLAN_TAG register writting
authorOng Boon Leong <boon.leong.ong@intel.com>
Fri, 7 Feb 2020 07:33:40 +0000 (15:33 +0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 7 Feb 2020 10:36:21 +0000 (11:36 +0100)
We should always do a read of current value of XGMAC_VLAN_TAG instead of
directly overwriting the register value.

Fixes: 3cd1cfcba26e2 ("net: stmmac: Implement VLAN Hash Filtering in XGMAC")
Signed-off-by: Ong Boon Leong <boon.leong.ong@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c

index 2af3ac5409b7219167bc07fa318decb268c471b3..a0e67d178280dc5c99129abf113fea29bc86d455 100644 (file)
@@ -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;