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 6B705C43458 for ; Wed, 1 Jul 2026 17:40:20 +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: Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc: To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=nX/V75O8J2WGNu/mWMfxmlHtmoEqENvIH158XOB3dkU=; b=bjhDmTrz3tGMLjU90CwO4qPZOH 0eUImprp2NFt2T9cBU/pD6HbB2S2TfRZ8w7zZvEwZxos0wWe8YHNfdW0P1+YVIlJaAaABraU2zRfr ybRZ9ZhDm08sIWVZIP0CVUibVjsIRLV0D7OTQmZ0Og3af8iKM66H7TrqSJ5OE67cPE27CbwuG6i/H PLa5dTzTHzLH6vl6AcmxHBzOcn1tiPetrRVqOQeb2Qg+ydp8Z1IiMUDnkXGgRJ17ZGzQdsMOGdMKJ dZDeLmnccfF90QFhyeNZKA+DeKUsdmO9HW7EJlEpbwmFfeleYpJWndegDOWMsf9dq+xKnDarRWCVK U81eNEFg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1weyuy-00000002jcv-39d5; Wed, 01 Jul 2026 17:40:12 +0000 Received: from mail-pj1-x1036.google.com ([2607:f8b0:4864:20::1036]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1weyuw-00000002jbX-2o4R for linux-arm-kernel@lists.infradead.org; Wed, 01 Jul 2026 17:40:11 +0000 Received: by mail-pj1-x1036.google.com with SMTP id 98e67ed59e1d1-37ffdc718f8so621871a91.0 for ; Wed, 01 Jul 2026 10:40:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782927609; x=1783532409; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nX/V75O8J2WGNu/mWMfxmlHtmoEqENvIH158XOB3dkU=; b=IAHC6TIUVayzs8wcrOlHVikgKFW66jJf6AXfEfqQ9u+DZ39zw1E8VV3zobK/5ZEbAI VxznO8pW28ZnN/wDdu4typg7jXCLfCqRmwgVhblz65PKS1QoBO+gYl66iDqw1ZjMoV2D sK6JCstgQxFa0eGYS38BNYH/arBn/20unEXGcFIt8t5hLMIS3iR24ksEZZCPBWw9ktZq +/NSzU5ZQrbRVxBFQ2nNfnSCDNAhKC8eRZIAHQ8qRAM1GoNzBgwCLT3RdLyFWJ44VQq5 G1sVi6lOm1BbxTivNHAtEJQ9SOKxuQJYE91xgAAuSmW+fAYRJSrboZ8ou4kKvuGeFi7r YfSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782927609; x=1783532409; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=nX/V75O8J2WGNu/mWMfxmlHtmoEqENvIH158XOB3dkU=; b=m0DAgGt/IDGu3XtNZSpxbLmEsXkToqmszm5InHNRjKl7XMjylUtW390DXk8Jt26ANW GRUrR9JGMY+n62XwA3thoecNlXqVJaMZCzbMSqYEAXkOc6W+48m1RnNhxVdLNehwO6o/ wwvOrCQWT5d+AjUEGbSkku61fFW4DJJbZpjI1rNllPH2LHO5OVzWhlOYj7TycuMCdZK7 85QLvOCkFd9bUyQcm7JIdbnWLqmIkVXuEp/wjYtczKZSJMuURbPb3387FquL/1AYxdNv VMhQOMJnG+toN4Ssyunz2R3Xcs3tX+uP4lEWEHkge4DMqXW1M8f56n0HOUnFqcA0Ymu9 tvVQ== X-Forwarded-Encrypted: i=1; AFNElJ+523z8rupQD4b5oERUZvK5Dx0EDPV/XLgedy9lCoVjqvkPIhXuEE7h0D0+TkDcg3+PrLnb8kpitsO5WyUp8A4y@lists.infradead.org X-Gm-Message-State: AOJu0YxKZNdy25p8EsjU9kAToTDIJfDdcAPnwwzLiWSz62JKf5jUPUg4 6fIcVM63K/y8e4OK/A/EAE/odsO2xhUWgSRqO4O31C3qSOtT+G4c3IJ4 X-Gm-Gg: AfdE7ckSs76fzW7nlMAbIQIgAsdOA17i8+ZnsoDnZuj85g54ed7MsWEqcbVSvwUOHr0 +oPr07kGhzgSQLEZpPC0KBYjniG1ij5ejdBpbhCXC/4VH9oeXZD0jEjEtvyRTgW7bsAtJ3u1h6/ fP3Ll49QP0VRYPHsiZ6Z1U/rOCBz9RJtfKbUtAB7ImD9Bw5DCgXw/iY8jhneiQsdk+RiArTfTmA dy2iofRxikWKWI7RXvWka8a9EBY308VFsasULKdSzkV5BNTxCStKmz0sQo4NrCYUtx+ofDn8iLy XEXQnR35UjuFnmdBZKYu+ypKADNpnV+/L6+rpLuTX+C+vdfcOP/CutS4PwBlCgBXcVsdMxlSS+2 4RewBP6PdOWlNCeV/Javk0UiEPssg4CP7oi41gND/13yD2ik46qc+zdwLv8fCGueIfhIEyXPl5G xJBe5y24XdKNR/AbD3eylSLLXUpnVJ9MByel1kmQ== X-Received: by 2002:a05:6a21:3987:b0:3b4:736b:da45 with SMTP id adf61e73a8af0-3bfed47a34cmr3039240637.31.1782927609099; Wed, 01 Jul 2026 10:40:09 -0700 (PDT) Received: from nbai25050028.domain.name ([2401:4900:1f39:4252:c62a:fc28:1de9:62ca]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-13b3c80aadfsm30031c88.7.2026.07.01.10.40.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2026 10:40:06 -0700 (PDT) From: Aniket Negi To: lorenzo@kernel.org, netdev@vger.kernel.org Cc: Aniket Negi , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH net v2] net: airoha: fix MIB stats collection to be lossless Date: Wed, 1 Jul 2026 23:09:38 +0530 Message-ID: <20260701173941.314795-1-aniket.negi03@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260630111834.233643-1-aniket.negi03@gmail.com> References: <20260630111834.233643-1-aniket.negi03@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260701_104010_712873_5049866F X-CRM114-Status: GOOD ( 18.71 ) 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 current driver resets hardware MIB counters after every read via REG_FE_GDM_MIB_CLEAR. This creates a race window: packets arriving between the read and the clear are silently lost from statistics. Fix this by removing the MIB clear and switching to a delta-based software tracking approach: - 64-bit H+L registers (tx/rx ok pkts, ok bytes, E64..L1023): read the absolute hardware total directly each poll. - 32-bit registers (drops, bc, mc, errors, runt, long, ...): store the previous raw register value in mib_prev and accumulate (u32)(curr - prev) into a 64-bit software counter. Unsigned subtraction handles wrap-around transparently. - tx_len[0]/rx_len[0] ({0,64} RMON bucket) combines RUNT_CNT (32-bit, delta-tracked via mib_prev.tx_runt_cnt) and E64_CNT (64-bit, absolute). A u64 accumulator tx_runt_accum64 holds the running RUNT delta sum so that each poll sets: tx_len[0] = tx_runt_accum64 + E64_abs without double-counting the E64 value. Merge airoha_dev_get_hw_stats() into airoha_update_hw_stats(), moving the port spin_lock inside so callers do not need a separate wrapper. Signed-off-by: Aniket Negi --- Changes in v2: - Store _CNT_L register reads in val before adding to stats, improving readability (suggested by Lorenzo Bianconi) - Fix double-counting bug in the RUNT+E64 combined bucket: previously "+=" for E64 re-added the full absolute counter each poll; now a dedicated tx_runt_accum64/rx_runt_accum64 accumulator holds the running RUNT delta, and tx_len[0] is assigned (not accumulated) each poll as runt_accum64 + E64_abs - Replace 7-element tx_len[]/rx_len[] shadow arrays in mib_prev with focused tx_runt_cnt/tx_long_cnt and rx_runt_cnt/rx_long_cnt fields; only RUNT and LONG are 32-bit and need wrap-around tracking - Rename inner struct hw_prev_stats to mib_prev; rename accumulator fields to tx_runt_accum64/rx_runt_accum64 for clarity - Fix comment alignment in mib_prev struct block - Rename airoha_dev_get_hw_stats() to airoha_update_hw_stats() and move the port spin_lock inside, removing the separate wrapper drivers/net/ethernet/airoha/airoha_eth.c | 115 +++++++++++++---------- drivers/net/ethernet/airoha/airoha_eth.h | 27 ++++++ 2 files changed, 92 insertions(+), 50 deletions(-) diff --git a/drivers/net/ethernet/airoha/airoha_eth.c b/drivers/net/ethernet/airoha/airoha_eth.c index 59001fd4b6f7..4b7c547de165 100644 --- a/drivers/net/ethernet/airoha/airoha_eth.c +++ b/drivers/net/ethernet/airoha/airoha_eth.c @@ -1686,12 +1686,14 @@ static void airoha_qdma_stop_napi(struct airoha_qdma *qdma) } } -static void airoha_dev_get_hw_stats(struct airoha_gdm_dev *dev) +static void airoha_update_hw_stats(struct airoha_gdm_dev *dev) { struct airoha_gdm_port *port = dev->port; struct airoha_eth *eth = dev->eth; u32 val, i = 0; + spin_lock(&port->stats_lock); + /* Read relevant MIB for GDM with multiple port attached */ if (port->id == AIROHA_GDM3_IDX || port->id == AIROHA_GDM4_IDX) airoha_fe_rmw(eth, REG_FE_GDM_MIB_CFG(port->id), @@ -1701,152 +1703,165 @@ 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); + 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; val = airoha_fe_rr(eth, REG_FE_GDM_TX_OK_BYTE_CNT_H(port->id)); - dev->stats.tx_ok_bytes += ((u64)val << 32); + 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; + /* 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.mib_prev.tx_drops); + dev->stats.mib_prev.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.mib_prev.tx_broadcast); + dev->stats.mib_prev.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.mib_prev.tx_multicast); + dev->stats.mib_prev.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.mib_prev.tx_runt_accum64 += + (u32)(val - dev->stats.mib_prev.tx_runt_cnt); + dev->stats.mib_prev.tx_runt_cnt = val; + + /* tx_len[0]: RUNT (32-bit, delta) + E64 (64-bit, absolute) → {0, 64} bucket. + * Accumulate RUNT delta in tx_runt_accum64, then assign tx_len[0] as + * accum + E64_abs so each call gives the correct combined total. + */ + + dev->stats.tx_len[i] = dev->stats.mib_prev.tx_runt_accum64; val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_E64_CNT_H(port->id)); - dev->stats.tx_len[i] += ((u64)val << 32); + 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; val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L64_CNT_H(port->id)); - dev->stats.tx_len[i] += ((u64)val << 32); + 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; val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L127_CNT_H(port->id)); - dev->stats.tx_len[i] += ((u64)val << 32); + 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; val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L255_CNT_H(port->id)); - dev->stats.tx_len[i] += ((u64)val << 32); + 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; val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L511_CNT_H(port->id)); - dev->stats.tx_len[i] += ((u64)val << 32); + 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; val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L1023_CNT_H(port->id)); - dev->stats.tx_len[i] += ((u64)val << 32); + 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; 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.mib_prev.tx_long_cnt); + dev->stats.mib_prev.tx_long_cnt = 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); + 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; val = airoha_fe_rr(eth, REG_FE_GDM_RX_OK_BYTE_CNT_H(port->id)); - dev->stats.rx_ok_bytes += ((u64)val << 32); + 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; 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.mib_prev.rx_drops); + dev->stats.mib_prev.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.mib_prev.rx_broadcast); + dev->stats.mib_prev.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.mib_prev.rx_multicast); + dev->stats.mib_prev.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.mib_prev.rx_errors); + dev->stats.mib_prev.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.mib_prev.rx_crc_error); + dev->stats.mib_prev.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.mib_prev.rx_over_errors); + dev->stats.mib_prev.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.mib_prev.rx_fragment); + dev->stats.mib_prev.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.mib_prev.rx_jabber); + dev->stats.mib_prev.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.mib_prev.rx_runt_accum64 += + (u32)(val - dev->stats.mib_prev.rx_runt_cnt); + dev->stats.mib_prev.rx_runt_cnt = val; + + /* rx_len[0]: RUNT (32-bit, delta) + E64 (64-bit, absolute) → {0, 64} bucket. + * then assign rx_len[0] = rx_runt_accum64 + E64_abs. + */ + dev->stats.rx_len[i] = dev->stats.mib_prev.rx_runt_accum64; val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_E64_CNT_H(port->id)); - dev->stats.rx_len[i] += ((u64)val << 32); + 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; val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L64_CNT_H(port->id)); - dev->stats.rx_len[i] += ((u64)val << 32); + 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; val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L127_CNT_H(port->id)); - dev->stats.rx_len[i] += ((u64)val << 32); + 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; val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L255_CNT_H(port->id)); - dev->stats.rx_len[i] += ((u64)val << 32); + 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; val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L511_CNT_H(port->id)); - dev->stats.rx_len[i] += ((u64)val << 32); + 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; val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L1023_CNT_H(port->id)); - dev->stats.rx_len[i] += ((u64)val << 32); + 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; 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.mib_prev.rx_long_cnt); + dev->stats.mib_prev.rx_long_cnt = val; u64_stats_update_end(&dev->stats.syncp); -} - -static void airoha_update_hw_stats(struct airoha_gdm_dev *dev) -{ - struct airoha_gdm_port *port = dev->port; - int i; - - spin_lock(&port->stats_lock); - - for (i = 0; i < ARRAY_SIZE(port->devs); i++) { - if (port->devs[i]) - 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 f6d01a8e8da1..3af1c49dd62d 100644 --- a/drivers/net/ethernet/airoha/airoha_eth.h +++ b/drivers/net/ethernet/airoha/airoha_eth.h @@ -245,6 +245,33 @@ 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) into the 64-bit software counter + * handles wrap-around transparently via unsigned arithmetic. + * tx_runt_accum64/rx_runt_accum64 hold the running sum of + * runt deltas. These fields are never reported to userspace. + */ + u32 tx_drops; + u32 tx_broadcast; + u32 tx_multicast; + u32 tx_runt_cnt; + u32 tx_long_cnt; + u64 tx_runt_accum64; + 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_runt_cnt; + u32 rx_long_cnt; + u64 rx_runt_accum64; + } mib_prev; }; enum { base-commit: a225f8c20712713406ae47024b8df42deacddd4a -- 2.43.0