From nobody Sun Apr 5 20:06:37 2026 Received: from bkemail.birger-koblitz.de (bkemail.birger-koblitz.de [23.88.97.239]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B2CB2393DCA; Sat, 4 Apr 2026 07:57:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=23.88.97.239 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775289473; cv=none; b=OHQ+iyo58pAWSKX4OEh0yEsPoivXceFy5IVHXICQbRh5CjoS0SwDPOUKes52LLCVtXsSrkp6hv6V6bnR48HrWLPm8CHokqx3n4EkpbA2t+IL9PECNN2zZ9KMXRvD9GcvJ42fg6lVB/8SF7fF9Tckb0qamMJn2WRqLmIRhBvmvt0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775289473; c=relaxed/simple; bh=sb5Ngnp3olx7xp8GfpV8ITgWjMob4+oB5U/lUnEb5Z4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=iAkCsBVZ9b66SMxRAHSA2uxGWzjNUyC2WvJ0IK2MxU9bk+Id2IHK8LDzLLLiRhjUP7QDb6CQbRuIkeSfxj3fpKer+URxj2/ixjes25BQ+qBkuYwO5bzoCk/XlMCUor0H8ORT46Yn0HK/ehypBvyqWKJkXUhkvazEKXHoBbxRtXw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=birger-koblitz.de; spf=pass smtp.mailfrom=birger-koblitz.de; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b=ym0UbaLH; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b=kXNs1/eu; arc=none smtp.client-ip=23.88.97.239 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=birger-koblitz.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=birger-koblitz.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b="ym0UbaLH"; dkim=pass (2048-bit key) header.d=birger-koblitz.de header.i=@birger-koblitz.de header.b="kXNs1/eu" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1775289465; bh=sb5Ngnp3olx7xp8GfpV8ITgWjMob4+oB5U/lUnEb5Z4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=ym0UbaLHKAUCoraJfqoLerTkJfDY9r0Ehmzp3KIq9mH6uIuhZxI/X03FknVCuQzlz dcpnPxtj5bbYQmlAPsinRye+jzbRPE2kR8vYJJg+16xVKObzWL5yFOYOzpDH653ItH X/cq4ui7kLTby5xXXmO5xherJeCCYaPnhthe+knrv/qXUIj+mC8vB2oMokb8YrqJoW s0SJ+ijacTSox4zyH+FJZeW1mOezJYBcjOeb+vAXoYOhrhoQe2GXbhHO+OL9+4TEWq Cv2ucmMYlZlBAT78zXIooqdWUslp51wXi86dhoqIwWErq9qW1YxwtI/OwS9HZg3maT BSsoxDSrg1bdQ== Received: by bkemail.birger-koblitz.de (Postfix, from userid 109) id 6A4A940931; Sat, 4 Apr 2026 07:57:45 +0000 (UTC) X-Spam-Level: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=birger-koblitz.de; s=default; t=1775289463; bh=sb5Ngnp3olx7xp8GfpV8ITgWjMob4+oB5U/lUnEb5Z4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=kXNs1/euI9L/46HWXifqtshWEyMlu73izKMutlFo3P4d0qg/lNdW6Q+zaPUOyFH+J hgxbVV6KglFo4BPWcHp0PKxcu1I4M8QFJxYHKXmHAfgJi6IqR+8hS77DKC2b4CJ2J9 OsWtouX21zfvkqrEbSgHP/1eWEmJb5wrp/W/F98+ihIW4PT/d1vSPt/fmn2SbIeI2I KNY0PYKIpK1j8CSqzEvdrX5/g5fdB5yrttNBLbXu7dEVxjH7nJ4duom0DUXIjBTwy/ wf5O6QSjrL+I+vugMt5vSPejCFJHvK+nAUikc9m4uFbwsyvaCz0SxQx6Zl+YiWc8hh PU8Z+qcOid/Ww== Received: from DebianDesktop.lan (p200300c69f04eb0000000000000001c8.dip0.t-ipconnect.de [IPv6:2003:c6:9f04:eb00::1c8]) by bkemail.birger-koblitz.de (Postfix) with ESMTPSA id 8A4FF40906; Sat, 4 Apr 2026 07:57:43 +0000 (UTC) From: Birger Koblitz Date: Sat, 04 Apr 2026 09:57:42 +0200 Subject: [PATCH net-next v7 1/2] r8152: Add support for 5Gbit Link Speeds and EEE Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260404-rtl8157_next-v7-1-039121318f23@birger-koblitz.de> References: <20260404-rtl8157_next-v7-0-039121318f23@birger-koblitz.de> In-Reply-To: <20260404-rtl8157_next-v7-0-039121318f23@birger-koblitz.de> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Chih Kai Hsu , Birger Koblitz X-Mailer: b4 0.14.2 The RTL8157 supports 5GBit Link speeds. Add support for this speed in the setup and setting/getting through ethtool. Also add 5GBit EEE. Add functionality for setup and ethtool get/set methods. Signed-off-by: Birger Koblitz --- drivers/net/usb/r8152.c | 100 +++++++++++++++++++++++++++++++++++++++-----= ---- 1 file changed, 82 insertions(+), 18 deletions(-) diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index 1765da5bd6cfbefb57d02d4f22b6d8498ed91e79..c81bb788ac3424bd22108e83a20= ff51e21c23f60 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -606,6 +606,7 @@ enum spd_duplex { FORCE_100M_FULL, FORCE_1000M_FULL, NWAY_2500M_FULL, + NWAY_5000M_FULL, }; =20 /* OCP_ALDPS_CONFIG */ @@ -727,6 +728,7 @@ enum spd_duplex { #define BP4_SUPER_ONLY 0x1578 /* RTL_VER_04 only */ =20 enum rtl_register_content { + _5000bps =3D BIT(12), _2500bps =3D BIT(10), _1250bps =3D BIT(9), _500bps =3D BIT(8), @@ -740,6 +742,7 @@ enum rtl_register_content { }; =20 #define is_speed_2500(_speed) (((_speed) & (_2500bps | LINK_STATUS)) =3D= =3D (_2500bps | LINK_STATUS)) +#define is_speed_5000(_speed) (((_speed) & (_5000bps | LINK_STATUS)) =3D= =3D (_5000bps | LINK_STATUS)) #define is_flow_control(_speed) (((_speed) & (_tx_flow | _rx_flow)) =3D=3D= (_tx_flow | _rx_flow)) =20 #define RTL8152_MAX_TX 4 @@ -946,6 +949,7 @@ struct r8152 { unsigned int pipe_in, pipe_out, pipe_intr, pipe_ctrl_in, pipe_ctrl_out; =20 u32 support_2500full:1; + u32 support_5000full:1; u32 lenovo_macpassthru:1; u32 dell_tb_rx_agg_bug:1; u16 ocp_base; @@ -1196,6 +1200,7 @@ enum tx_csum_stat { #define RTL_ADVERTISED_1000_HALF BIT(4) #define RTL_ADVERTISED_1000_FULL BIT(5) #define RTL_ADVERTISED_2500_FULL BIT(6) +#define RTL_ADVERTISED_5000_FULL BIT(7) =20 /* Maximum number of multicast addresses to filter (vs. Rx-all-multicast). * The RTL chips use a 64 element hash table based on the Ethernet CRC. @@ -5421,12 +5426,23 @@ static void r8153_eee_en(struct r8152 *tp, bool ena= ble) =20 static void r8156_eee_en(struct r8152 *tp, bool enable) { + u16 config; + r8153_eee_en(tp, enable); =20 + config =3D ocp_reg_read(tp, OCP_EEE_ADV2); + if (enable && (tp->eee_adv2 & MDIO_EEE_2_5GT)) - ocp_reg_set_bits(tp, OCP_EEE_ADV2, MDIO_EEE_2_5GT); + config |=3D MDIO_EEE_2_5GT; else - ocp_reg_clr_bits(tp, OCP_EEE_ADV2, MDIO_EEE_2_5GT); + config &=3D ~MDIO_EEE_2_5GT; + + if (enable && (tp->eee_adv2 & MDIO_EEE_5GT)) + config |=3D MDIO_EEE_5GT; + else + config &=3D ~MDIO_EEE_5GT; + + ocp_reg_write(tp, OCP_EEE_ADV2, config); } =20 static void rtl_eee_enable(struct r8152 *tp, bool enable) @@ -6190,9 +6206,13 @@ static int rtl8152_set_speed(struct r8152 *tp, u8 au= toneg, u32 speed, u8 duplex, =20 if (tp->support_2500full) support |=3D RTL_ADVERTISED_2500_FULL; + + if (tp->support_5000full) + support |=3D RTL_ADVERTISED_5000_FULL; } =20 - if (!(advertising & support)) + advertising &=3D support; + if (!advertising) return -EINVAL; =20 orig =3D r8152_mdio_read(tp, MII_ADVERTISE); @@ -6235,15 +6255,20 @@ static int rtl8152_set_speed(struct r8152 *tp, u8 a= utoneg, u32 speed, u8 duplex, r8152_mdio_write(tp, MII_CTRL1000, new1); } =20 - if (tp->support_2500full) { + if (tp->support_2500full || tp->support_5000full) { orig =3D ocp_reg_read(tp, OCP_10GBT_CTRL); - new1 =3D orig & ~MDIO_AN_10GBT_CTRL_ADV2_5G; + new1 =3D orig & ~(MDIO_AN_10GBT_CTRL_ADV2_5G | MDIO_AN_10GBT_CTRL_ADV5G= ); =20 if (advertising & RTL_ADVERTISED_2500_FULL) { new1 |=3D MDIO_AN_10GBT_CTRL_ADV2_5G; tp->ups_info.speed_duplex =3D NWAY_2500M_FULL; } =20 + if (advertising & RTL_ADVERTISED_5000_FULL) { + new1 |=3D MDIO_AN_10GBT_CTRL_ADV5G; + tp->ups_info.speed_duplex =3D NWAY_5000M_FULL; + } + if (orig !=3D new1) ocp_reg_write(tp, OCP_10GBT_CTRL, new1); } @@ -8220,17 +8245,38 @@ int rtl8152_get_link_ksettings(struct net_device *n= etdev, linkmode_mod_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, cmd->link_modes.supported, tp->support_2500full); =20 - if (tp->support_2500full) { - linkmode_mod_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, - cmd->link_modes.advertising, - ocp_reg_read(tp, OCP_10GBT_CTRL) & MDIO_AN_10GBT_CTRL_ADV2_5G); + linkmode_mod_bit(ETHTOOL_LINK_MODE_5000baseT_Full_BIT, + cmd->link_modes.supported, tp->support_5000full); + + if (tp->support_2500full || tp->support_5000full) { + u16 ocp_10gbt_ctrl =3D ocp_reg_read(tp, OCP_10GBT_CTRL); + u16 ocp_10gbt_stat =3D ocp_reg_read(tp, OCP_10GBT_STAT); + + if (tp->support_2500full) { + linkmode_mod_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, + cmd->link_modes.advertising, + ocp_10gbt_ctrl & MDIO_AN_10GBT_CTRL_ADV2_5G); + + linkmode_mod_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, + cmd->link_modes.lp_advertising, + ocp_10gbt_stat & MDIO_AN_10GBT_STAT_LP2_5G); + + if (is_speed_2500(rtl8152_get_speed(tp))) + cmd->base.speed =3D SPEED_2500; + } + + if (tp->support_5000full) { + linkmode_mod_bit(ETHTOOL_LINK_MODE_5000baseT_Full_BIT, + cmd->link_modes.advertising, + ocp_10gbt_ctrl & MDIO_AN_10GBT_CTRL_ADV5G); =20 - linkmode_mod_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, - cmd->link_modes.lp_advertising, - ocp_reg_read(tp, OCP_10GBT_STAT) & MDIO_AN_10GBT_STAT_LP2_5G); + linkmode_mod_bit(ETHTOOL_LINK_MODE_5000baseT_Full_BIT, + cmd->link_modes.lp_advertising, + ocp_10gbt_stat & MDIO_AN_10GBT_STAT_LP5G); =20 - if (is_speed_2500(rtl8152_get_speed(tp))) - cmd->base.speed =3D SPEED_2500; + if (is_speed_5000(rtl8152_get_speed(tp))) + cmd->base.speed =3D SPEED_5000; + } } =20 mutex_unlock(&tp->control); @@ -8280,6 +8326,10 @@ static int rtl8152_set_link_ksettings(struct net_dev= ice *dev, cmd->link_modes.advertising)) advertising |=3D RTL_ADVERTISED_2500_FULL; =20 + if (test_bit(ETHTOOL_LINK_MODE_5000baseT_Full_BIT, + cmd->link_modes.advertising)) + advertising |=3D RTL_ADVERTISED_5000_FULL; + mutex_lock(&tp->control); =20 ret =3D rtl8152_set_speed(tp, cmd->base.autoneg, cmd->base.speed, @@ -8397,7 +8447,7 @@ static int r8152_set_eee(struct r8152 *tp, struct eth= tool_keee *eee) =20 tp->eee_en =3D eee->eee_enabled; tp->eee_adv =3D val; - if (tp->support_2500full) { + if (tp->support_2500full || tp->support_5000full) { val =3D linkmode_to_mii_eee_cap2_t(eee->advertised); tp->eee_adv2 =3D val; } @@ -8421,19 +8471,28 @@ static int r8153_get_eee(struct r8152 *tp, struct e= thtool_keee *eee) val =3D ocp_reg_read(tp, OCP_EEE_LPABLE); mii_eee_cap1_mod_linkmode_t(eee->lp_advertised, val); =20 - if (tp->support_2500full) { - linkmode_set_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, eee->supported); - + if (tp->support_2500full || tp->support_5000full) { val =3D ocp_reg_read(tp, OCP_EEE_ADV2); mii_eee_cap2_mod_linkmode_adv_t(eee->advertised, val); =20 val =3D ocp_reg_read(tp, OCP_EEE_LPABLE2); mii_eee_cap2_mod_linkmode_adv_t(eee->lp_advertised, val); + } + + if (tp->support_2500full) { + linkmode_set_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, eee->supported); =20 if (speed & _2500bps) linkmode_set_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, common); } =20 + if (tp->support_5000full) { + linkmode_set_bit(ETHTOOL_LINK_MODE_5000baseT_Full_BIT, eee->supported); + + if (speed & _5000bps) + linkmode_set_bit(ETHTOOL_LINK_MODE_5000baseT_Full_BIT, common); + } + eee->eee_enabled =3D tp->eee_en; =20 if (speed & _1000bps) @@ -9374,6 +9433,11 @@ static int rtl8152_probe_once(struct usb_interface *= intf, } else { tp->speed =3D SPEED_1000; } + if (tp->support_5000full && + tp->udev->speed >=3D USB_SPEED_SUPER) { + tp->speed =3D SPEED_5000; + tp->advertising |=3D RTL_ADVERTISED_5000_FULL; + } tp->advertising |=3D RTL_ADVERTISED_1000_FULL; } tp->duplex =3D DUPLEX_FULL; --=20 2.47.3