Merge remote-tracking branch 'origin/master' into doc-fedora

awesometic · Aug 3, 2024 · 2f4411f · 2f4411f
2 parents 54d25b8 + 980736e
commit 2f4411f
Show file tree

Hide file tree

Showing 25 changed files with 7,705 additions and 4,520 deletions.
diff --git a/Makefile b/Makefile
@@ -1,10 +1,10 @@
 # SPDX-License-Identifier: GPL-2.0-only
 ################################################################################
 #
-# r8125 is the Linux device driver released for Realtek 2.5Gigabit Ethernet
+# r8125 is the Linux device driver released for Realtek 2.5 Gigabit Ethernet
 # controllers with PCI-Express interface.
 #
-# Copyright(c) 2022 Realtek Semiconductor Corp. All rights reserved.
+# Copyright(c) 2024 Realtek Semiconductor Corp. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the Free

diff --git a/README.md b/README.md
@@ -165,16 +165,78 @@ absolutely you don't need to.
       ```bash
       sudo lspci -v -d ::0200 | grep 81
 
+<<<<<<< HEAD
       2a:00.0 Ethernet controller: Realtek Semiconductor Co., Ltd. RTL8125 2.5GbE Controller (rev 05)
           Kernel driver in use: r8125
           Kernel modules: r8169, r8125
       ```
+||||||| a9a0ddf
+```bash
+sudo tee -a /etc/modprobe.d/blacklist-r8169.conf > /dev/null <<EOT
+# To use r8125 driver explicitly
+blacklist r8169
+EOT
+```
+
+To apply the new blacklist to your kernel, update your initramfs via
+
+```bash
+sudo update-initramfs -u
+```
+
+Finally, reboot to take effect.
+
+> - If you need to load both r8169 and r8125, maybe removing r8125 firmware could make it work. Please enter `sudo rm -f /lib/firmware/rtl_nic/rtl8125*` to remove all the r8125 firmwares on the system. But it is just a workaround, you should have to do this every time installing the new kernel version or new Linux firmware.
+> - In the case of the Debian package, I will update the scripts to make it do this during the installation.
+
+## Debian package build
+
+You can build yourself this after installing some dependencies including `dkms`.
+
+```bash
+sudo apt install devscripts debmake debhelper build-essential dkms
+```
+
+```bash
+dpkg-buildpackage -b -rfakeroot -us -uc
+```
+=======
+```bash
+sudo tee -a /etc/modprobe.d/blacklist-r8169.conf > /dev/null <<EOT
+# To use r8125 driver explicitly
+blacklist r8169
+EOT
+```
+
+To apply the new blacklist to your kernel, update your initramfs via
+
+```bash
+sudo update-initramfs -u
+```
+
+Finally, reboot to take effect.
+
+> - If you need to load both r8169 and r8125, maybe removing r8125 firmware could make it work. Please enter `sudo rm -f /lib/firmware/rtl_nic/rtl8125*` to remove all the r8125 firmwares on the system. But it is just a workaround, you should have to do this every time installing the new kernel version or new Linux firmware.
+> - In the case of the Debian package, I will update the scripts to make it do this during the installation.
+
+## Debian package build
+
+You can build yourself this after installing some dependencies including `dkms`.
+
+```bash
+sudo apt install devscripts debmake debhelper build-essential dkms
+```
+
+```bash
+dpkg-buildpackage -b -rfakeroot -us -uc
+```
+>>>>>>> origin/master
 
 ## LICENSE
 
 GPL-2 on Realtek driver and the Debian packing.
 
 ## References
 
-- [Realtek r8125 driver release page](https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software)
+- [Realtek r8125 driver release page](https://www.realtek.com/Download/List?cate_id=584)
 - [ParrotSec's realtek-rtl88xxau-dkms, where got hint from](https://github.com/ParrotSec/realtek-rtl88xxau-dkms)
diff --git a/REALTEK_README.txt b/REALTEK_README.txt
@@ -1,6 +1,6 @@
 <Linux device driver for Realtek Ethernet controllers>
 
-	This is the Linux device driver released for RealTek RTL8125 2.5Gigabit Ethernet controllers with PCI-Express interface.
+	This is the Linux device driver released for Realtek 2.5 Gigabit Ethernet controllers with PCI-Express interface.
 
 <Requirements>
 

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,39 @@
+realtek-r8125-dkms (9.013.02-2) stable; urgency=medium
+
+  * Rename BASEDIR to BSRC in dkms.conf
+
+ -- Deokgyu Yang <secugyu@gmail.com>  Mon, 22 Apr 2024 18:14:49 +0900
+
+realtek-r8125-dkms (9.013.02-1) stable; urgency=medium
+
+  * Update Realtek r8125 driver to 9.013.02
+
+ -- Deokgyu Yang <secugyu@gmail.com>  Mon, 08 Apr 2024 12:19:25 +0900
+
+realtek-r8125-dkms (9.012.04-1) stable; urgency=medium
+
+  * Update Realtek r8125 driver to 9.012.04
+
+ -- Deokgyu Yang <secugyu@gmail.com>  Tue, 02 Jan 2024 12:27:51 +0900
+
+realtek-r8125-dkms (9.012.03-2) stable; urgency=medium
+
+  * Fixed using wrong source code directory when installing new kernel
+
+ -- Deokgyu Yang <secugyu@gmail.com>  Fri, 01 Dec 2023 15:49:48 +0900
+
+realtek-r8125-dkms (9.012.03-1) stable; urgency=medium
+
+  * Update Realtek r8125 driver to 9.012.03
+
+ -- Deokgyu Yang <secugyu@gmail.com>  Sat, 04 Nov 2023 15:28:48 +0900
+
+realtek-r8125-dkms (9.011.01-1) stable; urgency=medium
+
+  * Update Realtek r8125 driver to 9.011.01
+
+ -- Deokgyu Yang <secugyu@gmail.com>  Wed, 26 Apr 2023 13:55:30 +0900
+
 realtek-r8125-dkms (9.011.00-1) stable; urgency=medium
 
   * Update Realtek r8125 driver to 9.011.00 with remaining support for kernel

diff --git a/debian/control b/debian/control
@@ -2,8 +2,8 @@ Source: realtek-r8125-dkms
 Section: contrib/kernel
 Priority: optional
 Maintainer: Deokgyu Yang <secugyu@gmail.com>
-Build-Depends: debhelper (>=11~), dkms
-Standards-Version: 4.1.4
+Build-Depends: debhelper (>=11~), dkms (<< 3.0.3-3~) | dh-sequence-dkms
+Standards-Version: 4.6.2.1
 Homepage: https://github.com/awesometic/realtek-r8125-dkms
 
 Package: realtek-r8125-dkms

diff --git a/debian/prerm b/debian/prerm
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 NAME=realtek-r8125
-VERSION=9.011.00
+VERSION=9.013.02
 
 set -e
 

diff --git a/dkms-install.sh b/dkms-install.sh
@@ -9,7 +9,7 @@ fi
 
 DRV_DIR="$(pwd)"
 DRV_NAME=r8125
-DRV_VERSION=9.011.00
+DRV_VERSION=9.013.02
 
 cp -r ${DRV_DIR} /usr/src/${DRV_NAME}-${DRV_VERSION}
 

diff --git a/dkms-remove.sh b/dkms-remove.sh
@@ -9,7 +9,7 @@ fi
 
 DRV_DIR="$(pwd)"
 DRV_NAME=r8125
-DRV_VERSION=9.011.00
+DRV_VERSION=9.013.02
 
 dkms remove ${DRV_NAME}/${DRV_VERSION} --all
 rm -rf /usr/src/${DRV_NAME}-${DRV_VERSION}

diff --git a/dkms.conf b/dkms.conf
@@ -1,5 +1,5 @@
 PACKAGE_NAME="realtek-r8125"
-PACKAGE_VERSION="9.011.00"
+PACKAGE_VERSION="9.013.02"
 PROCS_NUM=`nproc`
 [ $PROCS_NUM -gt 16 ] && PROCS_NUM=16
 MAKE="'make' -j$PROCS_NUM KVER=${kernelver} BSRC=/lib/modules/${kernelver} modules"

diff --git a/src/Makefile b/src/Makefile
@@ -1,10 +1,10 @@
 # SPDX-License-Identifier: GPL-2.0-only
 ################################################################################
 #
-# r8125 is the Linux device driver released for Realtek 2.5Gigabit Ethernet
+# r8125 is the Linux device driver released for Realtek 2.5 Gigabit Ethernet
 # controllers with PCI-Express interface.
 #
-# Copyright(c) 2022 Realtek Semiconductor Corp. All rights reserved.
+# Copyright(c) 2024 Realtek Semiconductor Corp. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the Free
@@ -41,13 +41,13 @@ 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
 ENABLE_PTP_SUPPORT = n
 ENABLE_PTP_MASTER_MODE = n
 ENABLE_RSS_SUPPORT = n
 ENABLE_LIB_SUPPORT = n
 ENABLE_USE_FIRMWARE_FILE = n
-DISABLE_PM_SUPPORT = n
+DISABLE_WOL_SUPPORT = n
 DISABLE_MULTI_MSIX_VECTOR = n
 ENABLE_DOUBLE_VLAN = n
 ENABLE_PAGE_REUSE = n
@@ -116,8 +116,8 @@ ifneq ($(KERNELRELEASE),)
 		r8125-objs += r8125_firmware.o
 		EXTRA_CFLAGS += -DENABLE_USE_FIRMWARE_FILE
 	endif
-	ifeq ($(DISABLE_PM_SUPPORT), y)
-		EXTRA_CFLAGS += -DDISABLE_PM_SUPPORT
+	ifeq ($(DISABLE_WOL_SUPPORT), y)
+		EXTRA_CFLAGS += -DDISABLE_WOL_SUPPORT
 	endif
 	ifeq ($(DISABLE_MULTI_MSIX_VECTOR), y)
 		EXTRA_CFLAGS += -DDISABLE_MULTI_MSIX_VECTOR

diff --git a/src/Makefile_linux24x b/src/Makefile_linux24x
@@ -1,10 +1,10 @@
 # SPDX-License-Identifier: GPL-2.0-only
 ################################################################################
 #
-# r8125 is the Linux device driver released for Realtek 2.5Gigabit Ethernet
+# r8125 is the Linux device driver released for Realtek 2.5 Gigabit Ethernet
 # controllers with PCI-Express interface.
 #
-# Copyright(c) 2022 Realtek Semiconductor Corp. All rights reserved.
+# Copyright(c) 2024 Realtek Semiconductor Corp. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the Free