Compile error on kernel releases >6.15: solved

[ewaldc]

When compiling the latest version 9.016.01-1 for kernel 6.18.21, I received following error:

r8125_ptp.c:1216:17: error: implicit declaration of function ‘hrtimer_init’; did you mean ‘hrtimers_init’? [-Wimplicit-function-declaration]
 1216 |                 hrtimer_init(&tp->pps_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
      |                 ^~~~~~~~~~~~
      |                 hrtimers_init

The issue: as of 6.15, hrtimer_init was retired in favor of hrtimer_setup which combines the initialization and the registration of the callback function.

Patch:

--- r8125_ptp.c.orig	2026-04-12 20:27:41.832081881 +0200
+++ r8125_ptp.c	2026-04-12 19:32:00.718049905 +0200
@@ -1213,7 +1213,12 @@
         switch (tp->HwSuppPtpVer) {
         case 3:
                 tp->pps_enable = 0;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 15, 0)
 	            hrtimer_setup(&tp->pps_timer, rtl8125_phy_hrtimer_for_pps, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
+#else
+                hrtimer_init(&tp->pps_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
+                tp->pps_timer.function = rtl8125_phy_hrtimer_for_pps;
+#endif
                 break;
         default:
                 break;

Will test and report back.
Thanks for your great work!

[ewaldc]

I can confirm that this patch "works" on ARM64 (Rockchip 3588) hardware with kernel 6.18.22. With that I mean that the patch does not introduce different behavior. For example, the (broken) PTP behavior of running sudo phc_ctl enP3p49s0 set; sudo phc_ctl enP3p49s0 get still results in the same (wrong) output, at least on the systems I can test on. Or simple commands like wstamp_ctl -i enP3p49s0 -t 1 -r 1 result in unsupported because the PTP code does not accept HWTSTAMP_FILTER_ALL like virtually all network drivers.
Beyond that, there are changes as of 6.15 in MMU behavior for RK3588 that make the 9.016.01-1 version unreliable.