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:     Jakub Kicinski <kuba@kernel.org>,
        "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 v7 net-next 1/4] net: mscc: ocelot: remove unnecessary stat reading from ethtool
Date:   Sun, 13 Feb 2022 11:12:51 -0800
Message-Id: <20220213191254.1480765-2-colin.foster@in-advantage.com>
In-Reply-To: <20220213191254.1480765-1-colin.foster@in-advantage.com>
References: <20220213191254.1480765-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?9zF280pDCvGPdRfLeHKnww2kKRpSlM83GcaOYritICodLSe0Pv91W+hrjGKE?=
 =?us-ascii?Q?93sT/WWh6/TsBOUYbcU+vSLC1CqgBOdnYns4vD5qpfZD1YSJF7IdiStfbh0X?=
 =?us-ascii?Q?w/MXV8dyYJXIqG1T+VwHjpwrhCw2y6EQQ803rvZuAGvWGgVwZatBhPunleQJ?=
 =?us-ascii?Q?pPBFX6rxjGYcbmaKUjIQTWbrWKv2jK1h3TYWivFFKNouSbC1cmKQJpqgp4gF?=
 =?us-ascii?Q?3ERUMsI6zydtD3nZE1+I22U52XdQRNHQEwAA/G1bvpWwAVAadSK6tIfHYDY3?=
 =?us-ascii?Q?TsaeiIwprf5qdEVoJ+1pVWeaAH1Av0l/PMVM0gprGdjHmvKxcWPy12RyMiEd?=
 =?us-ascii?Q?4aMoLlGFtBQpJaBpWKkRbByMtUTFNednWXf6Sj6VQ/hKsm0a3pc44UPW96Fc?=
 =?us-ascii?Q?/vvTCuA/dUVcfVeSinq5HBR8THpFwZEnK/SRsjE408C4mBOrOsobHL2y+9Gm?=
 =?us-ascii?Q?oIgBDwjqEl1NfhXDi/X1Jj4r6FFmBi23AtIXj5oXnCvrKgvDoK8aG/Q4PMof?=
 =?us-ascii?Q?I2zZOnfqQXXXwtVXkJtDOUBGEssNazhE9t+VvEkJbP4jdc63Jw0eCEkGkFiw?=
 =?us-ascii?Q?MOp49rTf8HzveSsz0P+9frqmSacWTWtcn2NucM7GpoN6WzeLrLn9LNdwNc/J?=
 =?us-ascii?Q?cMGwfMVtO10SMFnwxo91GLSWUd4hpwComPU058mKZESRT5scL2Y2JfmsWFLx?=
 =?us-ascii?Q?SEOpYlL/hOHQgqThDDCN6bOv9U2UPHSGubdN5gopBF01s+A4uhor3PDA4XHY?=
 =?us-ascii?Q?JqkWjEHRWVwQ5oWQdXZW1Ip5QQirmlArVd0Zhr2w+8iatKqytO/F3HLgwoZU?=
 =?us-ascii?Q?Dm24ey8HFXcfZvEcnQ4hqci+FBviSieeBvbDUPUfBzxqD4viKjUs0COJebCD?=
 =?us-ascii?Q?urHcy7nFBI5g7Uf0e+B+lMtMIzKoNmV9j7QoLystj9HEbWxUCNZLhTfjpuQY?=
 =?us-ascii?Q?dpd9rriYI2m+qXUhfsgSE2QLTjcQS/HglyteUNytdXVCm8LXakXtkXXRnX/V?=
 =?us-ascii?Q?yGmEc99/dVBWn78iRhaQvAUA3oBK5OsAIyQWrf4T9oxD2XYx1GZ8lIJ2+Va7?=
 =?us-ascii?Q?G9+NIjxSS2gE+La5uWS+sYLnL2oj59AzpJBEVVXEvQv5igMq/LPsV5r7isxY?=
 =?us-ascii?Q?S+VP+jVCpxtFw9VaSaS10pw+bLiBB+SH3NLbiqC/hH8KKuaZeosipV3uoHsf?=
 =?us-ascii?Q?xilUva8Rg6IrXGxb1/vRIjexnZIcHd7iugmj1ddohHMWpkdygdmaWIApyoIN?=
 =?us-ascii?Q?aMX24X9cHHC03JRhfoZ5AgpoIHYO2jotkeBSPTnoAobCHYdY94YVDA3FGnmh?=
 =?us-ascii?Q?3bcgi+F2DtR7LjRnpa4oo0b2ejlHaQ/UkfuVx/O1NGK66k1EawsyPmHQ4Wen?=
 =?us-ascii?Q?/IawxZvpUPtCZEa4At/atFkhjalSXw+QEUHwfAqniVSbqBjfTJAd/bX6l/Ju?=
 =?us-ascii?Q?yrV8F0EkbMXflzsxn3NGoLBeMh3FQhtNJiRmbTUZXIESTWGuxX2NNeTLbsc8?=
 =?us-ascii?Q?7h9GGbgs61gZYj13HP8GXPHhyJ50gswrkrujE6toBPoJcWG/gdLZhH8VU7Tu?=
 =?us-ascii?Q?G8sNYt3jDBpsv7UUobNXszX5SXJ5Kv/T9NrQGZ3IAYk7cwicCG6Peb9BwUYz?=
 =?us-ascii?Q?M34JdXXOsSUuXqGW0euj4qx6T7wHsvu0G29YJp/BABrIuMc3Mdk+eMqfrEEG?=
 =?us-ascii?Q?atAB3w=3D=3D?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: bb5127ca-4ebf-48e4-af5b-08d9ef24dc58
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Feb 2022 19:13:04.6171
 (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: dpCfT+PvZYsq4jjAugcveqwVSO+smg6arxBuBcNI7eOQN9z4ttHIXM9ZrpM4MJcGcUiOmimLzgNo96VbWXnu4QZ+6jH0FhxLgVKmYqibkZM=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8PR10MB3315
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

The ocelot_update_stats function only needs to read from one port, yet it
was updating the stats for all ports. Update to only read the stats that
are necessary.

Signed-off-by: Colin Foster <colin.foster@in-advantage.com>
Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
 drivers/net/ethernet/mscc/ocelot.c | 33 +++++++++++++++---------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c
index e6de86552df0..885288eb389c 100644
--- a/drivers/net/ethernet/mscc/ocelot.c
+++ b/drivers/net/ethernet/mscc/ocelot.c
@@ -1746,27 +1746,24 @@ void ocelot_get_strings(struct ocelot *ocelot, int port, u32 sset, u8 *data)
 EXPORT_SYMBOL(ocelot_get_strings);
 
 /* Caller must hold &ocelot->stats_lock */
-static void ocelot_update_stats(struct ocelot *ocelot)
+static void ocelot_port_update_stats(struct ocelot *ocelot, int port)
 {
-	int i, j;
+	int j;
 
-	for (i = 0; i < ocelot->num_phys_ports; i++) {
-		/* Configure the port to read the stats from */
-		ocelot_write(ocelot, SYS_STAT_CFG_STAT_VIEW(i), SYS_STAT_CFG);
+	/* Configure the port to read the stats from */
+	ocelot_write(ocelot, SYS_STAT_CFG_STAT_VIEW(port), SYS_STAT_CFG);
 
-		for (j = 0; j < ocelot->num_stats; j++) {
-			u32 val;
-			unsigned int idx = i * ocelot->num_stats + j;
+	for (j = 0; j < ocelot->num_stats; j++) {
+		u32 val;
+		unsigned int idx = port * ocelot->num_stats + j;
 
-			val = ocelot_read_rix(ocelot, SYS_COUNT_RX_OCTETS,
-					      ocelot->stats_layout[j].offset);
+		val = ocelot_read_rix(ocelot, SYS_COUNT_RX_OCTETS,
+				      ocelot->stats_layout[j].offset);
 
-			if (val < (ocelot->stats[idx] & U32_MAX))
-				ocelot->stats[idx] += (u64)1 << 32;
+		if (val < (ocelot->stats[idx] & U32_MAX))
+			ocelot->stats[idx] += (u64)1 << 32;
 
-			ocelot->stats[idx] = (ocelot->stats[idx] &
-					      ~(u64)U32_MAX) + val;
-		}
+		ocelot->stats[idx] = (ocelot->stats[idx] & ~(u64)U32_MAX) + val;
 	}
 }
 
@@ -1775,9 +1772,11 @@ static void ocelot_check_stats_work(struct work_struct *work)
 	struct delayed_work *del_work = to_delayed_work(work);
 	struct ocelot *ocelot = container_of(del_work, struct ocelot,
 					     stats_work);
+	int i;
 
 	mutex_lock(&ocelot->stats_lock);
-	ocelot_update_stats(ocelot);
+	for (i = 0; i < ocelot->num_phys_ports; i++)
+		ocelot_port_update_stats(ocelot, i);
 	mutex_unlock(&ocelot->stats_lock);
 
 	queue_delayed_work(ocelot->stats_queue, &ocelot->stats_work,
@@ -1791,7 +1790,7 @@ void ocelot_get_ethtool_stats(struct ocelot *ocelot, int port, u64 *data)
 	mutex_lock(&ocelot->stats_lock);
 
 	/* check and update now */
-	ocelot_update_stats(ocelot);
+	ocelot_port_update_stats(ocelot, port);
 
 	/* Copy all counters */
 	for (i = 0; i < ocelot->num_stats; i++)
-- 
2.25.1