From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 58014CD37AC for ; Thu, 7 May 2026 21:22:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=bVRydrvhfg0JvyXbzx84X3rATB6jj5qKplCufg9cqrY=; b=BxV6hswwf86aJlkxqpRHQEL9o4 ZQjUdN+jVghzUkg4kHEdQaOEHLLWGMEPYR6ZsIIjqCekA7ecchFOhQhy2t7nPh0l/czfZEWMLBmtt WcN/C03jdo4T82AVraMI939CLDBeyewx8EyyMulDsKqLYWy+3TzwVoH4tswRWTiFkVOyvbsMmjUyS mrIMvHND/u6cYODt7vnPvxHtgl9a14/jbHe+A+mXKKS3G/uwNfN0V/dUYuOxWcQWXPpNAzxXhXyVz uyETsheAvEgCFLxA8d9SG0vY4Cz08KXndMjVpon+P+6nrRGv5tYkFq/z5SEH31K6JduxaHV0IfSUm LRnZp9EQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wL6B9-00000004uPu-3fbH; Thu, 07 May 2026 21:22:43 +0000 Received: from sea.source.kernel.org ([2600:3c0a:e001:78e:0:1991:8:25]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wL6B7-00000004uLy-1Chx; Thu, 07 May 2026 21:22:42 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id DE275407FD; Thu, 7 May 2026 21:22:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5C543C2BCF7; Thu, 7 May 2026 21:22:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778188960; bh=ntCn7RD6JC3nMILzWuzPOi+iBfoNuf2XQgtLlxP48S4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=InqEModlSofPyVkBR7VlqsNU4FwzykZnXrLWMWJm7kMzaQxLeWo/oaewXxLEOvSEO H5U69KZaHjNsrC1Uzfx5nJZxITJXYXXDdf0zUNd0xIwmY51GqrdiRdWeJLTEOBVffI 3nr78G1xX6XvjcROcDjrFDi0RHkDeRhM7ekg7kWjeOroud60IoxFF8HTJymOUTCFQu 645/nrsOBXtt5hgf+y9a8ZGB6ORp0QyX5JEHFJQ6aL43V2rfLpBDzvAODxAPylwicp 1kole/Z8ANK4JjuYfI1NGgFvPrX20FrnX8zgVEnL+KqLhGCtZh/Emfo/Fynulpgw5f S4HFi6oggod7A== From: Lorenzo Bianconi Date: Thu, 07 May 2026 23:21:49 +0200 Subject: [PATCH net-next v4 06/10] net: airoha: Move {cpu,fwd}_tx_packets in airoha_qdma struct MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260507-airoha-eth-multi-serdes-v4-6-af613b61ae02@kernel.org> References: <20260507-airoha-eth-multi-serdes-v4-0-af613b61ae02@kernel.org> In-Reply-To: <20260507-airoha-eth-multi-serdes-v4-0-af613b61ae02@kernel.org> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Lorenzo Bianconi Cc: Christian Marangi , Benjamin Larsson , linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, netdev@vger.kernel.org, devicetree@vger.kernel.org X-Mailer: b4 0.14.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260507_142241_652664_C43B83BD X-CRM114-Status: GOOD ( 13.29 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Since now multiple net_devices connected to different QDMA blocks can share the same GDM port, cpu_tx_packets and fwd_tx_packets fields can be overwritten with the value from a different QDMA block. In order to fix the issue move cpu_tx_packets and fwd_tx_packets fields from airoha_gdm_port struct to airoha_qdma one. Signed-off-by: Lorenzo Bianconi --- drivers/net/ethernet/airoha/airoha_eth.c | 15 +++++++-------- drivers/net/ethernet/airoha/airoha_eth.h | 8 ++++---- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/drivers/net/ethernet/airoha/airoha_eth.c b/drivers/net/ethernet/airoha/airoha_eth.c index 69a4c2e0d58b..786bc677af3c 100644 --- a/drivers/net/ethernet/airoha/airoha_eth.c +++ b/drivers/net/ethernet/airoha/airoha_eth.c @@ -2306,19 +2306,18 @@ static int airoha_qdma_get_tx_ets_stats(struct net_device *netdev, int channel, struct tc_ets_qopt_offload *opt) { struct airoha_gdm_dev *dev = netdev_priv(netdev); - struct airoha_gdm_port *port = dev->port; + struct airoha_qdma *qdma = dev->qdma; - u64 cpu_tx_packets = airoha_qdma_rr(dev->qdma, - REG_CNTR_VAL(channel << 1)); - u64 fwd_tx_packets = airoha_qdma_rr(dev->qdma, + u64 cpu_tx_packets = airoha_qdma_rr(qdma, REG_CNTR_VAL(channel << 1)); + u64 fwd_tx_packets = airoha_qdma_rr(qdma, REG_CNTR_VAL((channel << 1) + 1)); - u64 tx_packets = (cpu_tx_packets - port->cpu_tx_packets) + - (fwd_tx_packets - port->fwd_tx_packets); + u64 tx_packets = (cpu_tx_packets - qdma->cpu_tx_packets) + + (fwd_tx_packets - qdma->fwd_tx_packets); _bstats_update(opt->stats.bstats, 0, tx_packets); - port->cpu_tx_packets = cpu_tx_packets; - port->fwd_tx_packets = fwd_tx_packets; + qdma->cpu_tx_packets = cpu_tx_packets; + qdma->fwd_tx_packets = fwd_tx_packets; return 0; } diff --git a/drivers/net/ethernet/airoha/airoha_eth.h b/drivers/net/ethernet/airoha/airoha_eth.h index 34f1fef51640..3e93919a175c 100644 --- a/drivers/net/ethernet/airoha/airoha_eth.h +++ b/drivers/net/ethernet/airoha/airoha_eth.h @@ -533,6 +533,10 @@ struct airoha_qdma { struct airoha_queue q_rx[AIROHA_NUM_RX_RING]; DECLARE_BITMAP(qos_sq_bmap, AIROHA_NUM_QOS_CHANNELS); + + /* qos stats counters */ + u64 cpu_tx_packets; + u64 fwd_tx_packets; }; struct airoha_gdm_dev { @@ -549,10 +553,6 @@ struct airoha_gdm_port { struct airoha_hw_stats stats; - /* qos stats counters */ - u64 cpu_tx_packets; - u64 fwd_tx_packets; - struct metadata_dst *dsa_meta[AIROHA_MAX_DSA_PORTS]; }; -- 2.54.0