From 45045e3fdf80aeda04f48d65de9feecab09a7501 Mon Sep 17 00:00:00 2001

From: Jisheng Zhang <Jisheng.Zhang@synaptics.com>

Date: Fri, 11 Jun 2021 15:16:11 +0800

Subject: [PATCH 07/16] net: stmmac: dwmac1000: Fix extended MAC address

 registers definition

Git-commit: 1adb20f0d496b2c61e9aa1f4761b8d71f93d258e

Patch-mainline: v5.13-rc7

References: git-fixes

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: Denis Kirjanov <denis.kirjanov@suse.com>

---

 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 c02d36629c52..6f7ed3aaff1b 100644

--- a/drivers/net/ethernet/stmicro/stmmac/dwmac1000.h

+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac1000.h

@@ -87,10 +87,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.16.4