From nobody Sun Feb 8 07:07:40 2026 Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3C6F6387358 for ; Thu, 22 Jan 2026 18:53:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769108006; cv=none; b=sFQToPQg+KDbsja/vwNbIEtr3dKglxtbilWbxCj+jPGk/qZEog3hYA7fspSCC3akBPQ9brhpsM2Lmdmqna4/5cls+YK6n5Sv7S14wI1Ob28TqTpwMD5SpT0dMJj5FgCn4JtXbCZPQQdSWhxoLf5n69O/Jgr8GG8pm40wz32Dy9o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769108006; c=relaxed/simple; bh=9/Rq4doYSiljOqafaQtbsOmVPK8RSk/mEUzBYNOICoo=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=N4R3TwReZElxozpR6o+BBoJvpLcyYHGmDT/NInHJULL7Y2XbzsyZKRZfGRiyOIHMQuYbNZN3NI+inMBc/ZYncWWYHow0DXaLEKo5u6NcmlookXhtLyjW2jWg+UnX1STGJII8iDjzU9YWclNftHcRrsM98Y73OSxzeCfGwqEcLd4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Yu42LSi9; arc=none smtp.client-ip=209.85.210.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Yu42LSi9" Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-823075fed75so677143b3a.1 for ; Thu, 22 Jan 2026 10:53:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769107995; x=1769712795; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=TWzta/r/B2JAGtHGJUL2js2kTmC/9to7xiyXgiuBd3M=; b=Yu42LSi982/zzWzTh01red9QV+igtO9xIZF0N5/YONNKLLAndc8CejM3aCv5pggCkG aznsPgh5lj/hHMK02emW0NENWX4ycy+Y/IHaLionlrtIEfpOypplbiyTIs1qPsqWK+2i afUG7qStCWaD2FQPJemj43P27Cy5L1kxxj3CmFWiW/RVPVvZChvZZPgu5A918eR/dLZ6 SFPHTC1BZCyvQ5rVWvPNPK5vATssMZUz9JEqBRkrDWa3WyuOzdM/T6KwC4v5JUc9n7bY OVfzJL3v4Ry7wlQc8J8RCmG2wbc8WWIH0gwOM8S+JLCx+ILrcAMdNgU1xy6cb/ZEO4ib uXlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769107995; x=1769712795; 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=TWzta/r/B2JAGtHGJUL2js2kTmC/9to7xiyXgiuBd3M=; b=GyBGNF3W/yrB02IrHva5JE8phMGLdmCFtcJxInsTAJPrW9IJz4+RSkCK7K5BehlPS1 Pt+AOVhLddlDuqg1b08aQYxYeTnuRx7IQJm1IhED//w+g7ksW+LG59fsn7Gv5sbn1ncO farz4jtZXjyCg6CcLWqIcRO/hLP1eFxmfKCu82W2a9PvV4V2QQg75Uh3oDgk7vtNGWye oBgoWOJVQNXFQTEgGvE/IbhUFm+0ZWmb3YjuBCV7hwHR+ubN5rz8QpelJ6hels0lweBu vwwk6+PhVbO0OHUhCLrZ8RCRdSDZh4a/OHVmf54AaLLsszh+6tWbZsU1C25i+L3hVqX1 t5Nw== X-Forwarded-Encrypted: i=1; AJvYcCVWpk+cliG1ZUzN1DoaUE/RNU7I4PJSMO9BS4VQwgdUfJFGIAhX2V5MKkO20YCVhfvLAwfX3Xg47mpQTbg=@vger.kernel.org X-Gm-Message-State: AOJu0Yzvw7MZ4u1pmtWFi4z5tqPm5lHH8Sxxv3RnkY00OWBqBFp5SBJ0 4haxmZ+0wGTqTCPJrqqAcPSoAY6YoU4+3894hKoU2A9A6BmWr/bY1E8I X-Gm-Gg: AZuq6aKSglWNU2aHzY3l2fFGWcKS1We5ohCoXSjzyAF5PFUfQUFI+nyaMP0rGu0b0dx kDzmDdxnthumo4Whvj9NOAPMfUBp5W30MNEU1oG7oldFA9e02mwr32WYgbqDS6MHeQtZHzvceJj aCOGLw9ZsYfrVTa5M9fJxnKrjTZFya5qgG5GyFpeQMNesH2H0cl5OKm0UaVAk0dNMVOhaRuOBjw WbKngz6b28Fuxki0bBvjCQat1EtrMlffToKX66QnPRmQhYOOSWc6Fqo38IUB87Ie12TGGlEH3gw vF8Gv7vBPqij+DP0rk6wTL+TSZGU+dk/t6GcSXwNLzDcvOf8oXVKGyJIakgdso3f+KiI67jJyo6 7TILOl57t+bWtKMhmsJ37bJp8InEG0f8JHalkh8xGw4jeEROjl7vIFbLzXz5fhhh3Ut3YKl9Hxa kaFllre5PdCSsISgmvWZ9qK8KDv+ChGGRQhST4yENZ848Lhw8KuWo3Fjaojmly0BsI X-Received: by 2002:a05:6a00:1c90:b0:81f:832a:174 with SMTP id d2e1a72fcca58-82317b00f17mr301414b3a.16.1769107995037; Thu, 22 Jan 2026 10:53:15 -0800 (PST) Received: from d.home.mmyangfl.tk ([2001:19f0:8001:1644:5400:5ff:fe3e:12b1]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-823186838dfsm90058b3a.30.2026.01.22.10.53.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jan 2026 10:53:14 -0800 (PST) From: David Yang To: netdev@vger.kernel.org Cc: David Yang , Lorenzo Bianconi , 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-next] net: airoha: Use u64_stats_t with u64_stats_sync properly Date: Fri, 23 Jan 2026 02:52:51 +0800 Message-ID: <20260122185255.2761568-1-mmyangfl@gmail.com> X-Mailer: git-send-email 2.51.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" On 64bit arches, struct u64_stats_sync is empty and provides no help against load/store tearing. Convert to u64_stats_t to ensure atomic operations. Signed-off-by: David Yang Acked-by: Lorenzo Bianconi --- drivers/net/ethernet/airoha/airoha_eth.c | 136 +++++++++++------------ drivers/net/ethernet/airoha/airoha_eth.h | 34 +++--- 2 files changed, 85 insertions(+), 85 deletions(-) diff --git a/drivers/net/ethernet/airoha/airoha_eth.c b/drivers/net/etherne= t/airoha/airoha_eth.c index 62bcbbbe2a95..6ed220e5a094 100644 --- a/drivers/net/ethernet/airoha/airoha_eth.c +++ b/drivers/net/ethernet/airoha/airoha_eth.c @@ -1472,131 +1472,131 @@ static void airoha_update_hw_stats(struct airoha_= gdm_port *port) =20 /* TX */ val =3D airoha_fe_rr(eth, REG_FE_GDM_TX_OK_PKT_CNT_H(port->id)); - port->stats.tx_ok_pkts +=3D ((u64)val << 32); + u64_stats_add(&port->stats.tx_ok_pkts, (u64)val << 32); val =3D airoha_fe_rr(eth, REG_FE_GDM_TX_OK_PKT_CNT_L(port->id)); - port->stats.tx_ok_pkts +=3D val; + u64_stats_add(&port->stats.tx_ok_pkts, val); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_TX_OK_BYTE_CNT_H(port->id)); - port->stats.tx_ok_bytes +=3D ((u64)val << 32); + u64_stats_add(&port->stats.tx_ok_bytes, (u64)val << 32); val =3D airoha_fe_rr(eth, REG_FE_GDM_TX_OK_BYTE_CNT_L(port->id)); - port->stats.tx_ok_bytes +=3D val; + u64_stats_add(&port->stats.tx_ok_bytes, val); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_DROP_CNT(port->id)); - port->stats.tx_drops +=3D val; + u64_stats_add(&port->stats.tx_drops, val); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_BC_CNT(port->id)); - port->stats.tx_broadcast +=3D val; + u64_stats_add(&port->stats.tx_broadcast, val); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_MC_CNT(port->id)); - port->stats.tx_multicast +=3D val; + u64_stats_add(&port->stats.tx_multicast, val); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_RUNT_CNT(port->id)); - port->stats.tx_len[i] +=3D val; + u64_stats_add(&port->stats.tx_len[i], val); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_E64_CNT_H(port->id)); - port->stats.tx_len[i] +=3D ((u64)val << 32); + u64_stats_add(&port->stats.tx_len[i], (u64)val << 32); val =3D airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_E64_CNT_L(port->id)); - port->stats.tx_len[i++] +=3D val; + u64_stats_add(&port->stats.tx_len[i++], val); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L64_CNT_H(port->id)); - port->stats.tx_len[i] +=3D ((u64)val << 32); + u64_stats_add(&port->stats.tx_len[i], (u64)val << 32); val =3D airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L64_CNT_L(port->id)); - port->stats.tx_len[i++] +=3D val; + u64_stats_add(&port->stats.tx_len[i++], val); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L127_CNT_H(port->id)); - port->stats.tx_len[i] +=3D ((u64)val << 32); + u64_stats_add(&port->stats.tx_len[i], (u64)val << 32); val =3D airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L127_CNT_L(port->id)); - port->stats.tx_len[i++] +=3D val; + u64_stats_add(&port->stats.tx_len[i++], val); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L255_CNT_H(port->id)); - port->stats.tx_len[i] +=3D ((u64)val << 32); + u64_stats_add(&port->stats.tx_len[i], (u64)val << 32); val =3D airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L255_CNT_L(port->id)); - port->stats.tx_len[i++] +=3D val; + u64_stats_add(&port->stats.tx_len[i++], val); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L511_CNT_H(port->id)); - port->stats.tx_len[i] +=3D ((u64)val << 32); + u64_stats_add(&port->stats.tx_len[i], (u64)val << 32); val =3D airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L511_CNT_L(port->id)); - port->stats.tx_len[i++] +=3D val; + u64_stats_add(&port->stats.tx_len[i++], val); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L1023_CNT_H(port->id)); - port->stats.tx_len[i] +=3D ((u64)val << 32); + u64_stats_add(&port->stats.tx_len[i], (u64)val << 32); val =3D airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L1023_CNT_L(port->id)); - port->stats.tx_len[i++] +=3D val; + u64_stats_add(&port->stats.tx_len[i++], val); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_LONG_CNT(port->id)); - port->stats.tx_len[i++] +=3D val; + u64_stats_add(&port->stats.tx_len[i++], val); =20 /* RX */ val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_OK_PKT_CNT_H(port->id)); - port->stats.rx_ok_pkts +=3D ((u64)val << 32); + u64_stats_add(&port->stats.rx_ok_pkts, (u64)val << 32); val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_OK_PKT_CNT_L(port->id)); - port->stats.rx_ok_pkts +=3D val; + u64_stats_add(&port->stats.rx_ok_pkts, val); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_OK_BYTE_CNT_H(port->id)); - port->stats.rx_ok_bytes +=3D ((u64)val << 32); + u64_stats_add(&port->stats.rx_ok_bytes, (u64)val << 32); val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_OK_BYTE_CNT_L(port->id)); - port->stats.rx_ok_bytes +=3D val; + u64_stats_add(&port->stats.rx_ok_bytes, val); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_DROP_CNT(port->id)); - port->stats.rx_drops +=3D val; + u64_stats_add(&port->stats.rx_drops, val); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_BC_CNT(port->id)); - port->stats.rx_broadcast +=3D val; + u64_stats_add(&port->stats.rx_broadcast, val); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_MC_CNT(port->id)); - port->stats.rx_multicast +=3D val; + u64_stats_add(&port->stats.rx_multicast, val); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_ERROR_DROP_CNT(port->id)); - port->stats.rx_errors +=3D val; + u64_stats_add(&port->stats.rx_errors, val); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_CRC_ERR_CNT(port->id)); - port->stats.rx_crc_error +=3D val; + u64_stats_add(&port->stats.rx_crc_error, val); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_OVERFLOW_DROP_CNT(port->id)); - port->stats.rx_over_errors +=3D val; + u64_stats_add(&port->stats.rx_over_errors, val); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_FRAG_CNT(port->id)); - port->stats.rx_fragment +=3D val; + u64_stats_add(&port->stats.rx_fragment, val); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_JABBER_CNT(port->id)); - port->stats.rx_jabber +=3D val; + u64_stats_add(&port->stats.rx_jabber, val); =20 i =3D 0; val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_RUNT_CNT(port->id)); - port->stats.rx_len[i] +=3D val; + u64_stats_add(&port->stats.rx_len[i], val); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_E64_CNT_H(port->id)); - port->stats.rx_len[i] +=3D ((u64)val << 32); + u64_stats_add(&port->stats.rx_len[i], (u64)val << 32); val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_E64_CNT_L(port->id)); - port->stats.rx_len[i++] +=3D val; + u64_stats_add(&port->stats.rx_len[i++], val); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L64_CNT_H(port->id)); - port->stats.rx_len[i] +=3D ((u64)val << 32); + u64_stats_add(&port->stats.rx_len[i], (u64)val << 32); val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L64_CNT_L(port->id)); - port->stats.rx_len[i++] +=3D val; + u64_stats_add(&port->stats.rx_len[i++], val); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L127_CNT_H(port->id)); - port->stats.rx_len[i] +=3D ((u64)val << 32); + u64_stats_add(&port->stats.rx_len[i], (u64)val << 32); val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L127_CNT_L(port->id)); - port->stats.rx_len[i++] +=3D val; + u64_stats_add(&port->stats.rx_len[i++], val); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L255_CNT_H(port->id)); - port->stats.rx_len[i] +=3D ((u64)val << 32); + u64_stats_add(&port->stats.rx_len[i], (u64)val << 32); val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L255_CNT_L(port->id)); - port->stats.rx_len[i++] +=3D val; + u64_stats_add(&port->stats.rx_len[i++], val); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L511_CNT_H(port->id)); - port->stats.rx_len[i] +=3D ((u64)val << 32); + u64_stats_add(&port->stats.rx_len[i], (u64)val << 32); val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L511_CNT_L(port->id)); - port->stats.rx_len[i++] +=3D val; + u64_stats_add(&port->stats.rx_len[i++], val); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L1023_CNT_H(port->id)); - port->stats.rx_len[i] +=3D ((u64)val << 32); + u64_stats_add(&port->stats.rx_len[i], (u64)val << 32); val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L1023_CNT_L(port->id)); - port->stats.rx_len[i++] +=3D val; + u64_stats_add(&port->stats.rx_len[i++], val); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_LONG_CNT(port->id)); - port->stats.rx_len[i++] +=3D val; + u64_stats_add(&port->stats.rx_len[i++], val); =20 /* reset mib counters */ airoha_fe_set(eth, REG_FE_GDM_MIB_CLEAR(port->id), @@ -1795,16 +1795,16 @@ static void airoha_dev_get_stats64(struct net_devic= e *dev, airoha_update_hw_stats(port); do { start =3D u64_stats_fetch_begin(&port->stats.syncp); - storage->rx_packets =3D port->stats.rx_ok_pkts; - storage->tx_packets =3D port->stats.tx_ok_pkts; - storage->rx_bytes =3D port->stats.rx_ok_bytes; - storage->tx_bytes =3D port->stats.tx_ok_bytes; - storage->multicast =3D port->stats.rx_multicast; - storage->rx_errors =3D port->stats.rx_errors; - storage->rx_dropped =3D port->stats.rx_drops; - storage->tx_dropped =3D port->stats.tx_drops; - storage->rx_crc_errors =3D port->stats.rx_crc_error; - storage->rx_over_errors =3D port->stats.rx_over_errors; + storage->rx_packets =3D u64_stats_read(&port->stats.rx_ok_pkts); + storage->tx_packets =3D u64_stats_read(&port->stats.tx_ok_pkts); + storage->rx_bytes =3D u64_stats_read(&port->stats.rx_ok_bytes); + storage->tx_bytes =3D u64_stats_read(&port->stats.tx_ok_bytes); + storage->multicast =3D u64_stats_read(&port->stats.rx_multicast); + storage->rx_errors =3D u64_stats_read(&port->stats.rx_errors); + storage->rx_dropped =3D u64_stats_read(&port->stats.rx_drops); + storage->tx_dropped =3D u64_stats_read(&port->stats.tx_drops); + storage->rx_crc_errors =3D u64_stats_read(&port->stats.rx_crc_error); + storage->rx_over_errors =3D u64_stats_read(&port->stats.rx_over_errors); } while (u64_stats_fetch_retry(&port->stats.syncp, start)); } =20 @@ -2057,13 +2057,13 @@ static void airoha_ethtool_get_mac_stats(struct net= _device *dev, airoha_update_hw_stats(port); do { start =3D u64_stats_fetch_begin(&port->stats.syncp); - stats->FramesTransmittedOK =3D port->stats.tx_ok_pkts; - stats->OctetsTransmittedOK =3D port->stats.tx_ok_bytes; - stats->MulticastFramesXmittedOK =3D port->stats.tx_multicast; - stats->BroadcastFramesXmittedOK =3D port->stats.tx_broadcast; - stats->FramesReceivedOK =3D port->stats.rx_ok_pkts; - stats->OctetsReceivedOK =3D port->stats.rx_ok_bytes; - stats->BroadcastFramesReceivedOK =3D port->stats.rx_broadcast; + stats->FramesTransmittedOK =3D u64_stats_read(&port->stats.tx_ok_pkts); + stats->OctetsTransmittedOK =3D u64_stats_read(&port->stats.tx_ok_bytes); + stats->MulticastFramesXmittedOK =3D u64_stats_read(&port->stats.tx_multi= cast); + stats->BroadcastFramesXmittedOK =3D u64_stats_read(&port->stats.tx_broad= cast); + stats->FramesReceivedOK =3D u64_stats_read(&port->stats.rx_ok_pkts); + stats->OctetsReceivedOK =3D u64_stats_read(&port->stats.rx_ok_bytes); + stats->BroadcastFramesReceivedOK =3D u64_stats_read(&port->stats.rx_broa= dcast); } while (u64_stats_fetch_retry(&port->stats.syncp, start)); } =20 @@ -2098,12 +2098,12 @@ airoha_ethtool_get_rmon_stats(struct net_device *de= v, int i; =20 start =3D u64_stats_fetch_begin(&port->stats.syncp); - stats->fragments =3D hw_stats->rx_fragment; - stats->jabbers =3D hw_stats->rx_jabber; + stats->fragments =3D u64_stats_read(&hw_stats->rx_fragment); + stats->jabbers =3D u64_stats_read(&hw_stats->rx_jabber); for (i =3D 0; i < ARRAY_SIZE(airoha_ethtool_rmon_ranges) - 1; i++) { - stats->hist[i] =3D hw_stats->rx_len[i]; - stats->hist_tx[i] =3D hw_stats->tx_len[i]; + stats->hist[i] =3D u64_stats_read(&hw_stats->rx_len[i]); + stats->hist_tx[i] =3D u64_stats_read(&hw_stats->tx_len[i]); } } while (u64_stats_fetch_retry(&port->stats.syncp, start)); } diff --git a/drivers/net/ethernet/airoha/airoha_eth.h b/drivers/net/etherne= t/airoha/airoha_eth.h index 20e602d61e61..b2e9bd849f8b 100644 --- a/drivers/net/ethernet/airoha/airoha_eth.h +++ b/drivers/net/ethernet/airoha/airoha_eth.h @@ -215,24 +215,24 @@ struct airoha_hw_stats { struct u64_stats_sync syncp; =20 /* get_stats64 */ - u64 rx_ok_pkts; - u64 tx_ok_pkts; - u64 rx_ok_bytes; - u64 tx_ok_bytes; - u64 rx_multicast; - u64 rx_errors; - u64 rx_drops; - u64 tx_drops; - u64 rx_crc_error; - u64 rx_over_errors; + u64_stats_t rx_ok_pkts; + u64_stats_t tx_ok_pkts; + u64_stats_t rx_ok_bytes; + u64_stats_t tx_ok_bytes; + u64_stats_t rx_multicast; + u64_stats_t rx_errors; + u64_stats_t rx_drops; + u64_stats_t tx_drops; + u64_stats_t rx_crc_error; + u64_stats_t rx_over_errors; /* ethtool stats */ - u64 tx_broadcast; - u64 tx_multicast; - u64 tx_len[7]; - u64 rx_broadcast; - u64 rx_fragment; - u64 rx_jabber; - u64 rx_len[7]; + u64_stats_t tx_broadcast; + u64_stats_t tx_multicast; + u64_stats_t tx_len[7]; + u64_stats_t rx_broadcast; + u64_stats_t rx_fragment; + u64_stats_t rx_jabber; + u64_stats_t rx_len[7]; }; =20 enum { --=20 2.51.0