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 B1FBECD5BA7 for ; Tue, 19 May 2026 08:58:38 +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=nXDy0hxB7RfFFjg6lXh2FvJdOQGdMQsMy0Ookq2zwW8=; b=CU3Ikyt1REc6Dw9fW5xAbcOHNd 7DC32sbSJs/+cQq8wBTy4h37aX879tyTcjJsQTAnShBHPW+ZA8MSZgDtlvd+AjSuXkUWAjM5lrT1z qoSeEYRhVvls9SgDCJdMB0BiUaZUpJowW7qrbtr4+Hst3kbKGXcJDRD2pDtJLeGLV2GB0Ct+2dJLQ KnOpO1j8an/I1fDMCOjw6c+aX04/gqShuouHIHXuJVv6KMt49FKpQcM8widXr9IX3V52Jagvk/O1E 4YoAW4rDhp0yKIeKr1Le5C9cdSrdpixZe/8e9xPyRFB/Q1PqJP6/jxT5LX3I4y8FZgqiBLP5ufFQp v84R7tsw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wPGHd-00000000mXA-39mG; Tue, 19 May 2026 08:58:37 +0000 Received: from tor.source.kernel.org ([172.105.4.254]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wPGHc-00000000mUG-16oH; Tue, 19 May 2026 08:58:36 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id B65C2600AE; Tue, 19 May 2026 08:58:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1A970C2BCC9; Tue, 19 May 2026 08:58:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1779181115; bh=nooHuZGJEFeYRqUP64xp6V05huxhawkLN6x3sj9U1W4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=DEyf7m+KC9XJWRmiKfJkmTNeyDkqDT+hF8BlMoBnjA1tvOk7/xANo9ZgcnIAnpINM biGzFLmHQPbEwqSTljGH7jHwcRF50Cgus/9WamCtwwJbtweeuWHftsxty3iBWHz0Pj AcO1bgq0CiSSvv3pxkxTvpE559N7pdxF8BP7M9QSMNdZc300K6Dc7mu+YQOETwRZMs fP3I4N+C1RHuBTugtliTUNjllxZd4q/9O6/drtEaZMVmpL4J0KCs9ZlblYeXuLbf9O TSHGGXGtcJZaFET9glyR/dL7AJmc38+/mcT0pynWmeGRgK1Fd7QH6ZnlAcL9zY03h5 tiHVp3YT4tGoQ== From: Lorenzo Bianconi Date: Tue, 19 May 2026 10:57:49 +0200 Subject: [PATCH net-next v8 06/10] net: airoha: Move {cpu,fwd}_tx_packets in airoha_gdm_dev struct MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260519-airoha-eth-multi-serdes-v8-6-6bd70e329df6@kernel.org> References: <20260519-airoha-eth-multi-serdes-v8-0-6bd70e329df6@kernel.org> In-Reply-To: <20260519-airoha-eth-multi-serdes-v8-0-6bd70e329df6@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-BeenThere: linux-mediatek@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-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=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_gdm_dev one. Signed-off-by: Lorenzo Bianconi --- drivers/net/ethernet/airoha/airoha_eth.c | 16 +++++++--------- drivers/net/ethernet/airoha/airoha_eth.h | 7 +++---- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/drivers/net/ethernet/airoha/airoha_eth.c b/drivers/net/ethernet/airoha/airoha_eth.c index 594fbebcb12c..27b214ce2a4e 100644 --- a/drivers/net/ethernet/airoha/airoha_eth.c +++ b/drivers/net/ethernet/airoha/airoha_eth.c @@ -2313,19 +2313,17 @@ 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 - dev->cpu_tx_packets) + + (fwd_tx_packets - dev->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; + dev->cpu_tx_packets = cpu_tx_packets; + dev->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 a308a770116b..fbb50dc73af8 100644 --- a/drivers/net/ethernet/airoha/airoha_eth.h +++ b/drivers/net/ethernet/airoha/airoha_eth.h @@ -544,6 +544,9 @@ struct airoha_gdm_dev { struct airoha_eth *eth; DECLARE_BITMAP(qos_sq_bmap, AIROHA_NUM_QOS_CHANNELS); + /* qos stats counters */ + u64 cpu_tx_packets; + u64 fwd_tx_packets; }; struct airoha_gdm_port { @@ -553,10 +556,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