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 DE5F2C43458 for ; Tue, 30 Jun 2026 11:18:55 +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:Content-Transfer-Encoding: MIME-Version:Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=XRfkcUv7g40gglGVGhitqa+g0EVUFFRMfsu9citOfjs=; b=FTLdjXj9TD8kej5M6iBIH+yICH WHzx6gXH8og/yMwik6E3ZCZxrZmyl3e4GJNAL7prXPAMU/mc5Ep4yeuqO9xKfl8+qcgHrc/KEzxX3 fR0qbpJ8LJHsArWjrP2QGXBSZ5gFcEPMOisAtIovnq2w6V6vr1X86Em7mvpH5QeXDcJGv+VX2r/R8 7GR7J1YNXpBrSOb+m/X1H4UaQ8XXeQSLsT4WiueqfEwJn5aLpPHfBQfuzSExKH6zIci+elIcE17mc fLc1+LpACCaF31iOsCAbcZpg0vuTkeGiD09qhIdbh5UqPdDW3CC15XI6gwFqgDOYM14F1hhHqTDw6 kcKNkkVQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1weWUJ-0000000GpVa-2KYu; Tue, 30 Jun 2026 11:18:47 +0000 Received: from mail-pl1-x633.google.com ([2607:f8b0:4864:20::633]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1weWUH-0000000GpUo-3oR2 for linux-arm-kernel@lists.infradead.org; Tue, 30 Jun 2026 11:18:47 +0000 Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-2c82538b6b0so30190705ad.1 for ; Tue, 30 Jun 2026 04:18:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782818324; x=1783423124; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=XRfkcUv7g40gglGVGhitqa+g0EVUFFRMfsu9citOfjs=; b=d4vkeLLIxQ0Ma26IKhPU0kiR1BNnEI5Q107SHHsIc0udNhp/SLzduyW7u5Mg7Oy8PX 9GKZAuUzfAwhMOSaa3krjQW2fyMnoKVtcwePhkluRl2UQsLGZNFMewH7iUk37F7LGXeq ECG7pix2EvJUNrjjKIkRYuGtgu+B5UaAdDLi05ljH70qrqsE2DvkLBcYTN6uzwoMfzFq GdhpNDHOZU7Nlq/7gGrlLqLRU5p6DMy3RKSUGaxD45louB5jChez+SgSOZsgduMdvo28 Qbj09wSIiglR3eLNb+76Esfe2WVOj4Mak4h9p1weoLoGbg2Cz/STZ1CZUQERV2ME9fkI vXbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782818324; x=1783423124; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=XRfkcUv7g40gglGVGhitqa+g0EVUFFRMfsu9citOfjs=; b=rWy/mREHPNPNp+ZDWwTSdde4ZIFblAem0NdUTOmyBkv8uxzahMlAqQXS4z2JWU9AEB Ruh9JH+bULOyIovequORbTRHMfRB7LoVsspOMof67md1ZtW408di4q5koPf2nAWuVKwf 4NOqpBoj2K02WqJB73swWlE+KKp7IatRBK0DsqK7gelsHHiJOvSIfoQIC6E0xo3MR/q0 7sGloADSci/3c+pipvu7vxPdN0J3pEQoO6VYIkmXy44/adHR2MkEdricY5usp5sifd3H s6Apx533iPBehWa/ui8LIKFt3q9uG0o0mAR4a6YGoEYASoxknRRoPN7W6E98g+b23PxC DjlA== X-Forwarded-Encrypted: i=1; AHgh+Rp/sxD6VIUBEmDKZfQHjurCVNB8vyHIwCEkYhYZrUBZn/9MraJQOcvdb02xRsqockcXZHomCnw3V6BKBCFq5Cjk@lists.infradead.org X-Gm-Message-State: AOJu0YxoVRAzoHLAcK8IG3RGxaTsvCaplEK6oVASAZfz6hszWPuHCKDq AUsvn/kXotTHCx5SNJApyf0MxgR/byWyHTnw2jA4+fpYoGepSanljslb X-Gm-Gg: AfdE7clA4N246gGd7WSlal1bB27RLdPQT+OJLTcSJ9sgVX2SIoa/bog3oY41E2ArxNK Q5OSnxaVjFSqNYo6PFOtQOyfM1SGDTzBKiv0ABJdvgOqhnRFOABl9ZNPtxhou6sC4UPqcuM2/uL sgQYIv8Q1RBI719UbtWwmUYQ8P8iQOe5zcbjKPvh1zskDVr6i9njGuVat9XMrOeUaeA5mWf1HMn /eiXh3uhoHtX2f5fKASbi+OvgjR3301MyIoTrau9B32AXodaYwo5Q1HcUMnvY8LGv2X8n89Mprl xgJWkJEh0IZOfi6iuvs4FhDvkLUaF4BRvesNimw3kS+VKC8qpmv8g5C5GVmaOgZ3cAEOs3tAiw5 h4vFto+oK93TBXQaT5mJ4MjnBClpdtGs0GVNdGNiAX8JotbTKdZoxh8Wf26JP973onbJ9KCLxMf Era1wbiUFBRDJ09tqm0Sgj8Uo= X-Received: by 2002:a17:903:3883:b0:2ca:52ce:6f74 with SMTP id d9443c01a7336-2ca5a5eb6f3mr833565ad.29.1782818323616; Tue, 30 Jun 2026 04:18:43 -0700 (PDT) Received: from nbai25050028.. ([2403:8600:2090:6f:c162:d20a:68d9:13ea]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ca37c7456bsm11688285ad.25.2026.06.30.04.18.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2026 04:18:43 -0700 (PDT) From: Aniket Negi To: Lorenzo Bianconi Cc: Andrew Lunn , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Christian Marangi , Simon Horman , linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Aniket Negi Subject: [PATCH] net: airoha: fix MIB stats collection to be lossless Date: Tue, 30 Jun 2026 16:48:34 +0530 Message-ID: <20260630111834.233643-1-aniket.negi03@gmail.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260630_041845_966270_9FCEFE41 X-CRM114-Status: GOOD ( 18.39 ) 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 The airoha_dev_get_hw_stats() function had two correctness issues in the way it collects hardware MIB counters. Bug 1: Read-clear race causes silent packet loss in statistics airoha_update_hw_stats() read all MIB registers and then cleared them via REG_FE_GDM_MIB_CLEAR. There is a time window between the last register read and the hardware clear. Any packet that the hardware counts during this window is lost: the register is incremented, then cleared, without the increment ever being read by software. Under sustained traffic this causes a permanent and growing undercount in all reported statistics. This is particularly misleading for tx_ok_pkts and tx_ok_bytes, which routers and traffic monitors use to detect packet forwarding loss between two points in a hardware-accelerated path (e.g., between two netdevs in the QDMA/PPE fast-path). An inaccurate count makes it impossible to reliably attribute drops in the forwarding pipeline without capturing traffic at both ends independently. Bug 2: 32-bit counter overflow causes stat corruption Several MIB registers are only 32 bits wide: tx_drops, tx_broadcast, tx_multicast, rx_drops, rx_broadcast, rx_multicast, rx_errors, rx_crc_error, rx_over_errors, rx_fragment, rx_jabber, and the runt and long buckets of the tx_len[]/rx_len[]. The original code relied on MIB_CLEAR to keep register values small enough that a simple '+= val' per cycle did not lose data across a wrap. Once clearing is removed (to fix Bug 1), raw '+= val' silently corrupts the accumulated software counter on overflow. Fix both issues together: - 64-bit H+L register pairs (tx_ok_pkts, tx_ok_bytes, tx_len[1..5], rx_ok_pkts, rx_ok_bytes, rx_len[1..5]): read directly from hardware without clearing. Hardware accumulates the full running total; a single direct assignment per poll is correct and lossless. - 32-bit registers (tx_drops, tx_broadcast, tx_multicast, rx_drops, rx_broadcast, rx_multicast, rx_errors, rx_crc_error, rx_over_errors, rx_fragment, rx_jabber, and the runt/long buckets in tx_len[0]/[6] and rx_len[0]/[6]): track the previous hardware value in a new hw_prev_stats sub-struct inside airoha_hw_stats and accumulate (u32)(curr - prev) into the 64-bit software counter. Unsigned subtraction handles wrap-around transparently: prev=0xFFFFFF00, curr=0x00000010 -> delta=(u32)(0x10-0xFFFFFF00)=0x110 Remove the REG_FE_GDM_MIB_CLEAR write from airoha_update_hw_stats() entirely. Because the driver no longer clears hardware counters, the read-clear race window is eliminated. The hw_prev_stats fields are zero-initialised by the existing devm_kzalloc() call in airoha_alloc_gdm_device(). Fixes: 8f4695fb67b2 ("net: airoha: better handle MIBs for GDM ports with multiple devs attached") Signed-off-by: Aniket Negi --- drivers/net/ethernet/airoha/airoha_eth.c | 132 +++++++++++------------ drivers/net/ethernet/airoha/airoha_eth.h | 22 ++++ 2 files changed, 86 insertions(+), 68 deletions(-) diff --git a/drivers/net/ethernet/airoha/airoha_eth.c b/drivers/net/ethernet/airoha/airoha_eth.c index 1caf6766f2c0..7ae4e294478e 100644 --- a/drivers/net/ethernet/airoha/airoha_eth.c +++ b/drivers/net/ethernet/airoha/airoha_eth.c @@ -1696,133 +1696,133 @@ static void airoha_dev_get_hw_stats(struct airoha_gdm_dev *dev) u64_stats_update_begin(&dev->stats.syncp); - /* TX */ + /* TX - 64-bit H+L registers: hw accumulates the total, read directly. */ val = airoha_fe_rr(eth, REG_FE_GDM_TX_OK_PKT_CNT_H(port->id)); - dev->stats.tx_ok_pkts += ((u64)val << 32); - val = airoha_fe_rr(eth, REG_FE_GDM_TX_OK_PKT_CNT_L(port->id)); - dev->stats.tx_ok_pkts += val; + dev->stats.tx_ok_pkts = (u64)val << 32; + dev->stats.tx_ok_pkts += airoha_fe_rr(eth, REG_FE_GDM_TX_OK_PKT_CNT_L(port->id)); val = airoha_fe_rr(eth, REG_FE_GDM_TX_OK_BYTE_CNT_H(port->id)); - dev->stats.tx_ok_bytes += ((u64)val << 32); - val = airoha_fe_rr(eth, REG_FE_GDM_TX_OK_BYTE_CNT_L(port->id)); - dev->stats.tx_ok_bytes += val; + dev->stats.tx_ok_bytes = (u64)val << 32; + dev->stats.tx_ok_bytes += airoha_fe_rr(eth, REG_FE_GDM_TX_OK_BYTE_CNT_L(port->id)); + /* TX - 32-bit registers: accumulate delta to handle wrap-around. */ val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_DROP_CNT(port->id)); - dev->stats.tx_drops += val; + dev->stats.tx_drops += (u32)(val - dev->stats.hw_prev_stats.tx_drops); + dev->stats.hw_prev_stats.tx_drops = val; val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_BC_CNT(port->id)); - dev->stats.tx_broadcast += val; + dev->stats.tx_broadcast += (u32)(val - dev->stats.hw_prev_stats.tx_broadcast); + dev->stats.hw_prev_stats.tx_broadcast = val; val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_MC_CNT(port->id)); - dev->stats.tx_multicast += val; + dev->stats.tx_multicast += (u32)(val - dev->stats.hw_prev_stats.tx_multicast); + dev->stats.hw_prev_stats.tx_multicast = val; val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_RUNT_CNT(port->id)); - dev->stats.tx_len[i] += val; + dev->stats.tx_len[i] += (u32)(val - dev->stats.hw_prev_stats.tx_len[i]); + dev->stats.hw_prev_stats.tx_len[i] = val; val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_E64_CNT_H(port->id)); - dev->stats.tx_len[i] += ((u64)val << 32); - val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_E64_CNT_L(port->id)); - dev->stats.tx_len[i++] += val; + dev->stats.tx_len[i] += (u64)val << 32; + dev->stats.tx_len[i++] += airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_E64_CNT_L(port->id)); val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L64_CNT_H(port->id)); - dev->stats.tx_len[i] += ((u64)val << 32); - val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L64_CNT_L(port->id)); - dev->stats.tx_len[i++] += val; + dev->stats.tx_len[i] = (u64)val << 32; + dev->stats.tx_len[i++] += airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L64_CNT_L(port->id)); val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L127_CNT_H(port->id)); - dev->stats.tx_len[i] += ((u64)val << 32); - val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L127_CNT_L(port->id)); - dev->stats.tx_len[i++] += val; + dev->stats.tx_len[i] = (u64)val << 32; + dev->stats.tx_len[i++] += airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L127_CNT_L(port->id)); val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L255_CNT_H(port->id)); - dev->stats.tx_len[i] += ((u64)val << 32); - val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L255_CNT_L(port->id)); - dev->stats.tx_len[i++] += val; + dev->stats.tx_len[i] = (u64)val << 32; + dev->stats.tx_len[i++] += airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L255_CNT_L(port->id)); val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L511_CNT_H(port->id)); - dev->stats.tx_len[i] += ((u64)val << 32); - val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L511_CNT_L(port->id)); - dev->stats.tx_len[i++] += val; + dev->stats.tx_len[i] = (u64)val << 32; + dev->stats.tx_len[i++] += airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L511_CNT_L(port->id)); val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L1023_CNT_H(port->id)); - dev->stats.tx_len[i] += ((u64)val << 32); - val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L1023_CNT_L(port->id)); - dev->stats.tx_len[i++] += val; + dev->stats.tx_len[i] = (u64)val << 32; + dev->stats.tx_len[i++] += airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L1023_CNT_L(port->id)); val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_LONG_CNT(port->id)); - dev->stats.tx_len[i++] += val; + dev->stats.tx_len[i] += (u32)(val - dev->stats.hw_prev_stats.tx_len[i]); + dev->stats.hw_prev_stats.tx_len[i++] = val; /* RX */ val = airoha_fe_rr(eth, REG_FE_GDM_RX_OK_PKT_CNT_H(port->id)); - dev->stats.rx_ok_pkts += ((u64)val << 32); - val = airoha_fe_rr(eth, REG_FE_GDM_RX_OK_PKT_CNT_L(port->id)); - dev->stats.rx_ok_pkts += val; + dev->stats.rx_ok_pkts = (u64)val << 32; + dev->stats.rx_ok_pkts += airoha_fe_rr(eth, REG_FE_GDM_RX_OK_PKT_CNT_L(port->id)); val = airoha_fe_rr(eth, REG_FE_GDM_RX_OK_BYTE_CNT_H(port->id)); - dev->stats.rx_ok_bytes += ((u64)val << 32); - val = airoha_fe_rr(eth, REG_FE_GDM_RX_OK_BYTE_CNT_L(port->id)); - dev->stats.rx_ok_bytes += val; + dev->stats.rx_ok_bytes = (u64)val << 32; + dev->stats.rx_ok_bytes += airoha_fe_rr(eth, REG_FE_GDM_RX_OK_BYTE_CNT_L(port->id)); val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_DROP_CNT(port->id)); - dev->stats.rx_drops += val; + dev->stats.rx_drops += (u32)(val - dev->stats.hw_prev_stats.rx_drops); + dev->stats.hw_prev_stats.rx_drops = val; val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_BC_CNT(port->id)); - dev->stats.rx_broadcast += val; + dev->stats.rx_broadcast += (u32)(val - dev->stats.hw_prev_stats.rx_broadcast); + dev->stats.hw_prev_stats.rx_broadcast = val; val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_MC_CNT(port->id)); - dev->stats.rx_multicast += val; + dev->stats.rx_multicast += (u32)(val - dev->stats.hw_prev_stats.rx_multicast); + dev->stats.hw_prev_stats.rx_multicast = val; val = airoha_fe_rr(eth, REG_FE_GDM_RX_ERROR_DROP_CNT(port->id)); - dev->stats.rx_errors += val; + dev->stats.rx_errors += (u32)(val - dev->stats.hw_prev_stats.rx_errors); + dev->stats.hw_prev_stats.rx_errors = val; val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_CRC_ERR_CNT(port->id)); - dev->stats.rx_crc_error += val; + dev->stats.rx_crc_error += (u32)(val - dev->stats.hw_prev_stats.rx_crc_error); + dev->stats.hw_prev_stats.rx_crc_error = val; val = airoha_fe_rr(eth, REG_FE_GDM_RX_OVERFLOW_DROP_CNT(port->id)); - dev->stats.rx_over_errors += val; + dev->stats.rx_over_errors += (u32)(val - dev->stats.hw_prev_stats.rx_over_errors); + dev->stats.hw_prev_stats.rx_over_errors = val; val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_FRAG_CNT(port->id)); - dev->stats.rx_fragment += val; + dev->stats.rx_fragment += (u32)(val - dev->stats.hw_prev_stats.rx_fragment); + dev->stats.hw_prev_stats.rx_fragment = val; val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_JABBER_CNT(port->id)); - dev->stats.rx_jabber += val; + dev->stats.rx_jabber += (u32)(val - dev->stats.hw_prev_stats.rx_jabber); + dev->stats.hw_prev_stats.rx_jabber = val; i = 0; val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_RUNT_CNT(port->id)); - dev->stats.rx_len[i] += val; + dev->stats.rx_len[i] += (u32)(val - dev->stats.hw_prev_stats.rx_len[i]); + dev->stats.hw_prev_stats.rx_len[i] = val; val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_E64_CNT_H(port->id)); - dev->stats.rx_len[i] += ((u64)val << 32); - val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_E64_CNT_L(port->id)); - dev->stats.rx_len[i++] += val; + dev->stats.rx_len[i] += (u64)val << 32; + dev->stats.rx_len[i++] += airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_E64_CNT_L(port->id)); val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L64_CNT_H(port->id)); - dev->stats.rx_len[i] += ((u64)val << 32); - val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L64_CNT_L(port->id)); - dev->stats.rx_len[i++] += val; + dev->stats.rx_len[i] = (u64)val << 32; + dev->stats.rx_len[i++] += airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L64_CNT_L(port->id)); val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L127_CNT_H(port->id)); - dev->stats.rx_len[i] += ((u64)val << 32); - val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L127_CNT_L(port->id)); - dev->stats.rx_len[i++] += val; + dev->stats.rx_len[i] = (u64)val << 32; + dev->stats.rx_len[i++] += airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L127_CNT_L(port->id)); val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L255_CNT_H(port->id)); - dev->stats.rx_len[i] += ((u64)val << 32); - val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L255_CNT_L(port->id)); - dev->stats.rx_len[i++] += val; + dev->stats.rx_len[i] = (u64)val << 32; + dev->stats.rx_len[i++] += airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L255_CNT_L(port->id)); val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L511_CNT_H(port->id)); - dev->stats.rx_len[i] += ((u64)val << 32); - val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L511_CNT_L(port->id)); - dev->stats.rx_len[i++] += val; + dev->stats.rx_len[i] = (u64)val << 32; + dev->stats.rx_len[i++] += airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L511_CNT_L(port->id)); val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L1023_CNT_H(port->id)); - dev->stats.rx_len[i] += ((u64)val << 32); - val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L1023_CNT_L(port->id)); - dev->stats.rx_len[i++] += val; + dev->stats.rx_len[i] = (u64)val << 32; + dev->stats.rx_len[i++] += airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L1023_CNT_L(port->id)); val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_LONG_CNT(port->id)); - dev->stats.rx_len[i++] += val; + dev->stats.rx_len[i] += (u32)(val - dev->stats.hw_prev_stats.rx_len[i]); + dev->stats.hw_prev_stats.rx_len[i++] = val; u64_stats_update_end(&dev->stats.syncp); } @@ -1839,10 +1839,6 @@ static void airoha_update_hw_stats(struct airoha_gdm_dev *dev) airoha_dev_get_hw_stats(port->devs[i]); } - /* Reset MIB counters */ - airoha_fe_set(dev->eth, REG_FE_GDM_MIB_CLEAR(port->id), - FE_GDM_MIB_RX_CLEAR_MASK | FE_GDM_MIB_TX_CLEAR_MASK); - spin_unlock(&port->stats_lock); } diff --git a/drivers/net/ethernet/airoha/airoha_eth.h b/drivers/net/ethernet/airoha/airoha_eth.h index 2765244d937c..af12ad6eac17 100644 --- a/drivers/net/ethernet/airoha/airoha_eth.h +++ b/drivers/net/ethernet/airoha/airoha_eth.h @@ -244,6 +244,28 @@ struct airoha_hw_stats { u64 rx_fragment; u64 rx_jabber; u64 rx_len[7]; + + struct { + /* Previous HW register values for 32-bit counter delta tracking. + * Storing the last seen value and accumulating (u32)(curr - prev) + * in 64-bit software counter & handles wrap-around transparently + * via unsigned arithmetic. These fields are never reported to + * userspace. + */ + u32 tx_drops; + u32 tx_broadcast; + u32 tx_multicast; + u32 tx_len[7]; + u32 rx_drops; + u32 rx_broadcast; + u32 rx_multicast; + u32 rx_errors; + u32 rx_crc_error; + u32 rx_over_errors; + u32 rx_fragment; + u32 rx_jabber; + u32 rx_len[7]; + } hw_prev_stats; }; enum { -- 2.43.0