From d9b7f9c144d9c062547bfb384f24c03a599ec14e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=3D=3FUTF-8=3Fq=3F=3DC3=3D81lvaro=3D20Fern=3DC3=3DA1ndez?= =?UTF-8?q?=3D20Rojas=3F=3D?= Date: Sun, 8 Jun 2025 12:58:37 +0200 Subject: [PATCH] kernel: r8125: update to v9.016.00 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changelog: https://github.com/openwrt/rtl8125/compare/9.015.00...9.016.00 Signed-off-by: Álvaro Fernández Rojas --- package/kernel/r8125/Makefile | 8 +- .../patches/100-kernel-6.9-support.patch | 101 ------------------ ...125-print-link-speed-and-duplex-mode.patch | 6 +- ...-r8125-add-LED-configuration-from-OF.patch | 6 +- 4 files changed, 10 insertions(+), 111 deletions(-) delete mode 100644 package/kernel/r8125/patches/100-kernel-6.9-support.patch diff --git a/package/kernel/r8125/Makefile b/package/kernel/r8125/Makefile index 703974040..517ca19bd 100644 --- a/package/kernel/r8125/Makefile +++ b/package/kernel/r8125/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=r8125 -PKG_VERSION:=9.015.00 +PKG_VERSION:=9.016.00 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://github.com/openwrt/rtl8125/releases/download/$(PKG_VERSION) -PKG_HASH:=7d6906336c3ad960c3e7c0299ad655659d7110bdc933c5b568b7f2536cb8ffc3 +PKG_HASH:=cd1955dd07d2f5a6faaa210ffc4e8af992421295a32ab6ddcfa759bed9eba922 PKG_BUILD_PARALLEL:=1 PKG_LICENSE:=GPLv2 @@ -34,8 +34,8 @@ endef ifeq ($(BUILD_VARIANT),rss) PKG_MAKE_FLAGS += \ - ENABLE_RSS_SUPPORT=y \ - ENABLE_MULTIPLE_TX_QUEUE=y + ENABLE_MULTIPLE_TX_QUEUE=y \ + ENABLE_RSS_SUPPORT=y endif PKG_MAKE_FLAGS += CONFIG_ASPM=n diff --git a/package/kernel/r8125/patches/100-kernel-6.9-support.patch b/package/kernel/r8125/patches/100-kernel-6.9-support.patch deleted file mode 100644 index 1fde48700..000000000 --- a/package/kernel/r8125/patches/100-kernel-6.9-support.patch +++ /dev/null @@ -1,101 +0,0 @@ ---- a/src/r8125_n.c -+++ b/src/r8125_n.c -@@ -7314,7 +7314,11 @@ out: - } - #else - static int -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0) -+rtl_ethtool_get_eee(struct net_device *net, struct ethtool_keee *edata) -+#else - rtl_ethtool_get_eee(struct net_device *net, struct ethtool_eee *edata) -+#endif - { - struct rtl8125_private *tp = netdev_priv(net); - struct ethtool_eee *eee = &tp->eee; -@@ -7347,9 +7351,15 @@ rtl_ethtool_get_eee(struct net_device *n - - edata->eee_enabled = !!val; - edata->eee_active = !!(supported & adv & lp); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0) -+ ethtool_convert_legacy_u32_to_link_mode(edata->supported, supported); -+ ethtool_convert_legacy_u32_to_link_mode(edata->advertised, adv); -+ ethtool_convert_legacy_u32_to_link_mode(edata->lp_advertised, lp); -+#else - edata->supported = supported; - edata->advertised = adv; - edata->lp_advertised = lp; -+#endif - edata->tx_lpi_enabled = edata->eee_enabled; - edata->tx_lpi_timer = tx_lpi_timer; - -@@ -7357,11 +7367,18 @@ rtl_ethtool_get_eee(struct net_device *n - } - - static int -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0) -+rtl_ethtool_set_eee(struct net_device *net, struct ethtool_keee *edata) -+#else - rtl_ethtool_set_eee(struct net_device *net, struct ethtool_eee *edata) -+#endif - { - struct rtl8125_private *tp = netdev_priv(net); - struct ethtool_eee *eee = &tp->eee; - u64 advertising; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0) -+ u32 adv; -+#endif - int rc = 0; - - if (!HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp) || -@@ -7393,6 +7410,18 @@ rtl_ethtool_set_eee(struct net_device *n - */ - - advertising = tp->advertising; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0) -+ ethtool_convert_link_mode_to_legacy_u32(&adv, edata->advertised); -+ if (linkmode_empty(edata->advertised)) { -+ adv = advertising & eee->supported; -+ ethtool_convert_legacy_u32_to_link_mode(edata->advertised, adv); -+ } else if (!linkmode_empty(edata->advertised) & ~advertising) { -+ dev_printk(KERN_WARNING, tp_to_dev(tp), "EEE advertised %x must be a subset of autoneg advertised speeds %llu\n", -+ adv, advertising); -+ rc = -EINVAL; -+ goto out; -+ } -+#else - if (!edata->advertised) { - edata->advertised = advertising & eee->supported; - } else if (edata->advertised & ~advertising) { -@@ -7401,18 +7430,32 @@ rtl_ethtool_set_eee(struct net_device *n - rc = -EINVAL; - goto out; - } -+#endif - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0) -+ if (!linkmode_empty(edata->advertised) & ~eee->supported) { -+ dev_printk(KERN_WARNING, tp_to_dev(tp), "EEE advertised %x must be a subset of support %x\n", -+ adv, eee->supported); -+ rc = -EINVAL; -+ goto out; -+ } -+#else - if (edata->advertised & ~eee->supported) { - dev_printk(KERN_WARNING, tp_to_dev(tp), "EEE advertised %x must be a subset of support %x\n", - edata->advertised, eee->supported); - rc = -EINVAL; - goto out; - } -+#endif - - //tp->eee.eee_enabled = edata->eee_enabled; - //tp->eee_adv_t = rtl8125_ethtool_adv_to_mmd_eee_adv_cap1_t(edata->advertised); - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0) -+ ethtool_convert_link_mode_to_legacy_u32(&eee->advertised, edata->advertised); -+#else - eee->advertised = edata->advertised; -+#endif - //eee->tx_lpi_enabled = edata->tx_lpi_enabled; - //eee->tx_lpi_timer = edata->tx_lpi_timer; - eee->eee_enabled = edata->eee_enabled; diff --git a/package/kernel/r8125/patches/200-r8125-print-link-speed-and-duplex-mode.patch b/package/kernel/r8125/patches/200-r8125-print-link-speed-and-duplex-mode.patch index 617721253..4a024ec31 100644 --- a/package/kernel/r8125/patches/200-r8125-print-link-speed-and-duplex-mode.patch +++ b/package/kernel/r8125/patches/200-r8125-print-link-speed-and-duplex-mode.patch @@ -17,7 +17,7 @@ Signed-off-by: Álvaro Fernández Rojas --- a/src/r8125.h +++ b/src/r8125.h -@@ -1687,6 +1687,9 @@ enum RTL8125_register_content { +@@ -1726,6 +1726,9 @@ enum RTL8125_register_content { LinkStatus = 0x02, FullDup = 0x01, @@ -37,7 +37,7 @@ Signed-off-by: Álvaro Fernández Rojas #include #include #include -@@ -5023,6 +5024,38 @@ rtl8125_link_down_patch(struct net_devic +@@ -5045,6 +5046,38 @@ rtl8125_link_down_patch(struct net_devic #endif } @@ -76,7 +76,7 @@ Signed-off-by: Álvaro Fernández Rojas static void _rtl8125_check_link_status(struct net_device *dev, unsigned int link_state) { -@@ -5035,11 +5068,18 @@ _rtl8125_check_link_status(struct net_de +@@ -5057,11 +5090,18 @@ _rtl8125_check_link_status(struct net_de if (link_state == R8125_LINK_STATE_ON) { rtl8125_link_on_patch(dev); diff --git a/package/kernel/r8125/patches/300-r8125-add-LED-configuration-from-OF.patch b/package/kernel/r8125/patches/300-r8125-add-LED-configuration-from-OF.patch index 4e92edcc0..2e6752dbf 100644 --- a/package/kernel/r8125/patches/300-r8125-add-LED-configuration-from-OF.patch +++ b/package/kernel/r8125/patches/300-r8125-add-LED-configuration-from-OF.patch @@ -8,7 +8,7 @@ #include #include #include -@@ -14265,6 +14266,22 @@ rtl8125_setup_mqs_reg(struct rtl8125_pri +@@ -14808,6 +14809,22 @@ rtl8125_restore_phy_fuse_dout(struct rtl } static void @@ -31,11 +31,11 @@ rtl8125_init_software_variable(struct net_device *dev) { struct rtl8125_private *tp = netdev_priv(dev); -@@ -14720,6 +14737,7 @@ rtl8125_init_software_variable(struct ne +@@ -15309,6 +15326,7 @@ rtl8125_init_software_variable(struct ne else if (tp->InitRxDescType == RX_DESC_RING_TYPE_4) tp->rtl8125_rx_config &= ~EnableRxDescV4_1; + rtl8125_led_configuration(tp); - tp->NicCustLedValue = RTL_R16(tp, CustomLED); + rtl8125_backup_led_select(tp); tp->wol_opts = rtl8125_get_hw_wol(tp);