101 lines
3.2 KiB
Diff
101 lines
3.2 KiB
Diff
|
From e351ac87bc3135e8555587e0bf80efb248ade0b7 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Chukun Pan <amadeus@jmu.edu.cn>
|
||
|
|
Date: Sun, 4 Aug 2024 21:16:23 +0800
|
||
|
|
Subject: [PATCH] r8125: print link speed and duplex mode
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Like other Ethernet drivers, print link speed and duplex mode
|
||
|
|
when the interface is up. Formatting output at the same time.
|
||
|
|
|
||
|
|
Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn>
|
||
|
|
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
|
||
|
|
---
|
||
|
|
src/r8125.h | 2 ++
|
||
|
|
src/r8125_n.c | 46 +++++++++++++++++++++++++++++++++++++++++++---
|
||
|
|
2 files changed, 45 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
--- a/src/r8125.h
|
||
|
|
+++ b/src/r8125.h
|
||
|
|
@@ -1563,6 +1563,8 @@ enum RTL8125_register_content {
|
||
|
|
LinkStatus = 0x02,
|
||
|
|
FullDup = 0x01,
|
||
|
|
|
||
|
|
+#define RTL8125_FULL_DUPLEX_MASK (_2500bpsF | _1000bpsF | FullDup)
|
||
|
|
+
|
||
|
|
/* DBG_reg */
|
||
|
|
Fix_Nak_1 = (1 << 4),
|
||
|
|
Fix_Nak_2 = (1 << 3),
|
||
|
|
--- a/src/r8125_n.c
|
||
|
|
+++ b/src/r8125_n.c
|
||
|
|
@@ -39,6 +39,7 @@
|
||
|
|
#include <linux/module.h>
|
||
|
|
#include <linux/version.h>
|
||
|
|
#include <linux/pci.h>
|
||
|
|
+#include <linux/phy.h>
|
||
|
|
#include <linux/netdevice.h>
|
||
|
|
#include <linux/etherdevice.h>
|
||
|
|
#include <linux/delay.h>
|
||
|
|
@@ -5112,6 +5113,38 @@ rtl8125_link_down_patch(struct net_devic
|
||
|
|
#endif
|
||
|
|
}
|
||
|
|
|
||
|
|
+static unsigned int rtl8125_phy_duplex(u16 status)
|
||
|
|
+{
|
||
|
|
+ unsigned int duplex = DUPLEX_UNKNOWN;
|
||
|
|
+
|
||
|
|
+ if (status & LinkStatus) {
|
||
|
|
+ if (status & RTL8125_FULL_DUPLEX_MASK)
|
||
|
|
+ duplex = DUPLEX_FULL;
|
||
|
|
+ else
|
||
|
|
+ duplex = DUPLEX_HALF;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ return duplex;
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
+static int rtl8125_phy_speed(u16 status)
|
||
|
|
+{
|
||
|
|
+ int speed = SPEED_UNKNOWN;
|
||
|
|
+
|
||
|
|
+ if (status & LinkStatus) {
|
||
|
|
+ if (status & _2500bpsF)
|
||
|
|
+ speed = SPEED_2500;
|
||
|
|
+ else if (status & _1000bpsF)
|
||
|
|
+ speed = SPEED_1000;
|
||
|
|
+ else if (status & _100bps)
|
||
|
|
+ speed = SPEED_100;
|
||
|
|
+ else if (status & _10bps)
|
||
|
|
+ speed = SPEED_10;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ return speed;
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
static void
|
||
|
|
_rtl8125_check_link_status(struct net_device *dev)
|
||
|
|
{
|
||
|
|
@@ -5120,11 +5153,18 @@ _rtl8125_check_link_status(struct net_de
|
||
|
|
if (tp->link_ok(dev)) {
|
||
|
|
rtl8125_link_on_patch(dev);
|
||
|
|
|
||
|
|
- if (netif_msg_ifup(tp))
|
||
|
|
- printk(KERN_INFO PFX "%s: link up\n", dev->name);
|
||
|
|
+ if (netif_msg_ifup(tp)) {
|
||
|
|
+ const u16 phy_status = RTL_R16(tp, PHYstatus);
|
||
|
|
+ const unsigned int phy_duplex = rtl8125_phy_duplex(phy_status);
|
||
|
|
+ const int phy_speed = rtl8125_phy_speed(phy_status);
|
||
|
|
+ printk(KERN_INFO PFX "%s: Link is Up - %s/%s\n",
|
||
|
|
+ dev->name,
|
||
|
|
+ phy_speed_to_str(phy_speed),
|
||
|
|
+ phy_duplex_to_str(phy_duplex));
|
||
|
|
+ }
|
||
|
|
} else {
|
||
|
|
if (netif_msg_ifdown(tp))
|
||
|
|
- printk(KERN_INFO PFX "%s: link down\n", dev->name);
|
||
|
|
+ printk(KERN_INFO PFX "%s: Link is Down\n", dev->name);
|
||
|
|
|
||
|
|
rtl8125_link_down_patch(dev);
|
||
|
|
}
|