Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Colin Foster <colin.foster@in-advantage.com>
To:     linux-kernel@vger.kernel.org, netdev@vger.kernel.org
Cc:     Paolo Abeni <pabeni@redhat.com>, Jakub Kicinski <kuba@kernel.org>,
        Eric Dumazet <edumazet@google.com>,
        "David S. Miller" <davem@davemloft.net>,
        UNGLinuxDriver@microchip.com,
        Alexandre Belloni <alexandre.belloni@bootlin.com>,
        Claudiu Manoil <claudiu.manoil@nxp.com>,
        Vladimir Oltean <vladimir.oltean@nxp.com>
Subject: [PATCH net v1] net: mscc: ocelot: fix stat counter register values
Date:   Tue,  9 May 2023 21:48:51 -0700
Message-Id: <20230510044851.2015263-1-colin.foster@in-advantage.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?dGrdiQQC6aex8FjZBdATTpbmjVokPzDVIBpYN9R4yJhnmSzs3DwuTxnGoaE5?=
 =?us-ascii?Q?Y0Siv8XnqJmD1cc3NjQZ7LdwowTgIKrqB+N5isJ8/8fcsQo0kM1nX2oic141?=
 =?us-ascii?Q?jyFF6IQ36SBYGCVbkjp0R8lyIk/6bex1k7Ux9WrWnxfubAXJPvDyxZikjrpg?=
 =?us-ascii?Q?iEeE86XKDZ1tWEOxGL1wVofnjOV0lIzc2h32Mzc1CX3S1BcHgePwFrIs3MJA?=
 =?us-ascii?Q?yIU4u62cCgBtPWY3M95jwWJu6i85ydD79sfqqIdz+bwuuyrUIUZNvgiZtvBi?=
 =?us-ascii?Q?1hKF4Nw+F94KhwmehO1baCBVdaVcR6aJJcXIvsRlnePJvLe34YTuHamASP0Z?=
 =?us-ascii?Q?8LmZzX35iTlptf3FqxsVA8khhRgjjX588W04H0AUHgLJC8/oOVTf7h25i2eS?=
 =?us-ascii?Q?bwI75v3eDcnn+PB4/qdHYGzIzwY47nUc1IFghRAQOOMF/Ci4FPrK8tYpWR57?=
 =?us-ascii?Q?+3f2BafLxH7Yr3AaamfTCvbD4tP2SdpyCkSIkFP0dv+KkfECpMD9h8jo9QVi?=
 =?us-ascii?Q?rmbXLhHC5AH2+BkUYdI6OFjN2OOpnGj6CqNI4oBWUqPs1yb/jhduwoi7+MZc?=
 =?us-ascii?Q?DpN1BbP0/+DJg757DUv9VirlGw4rkjcmd7lCOHyJodHsQqufJbC5OKxGr+Wu?=
 =?us-ascii?Q?6mjPVaNELQQnyy7CCQTwqt70c9FfLpJGexgtpAJAegYGRgG+/6AsD7qPl0Zv?=
 =?us-ascii?Q?af64buCq2RNbkWZab6S/RKEnMpkhZaoXMLQPvaf7grYHQMpooxdYOUQqMbpt?=
 =?us-ascii?Q?Tyh2oRRKr0IufV/eJuHvqyGh2pQPDx2eFnovb6mQYlZOJc1zRIIPRCCWKdnw?=
 =?us-ascii?Q?LHL6vm1c4xg61dr8ltsCYqMgpfcashDFNwOPBpULyQDtVAkAwXQHnzXoEzO5?=
 =?us-ascii?Q?a67TUn1MhICF0WfNzNRZpWupsR4y3G762osiq4s4YmJCseoVnDYqyO6ODTx3?=
 =?us-ascii?Q?tsZAb7VK48gZjVS7iBWaN4CvCW0Gm623oRnTW4t14QGpInnB8Hb990QxFz06?=
 =?us-ascii?Q?VfqiQNcNhGev7MbUGeH4I67aI5hzp5aZz0uqiUElHf9K6dM1MRsALrcVEovr?=
 =?us-ascii?Q?x/zKJfpugd0FB77ZI5z6zHdGQN0OLTx46ef5dloaHkvLVym5OjBc9Q5G9mRL?=
 =?us-ascii?Q?h6MoUjdhipiimWSG4F8+/JjCk+o/OpVp527A37VW0LzkYi7RFY+ksSNxVHaU?=
 =?us-ascii?Q?KBQO9SJXeSd5PkXJC7GOkQmx4iY5EYVjIuXk4SLZ0Rp88zBNY1zVGVA2Lxwu?=
 =?us-ascii?Q?rb01bVwXdcGfylF8nwo9OOgL/SJrG1rmj2l7SWzFUk+06F9by3L+2wXERjaV?=
 =?us-ascii?Q?NPK8TWeGeFn4biQRh9fJ5zUKApEvyNbEZvS20UkS1nHGhgBlonXeH6lzWiJY?=
 =?us-ascii?Q?Xo/dUGkhfQpb5FdEm8/vCSM6qNKkjPexKrog+DFm8/msmsUPra/P+3oNZC4e?=
 =?us-ascii?Q?bWKR+qcKkAODQA1rwqSsKm/FusbQBldTBZHQ4T6TAg6bk8nK3Y92NDZuqh0y?=
 =?us-ascii?Q?sFC9PHPrpcKFNpDhJz34c5ud5qAB8ObsbyYNgU+vxAiY4DSg+z5TGEq/mwPP?=
 =?us-ascii?Q?ko4audMP2k2mbkc30RnQbJ2hgSMfyF9pzrEozzk8jejM5L6+sowZHfG35civ?=
 =?us-ascii?Q?Kw=3D=3D?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 6187f1a0-2d12-4e1d-9b2b-08db5111e05e
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2023 04:49:02.6239
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 48e842ca-fbd8-4633-a79d-0c955a7d3aae
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: sYyOxlCAhxmEOol46y2qUlgE2upElNfCEfrwPOqZG/fMrs3XD+bxpbdpMWc/yLue9X++w5SNl7omUPtLPHIX7U8HDn5meqyg5zVsdOheA0A=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN0PR10MB5142
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,
        T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Commit d4c367650704 ("net: mscc: ocelot: keep ocelot_stat_layout by reg
address, not offset") organized the stats counters for Ocelot chips, namely
the VSC7512 and VSC7514. A few of the counter offsets were incorrect, and
were caught by this warning:

WARNING: CPU: 0 PID: 24 at drivers/net/ethernet/mscc/ocelot_stats.c:909
ocelot_stats_init+0x1fc/0x2d8
reg 0x5000078 had address 0x220 but reg 0x5000079 has address 0x214,
bulking broken!

Fix these register offsets.

Fixes: d4c367650704 ("net: mscc: ocelot: keep ocelot_stat_layout by reg address, not offset")
Signed-off-by: Colin Foster <colin.foster@in-advantage.com>
---
 drivers/net/ethernet/mscc/vsc7514_regs.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/net/ethernet/mscc/vsc7514_regs.c b/drivers/net/ethernet/mscc/vsc7514_regs.c
index ef6fd3f6be30..5595bfe84bbb 100644
--- a/drivers/net/ethernet/mscc/vsc7514_regs.c
+++ b/drivers/net/ethernet/mscc/vsc7514_regs.c
@@ -307,15 +307,15 @@ static const u32 vsc7514_sys_regmap[] = {
 	REG(SYS_COUNT_DROP_YELLOW_PRIO_4,		0x000218),
 	REG(SYS_COUNT_DROP_YELLOW_PRIO_5,		0x00021c),
 	REG(SYS_COUNT_DROP_YELLOW_PRIO_6,		0x000220),
-	REG(SYS_COUNT_DROP_YELLOW_PRIO_7,		0x000214),
-	REG(SYS_COUNT_DROP_GREEN_PRIO_0,		0x000218),
-	REG(SYS_COUNT_DROP_GREEN_PRIO_1,		0x00021c),
-	REG(SYS_COUNT_DROP_GREEN_PRIO_2,		0x000220),
-	REG(SYS_COUNT_DROP_GREEN_PRIO_3,		0x000224),
-	REG(SYS_COUNT_DROP_GREEN_PRIO_4,		0x000228),
-	REG(SYS_COUNT_DROP_GREEN_PRIO_5,		0x00022c),
-	REG(SYS_COUNT_DROP_GREEN_PRIO_6,		0x000230),
-	REG(SYS_COUNT_DROP_GREEN_PRIO_7,		0x000234),
+	REG(SYS_COUNT_DROP_YELLOW_PRIO_7,		0x000224),
+	REG(SYS_COUNT_DROP_GREEN_PRIO_0,		0x000228),
+	REG(SYS_COUNT_DROP_GREEN_PRIO_1,		0x00022c),
+	REG(SYS_COUNT_DROP_GREEN_PRIO_2,		0x000230),
+	REG(SYS_COUNT_DROP_GREEN_PRIO_3,		0x000234),
+	REG(SYS_COUNT_DROP_GREEN_PRIO_4,		0x000238),
+	REG(SYS_COUNT_DROP_GREEN_PRIO_5,		0x00023c),
+	REG(SYS_COUNT_DROP_GREEN_PRIO_6,		0x000240),
+	REG(SYS_COUNT_DROP_GREEN_PRIO_7,		0x000244),
 	REG(SYS_RESET_CFG,				0x000508),
 	REG(SYS_CMID,					0x00050c),
 	REG(SYS_VLAN_ETYPE_CFG,				0x000510),
-- 
2.25.1