Arch Linux User Repository

To match the original functionality from <6.1, the patch should probably change the function from netif_napi_add to netif_napi_add_weight rather than remove the weight parameter. The api was changed in 6.1 to generalize the netif_napi_add function (by removing the weight parameter) and the netif_napi_add_weight function was added in its place for calls where a weight is required/desired.

diff --git 1/6.1.patch 2/6.1.patch
new file mode 100644
index 0000000..da9f9ea
--- /dev/null
+++ 2/6.1.patch
@@ -0,0 +1,15 @@
+diff -Naur r8125-9.011.00-a/src/r8125.h r8125-9.011.00-b/src/r8125.h
+--- r8125-9.011.00-a/src/r8125.h
++++ r8125-9.011.00-b/src/r8125.h
+@@ -676,7 +676,11 @@
+ typedef struct napi_struct *napi_ptr;
+ typedef int napi_budget;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6,1,0)
+ #define RTL_NAPI_CONFIG(ndev, priv, function, weight)   netif_napi_add(ndev, &priv->napi, function, weight)
++#else
++#define RTL_NAPI_CONFIG(ndev, priv, function, weight)   netif_napi_add_weight(ndev, &priv->napi, function, weight)
++#endif
+ #define RTL_NAPI_QUOTA(budget, ndev)            min(budget, budget)
+ #define RTL_GET_PRIV(stuct_ptr, priv_struct)        container_of(stuct_ptr, priv_struct, stuct_ptr)
+ #define RTL_GET_NETDEV(priv_ptr)            struct net_device *dev = priv_ptr->dev;

With modifications I got bundi78's patch working. The area that caused me some grief was:

+diff -Naur r8125-9.011.00-a/src/r8125.h r8125-9.011.00-b/src/r8125.h
+--- r8125-9.011.00-a/src/r8125.h
++++ r8125-9.011.00-b/src/r8125.h

Are the -a and -b suffixes meant to be included? Removing them (and then skipping the sha256 check) meant I could build and install this. Thanks for doing posting it!

Hi, the following patch is working:

diff --git i/PKGBUILD w/PKGBUILD
index 2638681..2408b1e 100644
--- i/PKGBUILD
+++ w/PKGBUILD
@@ -3,22 +3,27 @@
 # Contributor: Shen-Ta Hsieh <ibmibmibm(at)gmail(dot)com>

 _pkgname=r8125
 pkgname=${_pkgname}-dkms
 pkgver=9.011.00
-pkgrel=1
+pkgrel=2
 url="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"
 pkgdesc="Kernel module for RTL8125"
 license=('GPL2')
 arch=('any')
 depends=('dkms')
 conflicts=("${_pkgname}")
 optdepends=('linux-headers: Build the module for Arch kernel'
             'linux-lts-headers: Build the module for LTS Arch kernel')
-source=("http://rtitwww.realtek.com/rtdrivers/cn/nic1/${_pkgname}-${pkgver}.tar.bz2" 'dkms.conf')
+source=("http://rtitwww.realtek.com/rtdrivers/cn/nic1/${_pkgname}-${pkgver}.tar.bz2" 'dkms.conf' '6.1.patch')
 sha256sums=('01fbdb249b7ba2984df93a4bd11aecddd1ed904c6be10fc5d776e94b3110b2bf'
-            'ad4c67e0c74661d19b74872f98254184d4b04e32e4c57b338a84fbcefa4c721f')
+            'ad4c67e0c74661d19b74872f98254184d4b04e32e4c57b338a84fbcefa4c721f'
+            '093bee6237012ec1d24fdaaf385a1b17f485e44a2150f8eb2e84e2211e5bfd00')
+
+prepare() {
+  patch -p0 < 6.1.patch
+}

 package() {
   dir_name="${_pkgname}-${pkgver}"
   install -d "${pkgdir}"/usr/src/${dir_name}/
   install -Dm644 dkms.conf "${dir_name}"/src/* "${pkgdir}/usr/src/${dir_name}/"
diff --git 1/6.1.patch 2/6.1.patch
new file mode 100644
index 0000000..da9f9ea
--- /dev/null
+++ 2/6.1.patch
@@ -0,0 +1,15 @@
+diff -Naur r8125-9.011.00-a/src/r8125.h r8125-9.011.00-b/src/r8125.h
+--- r8125-9.011.00-a/src/r8125.h
++++ r8125-9.011.00-b/src/r8125.h
+@@ -676,7 +676,11 @@
+ typedef struct napi_struct *napi_ptr;
+ typedef int napi_budget;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6,1,0)
+ #define RTL_NAPI_CONFIG(ndev, priv, function, weight)   netif_napi_add(ndev, &priv->napi, function, weight)
++#else
++#define RTL_NAPI_CONFIG(ndev, priv, function, weight)   netif_napi_add(ndev, &priv->napi, function)
++#endif
+ #define RTL_NAPI_QUOTA(budget, ndev)            min(budget, budget)
+ #define RTL_GET_PRIV(stuct_ptr, priv_struct)        container_of(stuct_ptr, priv_struct, stuct_ptr)
+ #define RTL_GET_NETDEV(priv_ptr)            struct net_device *dev = priv_ptr->dev;

Greetings, there are issues for linux (6.1.5.arch2-1) and linux-zen (6.1.5.zen2-1) kernels

==> dkms install --no-depmod r8125/9.009.02 -k 6.1.5-arch2-1
Error! Bad return status for module build on kernel: 6.1.5-arch2-1 (x86_64)
Consult /var/lib/dkms/r8125/9.009.02/build/make.log for more information.
==> WARNING: `dkms install --no-depmod r8125/9.009.02 -k 6.1.5-arch2-1' exited 10
==> dkms install --no-depmod r8125/9.009.02 -k 6.1.5-zen2-1-zen
Error! Bad return status for module build on kernel: 6.1.5-zen2-1-zen (x86_64)
Consult /var/lib/dkms/r8125/9.009.02/build/make.log for more information.
==> WARNING: `dkms install --no-depmod r8125/9.009.02 -k 6.1.5-zen2-1-zen' exited 10

make.log

DKMS make.log for r8125-9.011.00 for kernel 6.1.5-arch2-1 (x86_64)
Sat 14 Jan 09:54:09 CET 2023
make: Entering directory '/usr/lib/modules/6.1.5-arch2-1/build'
  CC [M]  /var/lib/dkms/r8125/9.011.00/build/r8125_n.o
  CC [M]  /var/lib/dkms/r8125/9.011.00/build/rtl_eeprom.o
  CC [M]  /var/lib/dkms/r8125/9.011.00/build/rtltool.o
In file included from /var/lib/dkms/r8125/9.011.00/build/r8125_n.c:83:
/var/lib/dkms/r8125/9.011.00/build/r8125_n.c: In function ‘rtl8125_init_napi’:
/var/lib/dkms/r8125/9.011.00/build/r8125.h:679:57: error: too many arguments to function ‘netif_napi_add’
  679 | #define RTL_NAPI_CONFIG(ndev, priv, function, weight)   netif_napi_add(ndev, &priv->napi, function, weight)
      |                                                         ^~~~~~~~~~~~~~
/var/lib/dkms/r8125/9.011.00/build/r8125_n.c:13776:17: note: in expansion of macro ‘RTL_NAPI_CONFIG’
13776 |                 RTL_NAPI_CONFIG(tp->dev, r8125napi, poll, R8125_NAPI_WEIGHT);
      |                 ^~~~~~~~~~~~~~~
In file included from /var/lib/dkms/r8125/9.011.00/build/r8125_n.c:42:
./include/linux/netdevice.h:2569:1: note: declared here
 2569 | netif_napi_add(struct net_device *dev, struct napi_struct *napi,
      | ^~~~~~~~~~~~~~
make[1]: *** [scripts/Makefile.build:250: /var/lib/dkms/r8125/9.011.00/build/r8125_n.o] Error 1
make: *** [Makefile:1992: /var/lib/dkms/r8125/9.011.00/build] Error 2
make: Leaving directory '/usr/lib/modules/6.1.5-arch2-1/build'

It does works for linux-lts 5.15.87

the r8125 actually works fine without this specific driver. In my case package r8168 was blacklisting r8169 which supports the r8125.

Last version: 9.009.02

I git/clone source repo, then update PKGBUILD:

# Maintainer: Bernd Amend <bernd.amend(at)gmail(dot)com>
# Contributor: Alex Avance <aravance(at)gmail(dot)com>
# Contributor: Shen-Ta Hsieh <ibmibmibm(at)gmail(dot)com>

_pkgname=r8125
pkgname=${_pkgname}-dkms
#pkgver=9.009.00
pkgver=9.009.02
pkgrel=1
url="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"
pkgdesc="Kernel module for RTL8125"
license=('GPL2')
arch=('any')
depends=('dkms')
conflicts=("${_pkgname}")
optdepends=('linux-headers: Build the module for Arch kernel'
            'linux-lts-headers: Build the module for LTS Arch kernel')
source=("http://rtitwww.realtek.com/rtdrivers/cn/nic1/${_pkgname}-${pkgver}.tar.bz2" 'dkms.conf')
#sha256sums=('1f73d1b84372b82efa091eca5075b34ff622bf7f4385dc16359d1be828f54b14'
#            'ad4c67e0c74661d19b74872f98254184d4b04e32e4c57b338a84fbcefa4c721f')
sha256sums=('5e4ba4ca0d0ee21df47e2e3c9fe941119b9407dd083f9c169023c4177b9db80e'
            'ad4c67e0c74661d19b74872f98254184d4b04e32e4c57b338a84fbcefa4c721f')

package() {
  dir_name="${_pkgname}-${pkgver}"
  install -d "${pkgdir}"/usr/src/${dir_name}/
  install -Dm644 dkms.conf "${dir_name}"/src/* "${pkgdir}/usr/src/${dir_name}/"

  sed -e "s/@_PKGNAME@/${_pkgname}/g" \
      -e "s/@PKGVER@/${pkgver}/g" \
      -i "${pkgdir}/usr/src/${dir_name}/dkms.conf"

Then...

makepkg --syncdeps -f && makepkg --install

See you on next reboot :)

Thank you for providing the patch!

I hope that ptb gets around to fixing this package. In the meantime I created an aur package simply called r8125 wich is basically the same as the r8168 package in community just for the r8125 device.

this dkms is now required? or I can use kernel driver.

Add a patch file to make the driver work with 5.18 kernel. Also added linux-zen-headers as optional dependency.

diff --git a/5.18.patch b/5.18.patch
new file mode 100644
index 0000000..d4db6fc
--- /dev/null
+++ b/5.18.patch
@@ -0,0 +1,17 @@
+--- r8125_n.org.c  2022-06-02 01:43:21.746116107 +0200
++++ r8125_n.c  2022-06-02 01:38:14.408257684 +0200
+@@ -11952,11 +11952,11 @@
+ 
+         if ((sizeof(dma_addr_t) > 4) &&
+             use_dac &&
+-            !pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) &&
+-            !pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64))) {
++            !dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)) &&
++            !dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64))) {
+                 dev->features |= NETIF_F_HIGHDMA;
+         } else {
+-                rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
++                rc = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
+                 if (rc < 0) {
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
+                         if (netif_msg_probe(tp))
diff --git a/PKGBUILD b/PKGBUILD
index 159f45e..16442c1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@

_pkgname=r8125
pkgname=${_pkgname}-dkms
-pkgver=9.009.00
+pkgver=9.009.01
pkgrel=1
url="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"
pkgdesc="Kernel module for RTL8125"
@@ -12,11 +12,24 @@ license=('GPL2')
arch=('any')
depends=('dkms')
conflicts=("${_pkgname}")
+
optdepends=('linux-headers: Build the module for Arch kernel'
-            'linux-lts-headers: Build the module for LTS Arch kernel')
-source=("http://rtitwww.realtek.com/rtdrivers/cn/nic1/${_pkgname}-${pkgver}.tar.bz2" 'dkms.conf')
-sha256sums=('1f73d1b84372b82efa091eca5075b34ff622bf7f4385dc16359d1be828f54b14'
-            'ad4c67e0c74661d19b74872f98254184d4b04e32e4c57b338a84fbcefa4c721f')
+            'linux-lts-headers: Build the module for LTS Arch kernel'
+            'linux-zen-headers: Build the module for Arch kernel')
+source=("http://rtitwww.realtek.com/rtdrivers/cn/nic1/${_pkgname}-${pkgver}.tar.bz2"
+        'dkms.conf'
+        '5.18.patch')
+sha256sums=('1bfc5b43a98c7b800fce4885d85e8f7eb4a9f3a245fd0f55eb3912634c2a04ff'
+            'ad4c67e0c74661d19b74872f98254184d4b04e32e4c57b338a84fbcefa4c721f'
+            'b0cbf6d1bc392846c72f479947cf70ec186c4e2c4cd0b6668580eed02aba02ad')
+
+prepare() {
+  dir_name="${_pkgname}-${pkgver}"
+  org_path=`pwd`
+  cd "${dir_name}"/src/
+  patch <"${org_path}"/5.18.patch
+  cd "${org_path}"
+}

package() {
  dir_name="${_pkgname}-${pkgver}"