Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Fri, 11 Jun 2021 15:16:11 +0800
From:   Jisheng Zhang <Jisheng.Zhang@synaptics.com>
To:     Giuseppe Cavallaro <peppe.cavallaro@st.com>,
        Alexandre Torgue <alexandre.torgue@foss.st.com>,
        Jose Abreu <joabreu@synopsys.com>,
        "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>
Cc:     netdev@vger.kernel.org,
        Maxime Coquelin <mcoquelin.stm32@gmail.com>,
        linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2] net: stmmac: dwmac1000: Fix extended MAC address
 registers definition
Message-ID: <20210611151611.7b6504ab@xhacker.debian>
In-Reply-To: <20210611144533.303a38a0@xhacker.debian>
References: <20210611144533.303a38a0@xhacker.debian>
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from xhacker.debian (192.147.44.204) by BY5PR17CA0059.namprd17.prod.outlook.com (2603:10b6:a03:167::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.20 via Frontend Transport; Fri, 11 Jun 2021 07:16:18 +0000
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: eb1e1f7f-d750-4342-f167-08d92ca8d08b
X-MS-TrafficTypeDiagnostic: BN6PR03MB3073:
X-Microsoft-Antispam-PRVS: <BN6PR03MB3073B1C494812F4DE5701CEAED349@BN6PR03MB3073.namprd03.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:173;
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: W6SW1+2B2NyaTFm3a2WdRZyi6s1iN6fZLvuYOghnjnt/G/EZEopjsUf5BQxRFj1CQ2OX3SVDw9VqY4kb4Okbq/xY3b2YnsU7wsWiftf1xr7EggTN2H7GWJXWOWnK4bOeohbaKfoPLZfTdZsLsMmM9miwJkvaUAk+keg9j+HCFvl11bJbFVCbfPmcIeuji8UVyDPBFbqolnhBWPH+4utqc/9fMqWshKqmNcgVovyA16IxvoNGOSj6t9wbExQpcEQIBAXjgXj9dZ7CtP6rjZpQQw4x1GqULZ7gelpP0vUucCry+pjdu/USw/DNnQz9TmvkVOT6jEpYFqGuAwfRHQRbV8wz8TGmh5V3CgHsALx+6ENE0cbzhA65SB8pFMapaoXOStPLlMMfIuWBSg5QLaHfcVsvy4fcIU3o+I/JZQAiD+gqIP5G/fUrW3lCdXXdfWTAAU8u9h4SfRHu48U+qHYFjkDtAlIUTPwDkAHqbMBkFg7M8gmmM0jHeJNuIyMf9KN6vSxLpSj0SMRgFt1M3yGBJ7PdX/vcYfSe93UyWjJRUvV21xCh6FVse1l2TZV4MbihAS2clNEYHMOzQPa7KiWq+HP+IX99NqMJY8H+1EMwS/ZkxUx1suk4J75+WaSvm8f6EJ+hrwEvwp9cc1R0TyzyF4MfnXf4pxesyV5NOzAq3Iw=
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BN9PR03MB6058.namprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(376002)(366004)(136003)(39850400004)(396003)(346002)(4326008)(55016002)(86362001)(5660300002)(1076003)(6506007)(66556008)(316002)(38100700002)(6666004)(38350700002)(2906002)(478600001)(8936002)(16526019)(52116002)(66946007)(956004)(186003)(9686003)(8676002)(7696005)(110136005)(26005)(83380400001)(66476007);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?lmdeaAq6zB7BlbPf0Ee7sAu/+FyyukQuTceDqKoCOYCMORSWCqzc4eN61rnS?=
 =?us-ascii?Q?OuRXAxq0Sh06dVO0UiGoFHfaQvWcHaC9gv6wXHB7dgXsP2NdQt2Xnb1J9CDc?=
 =?us-ascii?Q?SznSFFt2hZ549r8F67iNjXETbvmrZ4dIts798y40ie/36/YtR1fKfqeAbBNP?=
 =?us-ascii?Q?yCKOdLsVrzRqAFwV5wPHB8I9YVk+sGkSUdK0Et/7HvXit5MXiz9Z8VfvIvpF?=
 =?us-ascii?Q?0gLvyHy68xcAwzZJRCvqgt7//86CvDRh0GnejzwdPkIkq8pEP7H7G7gPSu4u?=
 =?us-ascii?Q?DY6PvGxaTqq53HaeOFcqHYyceSkNpiXhRM/RQFJKWY4bxBebf9QEu8T8gDYj?=
 =?us-ascii?Q?Z/pczyRC3o/okoQ+xf64+98RQ+uxRFiZ9IVXs3DyHxnPQU+DJCKXkUt648gP?=
 =?us-ascii?Q?EvKcwSKITxPmifkdGdNFWUaX2ezX4k/CxNRW/8xdUBF7sWeuusgBFI45s/B+?=
 =?us-ascii?Q?fXri7XYqUbR3x+CNla5zq8EmezwCigs2y1rzKzWCap5VTuW1XsH22cvzfEEW?=
 =?us-ascii?Q?d/itymJEWW3WvNssSWDS/q7ePhYqpnRE1pIonkLpLqhvd8K9lo5thdewIo6r?=
 =?us-ascii?Q?FUbcxT9ayZEwsEaN3lN1Alta8cr8hNjhwhNGiiVBD6yvcePWt2gnIHxRArJ7?=
 =?us-ascii?Q?nHUBAPNTkUWpZxuLYmiJLaNiyUxEZcRbq0CCKcFzRTcEqMf6Nlh1GUnkzNXk?=
 =?us-ascii?Q?sva53gw3yD9jXbdjy3yjSCXjdBZd2U/vcWUTrG6O4E+igIsy4bP8GjHPbqRJ?=
 =?us-ascii?Q?5vduCDsEYiyL7s6AA37zo/+tMOVy+7dybmHRE6FNLVRS2NHyG73e4+qO3nh0?=
 =?us-ascii?Q?36e1fCJ2TyJsvTqTUnI7XN0WIESYLFLGikJ0yrcTR4mm7GoxaaDDLbJpkhcB?=
 =?us-ascii?Q?ItpPpfEkiZW/TH00UMeJDKQIN5UCZnjHWzwOkzWjLdnwGNDpR65Hridw0oJq?=
 =?us-ascii?Q?K/LJuyrU2C2bSpXq7rjhFsW+OzR5yJ8AjjR18XZjPpPYrdKvOFP2YP7UDWg6?=
 =?us-ascii?Q?CGJ+oXM/xNTqjLAJeZ9d7HiadtsVyt6CHiq0GSBsTJrh8PophmHd/ID1oNCN?=
 =?us-ascii?Q?ADTKB37DPp4tXy69TnTexRyhY1xynbXrEHg0Fwn7PMxeIKsbiAyqIzAKkLeq?=
 =?us-ascii?Q?EDfuMRFAvjyPzcLsquOjy6NjBkzDmKRJ/pr7NQRQkJutiWxNfbkE1M2gTdrq?=
 =?us-ascii?Q?yh63oxGemq2iPA96CIgmL6DHMfSaaCv77AC+BB3Lltu+Zw3we4xu28ye/oUs?=
 =?us-ascii?Q?7vNyM8AcVNAvQEX7tuUqMxVSYVVQRX+SBZUs7GcODURDtOIdwXBRuDDVmIIV?=
 =?us-ascii?Q?h7UeHeic3TI5+MkQtxul4RCj?=
X-OriginatorOrg: synaptics.com
X-MS-Exchange-CrossTenant-Network-Message-Id: eb1e1f7f-d750-4342-f167-08d92ca8d08b
X-MS-Exchange-CrossTenant-AuthSource: BN9PR03MB6058.namprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 07:16:21.5253
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 335d1fbc-2124-4173-9863-17e7051a2a0e
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: hx88mjXxZZjUhyR9Aqt2RbRa9M1RTFayackdo/YQxbsbByYl0Q/YIdCdJqRO49679ZblWSsOuVTaM0lMLhFL5w==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR03MB3073
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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>
---

Since v1:
 - update commit msg, I.E the 16th MAC address register

 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.31.0