lkml.org 
[lkml]   [2021]   [Jun]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 044/146] net: stmmac: dwmac1000: Fix extended MAC address registers definition
    Date
    From: Jisheng Zhang <Jisheng.Zhang@synaptics.com>

    [ Upstream commit 1adb20f0d496b2c61e9aa1f4761b8d71f93d258e ]

    The register starts from 0x800 is the 16th MAC address register rather
    than the first one.

    Fixes: cffb13f4d6fb ("stmmac: extend mac addr reg and fix perfect filering")
    Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/stmicro/stmmac/dwmac1000.h | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac1000.h b/drivers/net/ethernet/stmicro/stmmac/dwmac1000.h
    index b70d44ac0990..3c73453725f9 100644
    --- a/drivers/net/ethernet/stmicro/stmmac/dwmac1000.h
    +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac1000.h
    @@ -76,10 +76,10 @@ enum power_event {
    #define LPI_CTRL_STATUS_TLPIEN 0x00000001 /* Transmit LPI Entry */

    /* GMAC HW ADDR regs */
    -#define GMAC_ADDR_HIGH(reg) (((reg > 15) ? 0x00000800 : 0x00000040) + \
    - (reg * 8))
    -#define GMAC_ADDR_LOW(reg) (((reg > 15) ? 0x00000804 : 0x00000044) + \
    - (reg * 8))
    +#define GMAC_ADDR_HIGH(reg) ((reg > 15) ? 0x00000800 + (reg - 16) * 8 : \
    + 0x00000040 + (reg * 8))
    +#define GMAC_ADDR_LOW(reg) ((reg > 15) ? 0x00000804 + (reg - 16) * 8 : \
    + 0x00000044 + (reg * 8))
    #define GMAC_MAX_PERFECT_ADDRESSES 1

    #define GMAC_PCS_BASE 0x000000c0 /* PCS register base */
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-06-21 18:28    [W:4.077 / U:0.476 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site