diff options
author | Jisheng Zhang <Jisheng.Zhang@synaptics.com> | 2021-06-11 15:16:11 +0800 |
---|---|---|
committer | Sasha Levin <sashal@kernel.org> | 2021-06-30 08:49:14 -0400 |
commit | cc10a229be764d8af63987a6bffcd39cbbbc4b2b (patch) | |
tree | b4e0c657269d261944a7dd23095613e1d850c1c5 /drivers | |
parent | 3666061ceaf3ad84b02e6d60badbdd1f730c8213 (diff) | |
download | linux-stable-cc10a229be764d8af63987a6bffcd39cbbbc4b2b.tar.gz linux-stable-cc10a229be764d8af63987a6bffcd39cbbbc4b2b.tar.bz2 linux-stable-cc10a229be764d8af63987a6bffcd39cbbbc4b2b.zip |
net: stmmac: dwmac1000: Fix extended MAC address registers definition
[ 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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/dwmac1000.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac1000.h b/drivers/net/ethernet/stmicro/stmmac/dwmac1000.h index ff3e5ab39bd0..24fb7a2bba62 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac1000.h +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac1000.h @@ -91,10 +91,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 */ |