From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CAF3636AB7B; Sat, 9 May 2026 13:06:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778331972; cv=none; b=KdNbK4Ma8Yn/EYz1Hg5PcqIW1J+AF4XGawYgtJfp4IPubVcCDxKJ1tiUm2tc/jLl8Q+DmQAzpzWMCrcuikSiNsq+BzSb3+Qmg1NWtHsLlxSG0Tkt8Puv8/kM5BVtyc6qHTQh3YEhkK+eMee90Q1207nIFm4aKLP2erVzlI368RI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778331972; c=relaxed/simple; bh=s4TsbAEx7cvK8gmSjoVm9l46o2DpUZeN8lkEeMpXyfo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qMXeIkPQn3GVrL07DNwewTQ8YiBTw1AtlJqO4AvceOfNzjLvKCjcXkIEx+gN2I3CzK83FkIiryUTr4x7CO3mj2za+f1SPKIEEzecRRu/wEhQxqeYlyDTlQTmDY1TEdJH/OQqyCFv2+8KewbIcWblGeIkIs/9QwRpANK9KGt0uz0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=aXqc2hYG; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="aXqc2hYG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B4E8BC2BCB4; Sat, 9 May 2026 13:06:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778331972; bh=s4TsbAEx7cvK8gmSjoVm9l46o2DpUZeN8lkEeMpXyfo=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=aXqc2hYG7zd5M4MRzVfpvuNC5Aq/01VDzfrULeEXBESyFr861dq/zuED/siL3emFm e/roNk/padYAGRqxBIdHPq+MXL+Ikv328y1Zf0Hc6tDL09HSJRZlO6DyBW8wvKXb8A VYmA5piMqabzWonS/QgR6M+RR0xO0+ME77tfqrZLkaf0YVNRWilLGBFkSec6oooLWY 3mYd7luKo/ojEXxzAzOlUrNOhwPQI2OULg39NMyNqyOiqr+j6u3kaA6xqLj8xjp+ER ADg71zTxVsj3SmqnuAXwHP7SxobEPvIQoyOApHkpj2SlJa7YsuJx3u4iYFRqzFrHff MSbEp+LmBROJg== From: Lorenzo Bianconi Date: Sat, 09 May 2026 15:05:32 +0200 Subject: [PATCH net-next v5 07/12] net: airoha: Move {cpu,fwd}_tx_packets in airoha_gdm_dev struct Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260509-airoha-eth-multi-serdes-v5-7-805e38edc2aa@kernel.org> References: <20260509-airoha-eth-multi-serdes-v5-0-805e38edc2aa@kernel.org> In-Reply-To: <20260509-airoha-eth-multi-serdes-v5-0-805e38edc2aa@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 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 33a0f7b98d52..904f8da93600 100644 --- a/drivers/net/ethernet/airoha/airoha_eth.c +++ b/drivers/net/ethernet/airoha/airoha_eth.c @@ -2312,19 +2312,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 475f5c64bfcb..694e83bfd1e7 100644 --- a/drivers/net/ethernet/airoha/airoha_eth.h +++ b/drivers/net/ethernet/airoha/airoha_eth.h @@ -543,6 +543,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 { @@ -552,10 +555,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