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:   Vladimir Oltean <vladimir.oltean@nxp.com>
To:     netdev@vger.kernel.org
Cc:     linux-kernel@vger.kernel.org,
        "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Michal Kubecek <mkubecek@suse.cz>,
        Claudiu Manoil <claudiu.manoil@nxp.com>,
        Vinicius Costa Gomes <vinicius.gomes@intel.com>,
        Xiaoliang Yang <xiaoliang.yang_1@nxp.com>,
        Kurt Kanzenbach <kurt@linutronix.de>,
        Rui Sousa <rui.sousa@nxp.com>,
        Ferenc Fejes <ferenc.fejes@ericsson.com>,
        Pranavi Somisetty <pranavi.somisetty@amd.com>,
        Harini Katakam <harini.katakam@amd.com>,
        Colin Foster <colin.foster@in-advantage.com>,
        UNGLinuxDriver@microchip.com,
        Alexandre Belloni <alexandre.belloni@bootlin.com>,
        Andrew Lunn <andrew@lunn.ch>,
        Florian Fainelli <f.fainelli@gmail.com>
Subject: [PATCH v3 net-next 10/12] net: mscc: ocelot: hide access to ocelot_stats_layout behind a helper
Date:   Tue, 17 Jan 2023 10:59:45 +0200
Message-Id: <20230117085947.2176464-11-vladimir.oltean@nxp.com>
In-Reply-To: <20230117085947.2176464-1-vladimir.oltean@nxp.com>
References: <20230117085947.2176464-1-vladimir.oltean@nxp.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?Ius8xkCucIp2atb2jJFF70olsoDmOT1UYPXojhAOoPhM8i5hTe24yjUm1CKQ?=
 =?us-ascii?Q?Q+lHqM3zDIHI+Ep34cvKjZVg8eQdgJUcKPSyj4afqYRvwiZiqaFlmgb/XGV3?=
 =?us-ascii?Q?Jh4UWDxy7Kouij+Hz74C2O3vtOiLDJ+QxlAtRSzXuKXaDA7DLNA1XfQBk4Sx?=
 =?us-ascii?Q?3bQIJ5tE/mjZG/zvbulXnwbTmj29xLx0aPMJti7dVd00CUbiMLzEAfy1b1Co?=
 =?us-ascii?Q?Fo15bze97JajHmJOBO+UiW9T443VeymnX61xA6aD9Wsis2FCBG1KouSGsXrt?=
 =?us-ascii?Q?yPhuyCAFd2bggUkKw8tgsv3l5Vc5sQDe+5to9WgF9addV9Y0uPy5Ohhd9hsk?=
 =?us-ascii?Q?D91B1LDZITl0GerZ39txbQeQdYaRfLirFvXbUIDEGaQ7+pM68fbWQU5zDHZv?=
 =?us-ascii?Q?WDMfvYb5xtCLaNbh6ZYDF0Q4eAyExpB6tIjdIHvg4OUtec/rMsEBLIvg4gJb?=
 =?us-ascii?Q?UtTyGk4WTsW7cbg8pxrT2Z0tuYRBxw7aHMzHBDKVufc1iCBnQDhaQowOpYKl?=
 =?us-ascii?Q?DpXFYKDUyBuCCug+0KtOuz0raNuKkwOUnOj3E+ZUE/bLFVhucTPAdN0D3YXE?=
 =?us-ascii?Q?ZNipj9e8y0waBylyTxfES1ssUEhSO/i+cPE+S9is0IWckzIRn4S7nQOPPZgn?=
 =?us-ascii?Q?Sae4kRApj6o8juKN6vLIZNLP1057XVBEEng7tvINSzB25TXbTIAstq8Rcln/?=
 =?us-ascii?Q?hQJX15okLXf7Uz4BAb3RYryF5bxmtHrQBtJWjTo/qnhGNoSkh0p9miSzjfyO?=
 =?us-ascii?Q?SJIbIzvSXQv9lNOuUw4yIQdaTx/YFFpqBKNwLQtlD/SpHXyDDQE4nopyj5md?=
 =?us-ascii?Q?kj2ZTDbbmnrB+BS9uelX5jsZ/jes8bVQpzR831Ac27Udl+IK+1IvRA1ddDe+?=
 =?us-ascii?Q?UROy5TvZhJN2m3/IpuJ/EZEfBuhSLPL8mu43o8EQHLUUhsO60Ew+sjhp+ysf?=
 =?us-ascii?Q?uslMOhvC6jckIhzl3gwmgDW3JdpZlVH55uYIR4SMHcDEAqjw8HjnQ7RCpTar?=
 =?us-ascii?Q?oW5gRtv83PgnHq9t8YiazjGJVy4duxvESmWz3HmxJ/TFF7wKxm9wFvoYf9kA?=
 =?us-ascii?Q?2tst6uhd5SCHTRDmmERlcIK35qSv/+cnw11kiWIF5n2LegAL9wIUaQ1DbPWm?=
 =?us-ascii?Q?Y6OiGT8vd1LOkURXmRgm/W5+FHiZB6ftTkfYVmp9MQU6Jb/8aBD//2RVZuVW?=
 =?us-ascii?Q?Ns3h+289icPqHmdgJZY09mSdbQyxTr8mhOzRmTh2pitwWb0oM/xh8sl6k5Ku?=
 =?us-ascii?Q?mI1e5QEjTNpHOr+U5VP/TbKvzDkKvgiCxal3j0iT0ri72IQKFb8DfPeO9Q07?=
 =?us-ascii?Q?VetEJRnYkLsUdf1+FUljG7otA8tHDUYiZzXOHQ4QJ1tnpAyyTXLYbGX7Hu4p?=
 =?us-ascii?Q?Fu4O0GMN/k1Z0/jHWZq2LKlpYSGh4EGV1BerOWtXAGS69OGKmS8SDPVLsmnC?=
 =?us-ascii?Q?c24g0PnsM86iQwLa9HBQiOiQfU8SQz96QSGFdSvOrdwYkTk9m/ThKPznUz6u?=
 =?us-ascii?Q?hmE6yI4V2jkKtdDUviuGnO6eNyWA+3lIMlmUsoAfYkRU9MgYveOyBhDSEEoC?=
 =?us-ascii?Q?hkExx/GxqzhQW/nN6T6bS7As/NplVEwK25rM/bq9XbaxGHyyrAj+FqitCDBW?=
 =?us-ascii?Q?aQ=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 9d2fb7dc-e8f4-49da-4184-08daf8693fc4
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jan 2023 09:00:15.4083
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 0cK3L6z2PDa5TQ5G+3mo1NjTATgopBRkbXdZG7AaIRBVqkR9S4uujKJyP7V0gFIx2Vuc8q5eVGBdlfZzp+KBbQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7861
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS 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

Some hardware instances of the ocelot driver support the MAC Merge
layer, which gives access to an extra preemptible MAC. This has
implications upon the statistics. There will be a stats layout when MM
isn't supported, and a different one when it is.
The ocelot_stats_layout() helper will return the correct one.
In preparation of that, refactor the existing code to use this helper.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
v2->v3: none
v1->v2: patch is new (v1 was written for enetc)

 drivers/net/ethernet/mscc/ocelot_stats.c | 40 +++++++++++++++++-------
 1 file changed, 29 insertions(+), 11 deletions(-)

diff --git a/drivers/net/ethernet/mscc/ocelot_stats.c b/drivers/net/ethernet/mscc/ocelot_stats.c
index 01306172b7f7..551e3cbfae79 100644
--- a/drivers/net/ethernet/mscc/ocelot_stats.c
+++ b/drivers/net/ethernet/mscc/ocelot_stats.c
@@ -228,6 +228,12 @@ static const struct ocelot_stat_layout ocelot_stats_layout[OCELOT_NUM_STATS] = {
 	OCELOT_COMMON_STATS,
 };
 
+static const struct ocelot_stat_layout *
+ocelot_get_stats_layout(struct ocelot *ocelot)
+{
+	return ocelot_stats_layout;
+}
+
 /* Read the counters from hardware and keep them in region->buf.
  * Caller must hold &ocelot->stat_view_lock.
  */
@@ -306,16 +312,19 @@ static void ocelot_check_stats_work(struct work_struct *work)
 
 void ocelot_get_strings(struct ocelot *ocelot, int port, u32 sset, u8 *data)
 {
+	const struct ocelot_stat_layout *layout;
 	int i;
 
 	if (sset != ETH_SS_STATS)
 		return;
 
+	layout = ocelot_get_stats_layout(ocelot);
+
 	for (i = 0; i < OCELOT_NUM_STATS; i++) {
-		if (ocelot_stats_layout[i].name[0] == '\0')
+		if (layout[i].name[0] == '\0')
 			continue;
 
-		memcpy(data, ocelot_stats_layout[i].name, ETH_GSTRING_LEN);
+		memcpy(data, layout[i].name, ETH_GSTRING_LEN);
 		data += ETH_GSTRING_LEN;
 	}
 }
@@ -350,13 +359,16 @@ static void ocelot_port_stats_run(struct ocelot *ocelot, int port, void *priv,
 
 int ocelot_get_sset_count(struct ocelot *ocelot, int port, int sset)
 {
+	const struct ocelot_stat_layout *layout;
 	int i, num_stats = 0;
 
 	if (sset != ETH_SS_STATS)
 		return -EOPNOTSUPP;
 
+	layout = ocelot_get_stats_layout(ocelot);
+
 	for (i = 0; i < OCELOT_NUM_STATS; i++)
-		if (ocelot_stats_layout[i].name[0] != '\0')
+		if (layout[i].name[0] != '\0')
 			num_stats++;
 
 	return num_stats;
@@ -366,14 +378,17 @@ EXPORT_SYMBOL(ocelot_get_sset_count);
 static void ocelot_port_ethtool_stats_cb(struct ocelot *ocelot, int port,
 					 void *priv)
 {
+	const struct ocelot_stat_layout *layout;
 	u64 *data = priv;
 	int i;
 
+	layout = ocelot_get_stats_layout(ocelot);
+
 	/* Copy all supported counters */
 	for (i = 0; i < OCELOT_NUM_STATS; i++) {
 		int index = port * OCELOT_NUM_STATS + i;
 
-		if (ocelot_stats_layout[i].name[0] == '\0')
+		if (layout[i].name[0] == '\0')
 			continue;
 
 		*data++ = ocelot->stats[index];
@@ -602,16 +617,19 @@ EXPORT_SYMBOL(ocelot_port_get_stats64);
 static int ocelot_prepare_stats_regions(struct ocelot *ocelot)
 {
 	struct ocelot_stats_region *region = NULL;
+	const struct ocelot_stat_layout *layout;
 	unsigned int last = 0;
 	int i;
 
 	INIT_LIST_HEAD(&ocelot->stats_regions);
 
+	layout = ocelot_get_stats_layout(ocelot);
+
 	for (i = 0; i < OCELOT_NUM_STATS; i++) {
-		if (!ocelot_stats_layout[i].reg)
+		if (!layout[i].reg)
 			continue;
 
-		if (region && ocelot_stats_layout[i].reg == last + 4) {
+		if (region && layout[i].reg == last + 4) {
 			region->count++;
 		} else {
 			region = devm_kzalloc(ocelot->dev, sizeof(*region),
@@ -620,17 +638,17 @@ static int ocelot_prepare_stats_regions(struct ocelot *ocelot)
 				return -ENOMEM;
 
 			/* enum ocelot_stat must be kept sorted in the same
-			 * order as ocelot_stats_layout[i].reg in order to have
-			 * efficient bulking
+			 * order as layout[i].reg in order to have efficient
+			 * bulking
 			 */
-			WARN_ON(last >= ocelot_stats_layout[i].reg);
+			WARN_ON(last >= layout[i].reg);
 
-			region->base = ocelot_stats_layout[i].reg;
+			region->base = layout[i].reg;
 			region->count = 1;
 			list_add_tail(&region->node, &ocelot->stats_regions);
 		}
 
-		last = ocelot_stats_layout[i].reg;
+		last = layout[i].reg;
 	}
 
 	list_for_each_entry(region, &ocelot->stats_regions, node) {
-- 
2.34.1