mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2025-05-20 13:17:55 +00:00
94dbbe3496
Upstream e2015942e90a couldn't be backported to 6.6 because the following symbols were missing: - disable_work - disable_work_sync - enable_work Seee2015942e9Upstream 34e5ededf4b8 couldn't be backported to 6.6 because the following symbol was missing: - pcim_iomap_region See34e5ededf4Reorganize patch numbers now that < 6.12 patches are no longer needed. The following patches still differ from upstream: - e340bff27e63 phy_set_eee_broken symbol is missing in 6.12 https://github.com/torvalds/linux/commit/e340bff27e63 The following patches can't be backported to 6.12 due to missing symbols: - 5e7a74b6a357 phy_disable_eee_mode symbol is missing in 6.12 https://github.com/torvalds/linux/commit/5e7a74b6a357 Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
131 lines
4.3 KiB
Diff
131 lines
4.3 KiB
Diff
From e3fc5139bd8ffaa1498adc21be4e8ecbc6aed508 Mon Sep 17 00:00:00 2001
|
|
From: Heiner Kallweit <hkallweit1@gmail.com>
|
|
Date: Sun, 13 Oct 2024 11:17:39 +0200
|
|
Subject: [PATCH] r8169: implement additional ethtool stats ops
|
|
|
|
This adds support for ethtool standard statistics, and makes use of the
|
|
extended hardware statistics being available from RTl8125.
|
|
|
|
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
|
|
Reviewed-by: Simon Horman <horms@kernel.org>
|
|
Link: https://patch.msgid.link/58e0da73-a7dd-4be3-82ae-d5b3f9069bde@gmail.com
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/ethernet/realtek/r8169_main.c | 82 +++++++++++++++++++++++
|
|
1 file changed, 82 insertions(+)
|
|
|
|
--- a/drivers/net/ethernet/realtek/r8169_main.c
|
|
+++ b/drivers/net/ethernet/realtek/r8169_main.c
|
|
@@ -2160,6 +2160,19 @@ static void rtl8169_get_ringparam(struct
|
|
data->tx_pending = NUM_TX_DESC;
|
|
}
|
|
|
|
+static void rtl8169_get_pause_stats(struct net_device *dev,
|
|
+ struct ethtool_pause_stats *pause_stats)
|
|
+{
|
|
+ struct rtl8169_private *tp = netdev_priv(dev);
|
|
+
|
|
+ if (!rtl_is_8125(tp))
|
|
+ return;
|
|
+
|
|
+ rtl8169_update_counters(tp);
|
|
+ pause_stats->tx_pause_frames = le32_to_cpu(tp->counters->tx_pause_on);
|
|
+ pause_stats->rx_pause_frames = le32_to_cpu(tp->counters->rx_pause_on);
|
|
+}
|
|
+
|
|
static void rtl8169_get_pauseparam(struct net_device *dev,
|
|
struct ethtool_pauseparam *data)
|
|
{
|
|
@@ -2186,6 +2199,69 @@ static int rtl8169_set_pauseparam(struct
|
|
return 0;
|
|
}
|
|
|
|
+static void rtl8169_get_eth_mac_stats(struct net_device *dev,
|
|
+ struct ethtool_eth_mac_stats *mac_stats)
|
|
+{
|
|
+ struct rtl8169_private *tp = netdev_priv(dev);
|
|
+
|
|
+ rtl8169_update_counters(tp);
|
|
+
|
|
+ mac_stats->FramesTransmittedOK =
|
|
+ le64_to_cpu(tp->counters->tx_packets);
|
|
+ mac_stats->SingleCollisionFrames =
|
|
+ le32_to_cpu(tp->counters->tx_one_collision);
|
|
+ mac_stats->MultipleCollisionFrames =
|
|
+ le32_to_cpu(tp->counters->tx_multi_collision);
|
|
+ mac_stats->FramesReceivedOK =
|
|
+ le64_to_cpu(tp->counters->rx_packets);
|
|
+ mac_stats->AlignmentErrors =
|
|
+ le16_to_cpu(tp->counters->align_errors);
|
|
+ mac_stats->FramesLostDueToIntMACXmitError =
|
|
+ le64_to_cpu(tp->counters->tx_errors);
|
|
+ mac_stats->BroadcastFramesReceivedOK =
|
|
+ le64_to_cpu(tp->counters->rx_broadcast);
|
|
+ mac_stats->MulticastFramesReceivedOK =
|
|
+ le32_to_cpu(tp->counters->rx_multicast);
|
|
+
|
|
+ if (!rtl_is_8125(tp))
|
|
+ return;
|
|
+
|
|
+ mac_stats->AlignmentErrors =
|
|
+ le32_to_cpu(tp->counters->align_errors32);
|
|
+ mac_stats->OctetsTransmittedOK =
|
|
+ le64_to_cpu(tp->counters->tx_octets);
|
|
+ mac_stats->LateCollisions =
|
|
+ le32_to_cpu(tp->counters->tx_late_collision);
|
|
+ mac_stats->FramesAbortedDueToXSColls =
|
|
+ le32_to_cpu(tp->counters->tx_aborted32);
|
|
+ mac_stats->OctetsReceivedOK =
|
|
+ le64_to_cpu(tp->counters->rx_octets);
|
|
+ mac_stats->FramesLostDueToIntMACRcvError =
|
|
+ le32_to_cpu(tp->counters->rx_mac_error);
|
|
+ mac_stats->MulticastFramesXmittedOK =
|
|
+ le64_to_cpu(tp->counters->tx_multicast64);
|
|
+ mac_stats->BroadcastFramesXmittedOK =
|
|
+ le64_to_cpu(tp->counters->tx_broadcast64);
|
|
+ mac_stats->MulticastFramesReceivedOK =
|
|
+ le64_to_cpu(tp->counters->rx_multicast64);
|
|
+ mac_stats->FrameTooLongErrors =
|
|
+ le32_to_cpu(tp->counters->rx_frame_too_long);
|
|
+}
|
|
+
|
|
+static void rtl8169_get_eth_ctrl_stats(struct net_device *dev,
|
|
+ struct ethtool_eth_ctrl_stats *ctrl_stats)
|
|
+{
|
|
+ struct rtl8169_private *tp = netdev_priv(dev);
|
|
+
|
|
+ if (!rtl_is_8125(tp))
|
|
+ return;
|
|
+
|
|
+ rtl8169_update_counters(tp);
|
|
+
|
|
+ ctrl_stats->UnsupportedOpcodesReceived =
|
|
+ le32_to_cpu(tp->counters->rx_unknown_opcode);
|
|
+}
|
|
+
|
|
static const struct ethtool_ops rtl8169_ethtool_ops = {
|
|
.supported_coalesce_params = ETHTOOL_COALESCE_USECS |
|
|
ETHTOOL_COALESCE_MAX_FRAMES,
|
|
@@ -2207,8 +2283,11 @@ static const struct ethtool_ops rtl8169_
|
|
.get_link_ksettings = phy_ethtool_get_link_ksettings,
|
|
.set_link_ksettings = phy_ethtool_set_link_ksettings,
|
|
.get_ringparam = rtl8169_get_ringparam,
|
|
+ .get_pause_stats = rtl8169_get_pause_stats,
|
|
.get_pauseparam = rtl8169_get_pauseparam,
|
|
.set_pauseparam = rtl8169_set_pauseparam,
|
|
+ .get_eth_mac_stats = rtl8169_get_eth_mac_stats,
|
|
+ .get_eth_ctrl_stats = rtl8169_get_eth_ctrl_stats,
|
|
};
|
|
|
|
static enum mac_version rtl8169_get_mac_version(u16 xid, bool gmii)
|
|
@@ -3893,6 +3972,9 @@ static void rtl_hw_start_8125(struct rtl
|
|
break;
|
|
}
|
|
|
|
+ /* enable extended tally counter */
|
|
+ r8168_mac_ocp_modify(tp, 0xea84, 0, BIT(1) | BIT(0));
|
|
+
|
|
rtl_hw_config(tp);
|
|
}
|
|
|