lkml.org 
[lkml]   [2020]   [Apr]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.6 090/129] net: stmmac: xgmac: Fix VLAN register handling
    Date
    From: Jose Abreu <Jose.Abreu@synopsys.com>

    [ Upstream commit 21f64e72e7073199a6f8d7d8efe52cd814d7d665 ]

    Commit 907a076881f1, 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: 907a076881f1 ("net: stmmac: xgmac: fix incorrect XGMAC_VLAN_TAG register writting")
    Signed-off-by: Jose Abreu <Jose.Abreu@synopsys.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 11 +++++++++++
    1 file changed, 11 insertions(+)

    diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c
    index 67b754a56288a..a7d7a05d2aff3 100644
    --- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c
    +++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c
    @@ -576,8 +576,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);
    @@ -588,13 +593,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);
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-04-15 15:03    [W:4.077 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site