From fdd8001f00fa92c40ef8f09da46d1299d3d217c2 Mon Sep 17 00:00:00 2001 From: Dong Yibo Date: Mon, 23 Jun 2025 14:38:08 +0800 Subject: [PATCH] RNPGBE: NET: Fix dmesg 'unknow speed' show when 1000M mucse inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/ICH3PB CVE: NA -------------------------------- when rnpgbe up 1000M, dmesg show mistake link this: [17.191643] rnpgbe 0000:82:00.3 enp130s0f3: NIC Link is Up unknown speed, Full Duplex, Flow Control: RX/TX Fixes: eba3cbcfeafe ("drivers: initial support for rnpgbe drivers from Mucse Technology") Signed-off-by: Dong Yibo --- drivers/net/ethernet/mucse/rnpgbe/rnpgbe_chip.c | 4 +++- drivers/net/ethernet/mucse/rnpgbe/rnpgbe_main.c | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/mucse/rnpgbe/rnpgbe_chip.c b/drivers/net/ethernet/mucse/rnpgbe/rnpgbe_chip.c index 759173472072..98388c039db8 100644 --- a/drivers/net/ethernet/mucse/rnpgbe/rnpgbe_chip.c +++ b/drivers/net/ethernet/mucse/rnpgbe/rnpgbe_chip.c @@ -3257,7 +3257,9 @@ static const struct ethtool_ops rnp500_ethtool_ops = { .get_ethtool_stats = rnp500_get_ethtool_stats, .get_coalesce = rnpgbe_get_coalesce, .set_coalesce = rnpgbe_set_coalesce, - .supported_coalesce_params = ETHTOOL_COALESCE_USECS, + .supported_coalesce_params = ETHTOOL_COALESCE_USECS | + ETHTOOL_COALESCE_MAX_FRAMES_IRQ | + ETHTOOL_COALESCE_MAX_FRAMES, .get_rxnfc = rnpgbe_get_rxnfc, .set_rxnfc = rnpgbe_set_rxnfc, .get_eee = rnpgbe_get_eee, diff --git a/drivers/net/ethernet/mucse/rnpgbe/rnpgbe_main.c b/drivers/net/ethernet/mucse/rnpgbe/rnpgbe_main.c index 98c9abe76f2c..2a891bb35078 100644 --- a/drivers/net/ethernet/mucse/rnpgbe/rnpgbe_main.c +++ b/drivers/net/ethernet/mucse/rnpgbe/rnpgbe_main.c @@ -4524,7 +4524,7 @@ static void rnpgbe_watchdog_update_link(struct rnpgbe_adapter *adapter) hw->ops.check_link(hw, &link_speed, &link_up, &duplex, false); } else { /* always assume link is up, if no check link function */ - link_speed = RNP_LINK_SPEED_10GB_FULL; + link_speed = RNP_LINK_SPEED_1GB_FULL; link_up = true; } @@ -4570,7 +4570,7 @@ static void rnpgbe_watchdog_update_link(struct rnpgbe_adapter *adapter) hw->ops.set_pause_mode(hw); e_info(drv, "NIC Link is Up %s, %s Duplex, Flow Control: %s\n", - (link_speed == RNP_LINK_SPEED_10GB_FULL ? + (link_speed == RNP_LINK_SPEED_1GB_FULL ? "1000 Mbps" : (link_speed == RNP_LINK_SPEED_100_FULL ? "100 Mbps" : -- Gitee