From e95d9735070d9885db36d05f2ddf042378a3c4ae Mon Sep 17 00:00:00 2001
From: Liangbin Lian <jjm2473@gmail.com>
Date: Thu, 18 Jul 2024 09:33:23 +0800
Subject: [PATCH] package/r8125: upgrade to 9.013.02

do not support 5GBE (rtl8126) since this version
---
 package/kernel/r8125/Makefile                 |  4 ++--
 package/kernel/r8125/patches/010-config.patch |  8 +++----
 .../100-add-LED-configuration-from-OF.patch   | 21 +++++++------------
 .../patches/101-fix-netifd-autoneg.patch      |  2 +-
 4 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/package/kernel/r8125/Makefile b/package/kernel/r8125/Makefile
index 97db044fcb..7c5df7e9a7 100644
--- a/package/kernel/r8125/Makefile
+++ b/package/kernel/r8125/Makefile
@@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=r8125
-PKG_VERSION:=9.012.03-1
+PKG_VERSION:=9.013.02-2
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/awesometic/realtek-r8125-dkms/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=7964aacf4a2873cbe4133aeca830bd0725f819ea286bab162026ff283510144f
+PKG_HASH:=eae10100680de13e8119602c50a1748b8a0669eccd61d9a4515b4c846deb3960
 
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILE:=LICENSE
diff --git a/package/kernel/r8125/patches/010-config.patch b/package/kernel/r8125/patches/010-config.patch
index fe4e7008d7..a923f3efc5 100644
--- a/package/kernel/r8125/patches/010-config.patch
+++ b/package/kernel/r8125/patches/010-config.patch
@@ -1,6 +1,6 @@
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -35,16 +35,16 @@ ENABLE_REALWOW_SUPPORT = n
+@@ -35,7 +35,7 @@ ENABLE_REALWOW_SUPPORT = n
  ENABLE_DASH_SUPPORT = n
  ENABLE_DASH_PRINTER_SUPPORT = n
  CONFIG_DOWN_SPEED_100 = n
@@ -9,10 +9,8 @@
  ENABLE_S5WOL = y
  ENABLE_S5_KEEP_CURR_MAC = n
  ENABLE_EEE = y
- ENABLE_S0_MAGIC_PACKET = n
- ENABLE_TX_NO_CLOSE = y
--ENABLE_MULTIPLE_TX_QUEUE = n
-+ENABLE_MULTIPLE_TX_QUEUE = y
+@@ -44,7 +44,7 @@ ENABLE_TX_NO_CLOSE = y
+ ENABLE_MULTIPLE_TX_QUEUE = y
  ENABLE_PTP_SUPPORT = n
  ENABLE_PTP_MASTER_MODE = n
 -ENABLE_RSS_SUPPORT = n
diff --git a/package/kernel/r8125/patches/100-add-LED-configuration-from-OF.patch b/package/kernel/r8125/patches/100-add-LED-configuration-from-OF.patch
index cd3441e1c1..5c334221b4 100644
--- a/package/kernel/r8125/patches/100-add-LED-configuration-from-OF.patch
+++ b/package/kernel/r8125/patches/100-add-LED-configuration-from-OF.patch
@@ -9,11 +9,9 @@ Subject: [PATCH] 100-add-LED-configuration-from-OF
  src/r8125_n.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 58 insertions(+)
 
-diff --git a/src/r8125.h b/src/r8125.h
-index 0c6a2f9..40d68d1 100755
 --- a/src/r8125.h
 +++ b/src/r8125.h
-@@ -1265,6 +1265,7 @@ enum RTL8125_registers {
+@@ -1273,6 +1273,7 @@ enum RTL8125_registers {
          CounterAddrLow      = 0x10,
          CounterAddrHigh     = 0x14,
          CustomLED       = 0x18,
@@ -21,7 +19,7 @@ index 0c6a2f9..40d68d1 100755
          TxDescStartAddrLow  = 0x20,
          TxDescStartAddrHigh = 0x24,
          TxHDescStartAddrLow = 0x28,
-@@ -1301,7 +1302,11 @@ enum RTL8125_registers {
+@@ -1309,7 +1310,11 @@ enum RTL8125_registers {
          INT_CFG1_8125   = 0x7A,
          EPHY_RXER_NUM   = 0x7C,
          EPHYAR          = 0x80,
@@ -33,8 +31,6 @@ index 0c6a2f9..40d68d1 100755
          OCPDR           = 0xB0,
          MACOCP          = 0xB0,
          OCPAR           = 0xB4,
-diff --git a/src/r8125_n.c b/src/r8125_n.c
-index 5c0621e..1cd506e 100755
 --- a/src/r8125_n.c
 +++ b/src/r8125_n.c
 @@ -43,6 +43,7 @@
@@ -45,8 +41,8 @@ index 5c0621e..1cd506e 100755
  #include <linux/if_vlan.h>
  #include <linux/crc32.h>
  #include <linux/interrupt.h>
-@@ -14818,6 +14819,56 @@ rtl8125_setup_mqs_reg(struct rtl8125_private *tp)
-         }
+@@ -13626,6 +13627,56 @@ rtl8125_setup_mqs_reg(struct rtl8125_pri
+                 tp->imr_reg[i] = (u16)(IMR1_8125 + (i - 1) * 4);
  }
  
 +/*
@@ -102,15 +98,12 @@ index 5c0621e..1cd506e 100755
  static void
  rtl8125_init_software_variable(struct net_device *dev)
  {
-@@ -15384,6 +15435,8 @@ rtl8125_init_software_variable(struct net_device *dev)
-         if (tp->InitRxDescType == RX_DESC_RING_TYPE_3)
-                 tp->rtl8125_rx_config |= EnableRxDescV3;
+@@ -14260,6 +14311,8 @@ 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);
  
          tp->wol_opts = rtl8125_get_hw_wol(tp);
--- 
-2.41.0
-
diff --git a/package/kernel/r8125/patches/101-fix-netifd-autoneg.patch b/package/kernel/r8125/patches/101-fix-netifd-autoneg.patch
index 5d99d3b414..60a5a5709f 100644
--- a/package/kernel/r8125/patches/101-fix-netifd-autoneg.patch
+++ b/package/kernel/r8125/patches/101-fix-netifd-autoneg.patch
@@ -11,7 +11,7 @@ so we report 2500baseX instead
 
 --- a/src/r8125_n.c
 +++ b/src/r8125_n.c
-@@ -6336,14 +6336,10 @@ static void rtl8125_gset_xmii(struct net
+@@ -6749,14 +6749,10 @@ static void rtl8125_gset_xmii(struct net
                                                  lpa_adv);
  #if LINUX_VERSION_CODE >= KERNEL_VERSION(5,0,0)
          if (supported & SUPPORTED_2500baseX_Full) {