From 0078930e0c374d327cd3281e5e2f7ff97b40b335 Mon Sep 17 00:00:00 2001 From: Chukun Pan Date: Sun, 4 Aug 2024 16:15:12 +0800 Subject: [PATCH] r8168: 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: Álvaro Fernández Rojas Signed-off-by: Chukun Pan --- src\/r8168.h | 2 ++ src\/r8168_n.c | 44 +++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 43 insertions(+), 3 deletions(-) --- a\/src\/r8168.h +++ b\/src\/r8168.h @@ -1480,6 +1480,8 @@ enum RTL8168_register_content { LinkStatus = 0x02, FullDup = 0x01, +#define RTL8168_FULL_DUPLEX_MASK (_1000bpsF | FullDup) + \/* DBG_reg *\/ Fix_Nak_1 = (1 << 4), Fix_Nak_2 = (1 << 3), --- a\/src\/r8168_n.c +++ b\/src\/r8168_n.c @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include @@ -5527,6 +5528,38 @@ rtl8168_link_down_patch(struct net_devic #endif } +static unsigned int rtl8168_phy_duplex(u8 status) +{ + unsigned int duplex = DUPLEX_UNKNOWN; + + if (status & LinkStatus) { + if (status & RTL8168_FULL_DUPLEX_MASK) + duplex = DUPLEX_FULL; + else + duplex = DUPLEX_HALF; + } + + return duplex; +} + +static int rtl8168_phy_speed(u8 status) +{ + int speed = SPEED_UNKNOWN; + + if (status & LinkStatus) { + if (status & _1000bpsF) + speed = SPEED_1000; + else if (status & _100bps) + speed = SPEED_100; + else if (status & _10bps) + speed = SPEED_10; + else if (eee_giga_lite) + speed = SPEED_1000; + } + + return speed; +} + static void rtl8168_check_link_status(struct net_device *dev) { @@ -5546,11 +5579,18 @@ rtl8168_check_link_status(struct net_dev if (link_status_on) { rtl8168_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 u8 phy_status = RTL_R8(tp, PHYstatus); + const unsigned int phy_duplex = rtl8168_phy_duplex(phy_status); + const int phy_speed = rtl8168_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); rtl8168_link_down_patch(dev); }

Other Versions#

Patches#