Broken with 6.16.0-rc1

[codebam]

error: builder for '/nix/store/zs99wbp6dfr0l0pnwjmr5lk50k66mv6b-zenergy-0-unstable-2025-04-15.drv' failed with exit code 2;
       last 25 log lines:
       > no configure script, doing nothing
       > Running phase: buildPhase
       > build flags: SHELL=/nix/store/xy4jjgw87sbgwylm5kn047d9gkbhsr9x-bash-5.2p37/bin/bash ARCH=x86_64 CROSS_COMPILE= KBUILD_OUTPUT=/nix/store/p25f1ds9ilz0yb7gssm2id57rn4b0642-linux-6.16-rc1-dev/lib/modules/6.16.0-rc1/build KDIR=/nix/store/p25f1ds9ilz0yb7gssm2id57rn4b0642-linux-6.16-rc1-dev/lib/modules/6.16.0-rc1/build
       > export CONFIG_SENSOR_zenergy=m;        \
       > make -C /nix/store/p25f1ds9ilz0yb7gssm2id57rn4b0642-linux-6.16-rc1-dev/lib/modules/6.16.0-rc1/build M=$PWD modules
       > make[1]: Entering directory '/nix/store/p25f1ds9ilz0yb7gssm2id57rn4b0642-linux-6.16-rc1-dev/lib/modules/6.16.0-rc1/build'
       > make[2]: Entering directory '/build/source'
       >   CC [M]  zenergy.o
       > zenergy.c: In function 'get_energy_units':
       > zenergy.c:83:9: error: implicit declaration of function 'rdmsrl_safe'; did you mean 'rdmsrq_safe'? [-Wimplicit-function-declaration]
       >    83 |         rdmsrl_safe(ENERGY_PWR_UNIT_MSR, &rapl_units);
       >       |         ^~~~~~~~~~~
       >       |         rdmsrq_safe
       > zenergy.c: In function '__accumulate_delta':
       > zenergy.c:92:9: error: implicit declaration of function 'rdmsrl_safe_on_cpu'; did you mean 'rdmsrq_safe_on_cpu'? [-Wimplicit-function-declaration]
       >    92 |         rdmsrl_safe_on_cpu(cpu, reg, &input);
       >       |         ^~~~~~~~~~~~~~~~~~
       >       |         rdmsrq_safe_on_cpu
       > make[4]: *** [/nix/store/p25f1ds9ilz0yb7gssm2id57rn4b0642-linux-6.16-rc1-dev/lib/modules/6.16.0-rc1/source/scripts/Makefile.build:287: zenergy.o] Error 1
       > make[3]: *** [/nix/store/p25f1ds9ilz0yb7gssm2id57rn4b0642-linux-6.16-rc1-dev/lib/modules/6.16.0-rc1/source/Makefile:2006: .] Error 2
       > make[2]: *** [/nix/store/p25f1ds9ilz0yb7gssm2id57rn4b0642-linux-6.16-rc1-dev/lib/modules/6.16.0-rc1/source/Makefile:248: __sub-make] Error 2
       > make[2]: Leaving directory '/build/source'
       > make[1]: *** [/nix/store/p25f1ds9ilz0yb7gssm2id57rn4b0642-linux-6.16-rc1-dev/lib/modules/6.16.0-rc1/source/Makefile:248: __sub-make] Error 2
       > make[1]: Leaving directory '/nix/store/p25f1ds9ilz0yb7gssm2id57rn4b0642-linux-6.16-rc1-dev/lib/modules/6.16.0-rc1/build'
       > make: *** [Makefile:17: default] Error 2
       For full logs, run 'nix log /nix/store/zs99wbp6dfr0l0pnwjmr5lk50k66mv6b-zenergy-0-unstable-2025-04-15.drv'.
error: 1 dependencies of derivation '/nix/store/rxvrsfhw3h9afprw63ysplcsbhii7y1r-linux-6.16-rc1-modules.drv' failed to build
error: 1 dependencies of derivation '/nix/store/xps2q5zdbj3wv3565n415dbzbr5pg3s4-linux-6.16-rc1-modules-shrunk.drv' failed to build
error: 1 dependencies of derivation '/nix/store/vykk3s03xcvyil8bqcbgfq31z47hl17b-nixos-system-nixos-desktop-25.11.20250611.3156024.drv' failed to build

[codebam]

may be a false alarm. don't go looking into anything yet. sorry

[codebam]

Mostly because the kernel doesn't build at all lol.

error: builder for '/nix/store/d1x19c4ahamjxrligg31597hdsmbylan-linux-6.16-rc1-modules-shrunk.drv' failed with exit code 1;
       last 25 log lines:
       >   dependency already copied: /nix/store/m1r20xbk65nip85iz0b8lrsn005kyzmj-linux-6.16-rc1-modules/lib/modules/6.16.0-rc1/kernel/drivers/scsi/scsi_mod.ko.xz
       >   dependency already copied: /nix/store/m1r20xbk65nip85iz0b8lrsn005kyzmj-linux-6.16-rc1-modules/lib/modules/6.16.0-rc1/kernel/drivers/usb/storage/usb-storage.ko.xz
       >   copying dependency: /nix/store/m1r20xbk65nip85iz0b8lrsn005kyzmj-linux-6.16-rc1-modules/lib/modules/6.16.0-rc1/kernel/drivers/usb/storage/uas.ko.xz
       > root module: sd_mod
       >   dependency already copied: /nix/store/m1r20xbk65nip85iz0b8lrsn005kyzmj-linux-6.16-rc1-modules/lib/modules/6.16.0-rc1/kernel/drivers/scsi/scsi_common.ko.xz
       >   dependency already copied: /nix/store/m1r20xbk65nip85iz0b8lrsn005kyzmj-linux-6.16-rc1-modules/lib/modules/6.16.0-rc1/kernel/drivers/scsi/scsi_mod.ko.xz
       >   copying dependency: /nix/store/m1r20xbk65nip85iz0b8lrsn005kyzmj-linux-6.16-rc1-modules/lib/modules/6.16.0-rc1/kernel/drivers/scsi/sd_mod.ko.xz
       > root module: bcachefs
       >   copying dependency: /nix/store/m1r20xbk65nip85iz0b8lrsn005kyzmj-linux-6.16-rc1-modules/lib/modules/6.16.0-rc1/kernel/lib/raid6/raid6_pq.ko.xz
       >   copying dependency: /nix/store/m1r20xbk65nip85iz0b8lrsn005kyzmj-linux-6.16-rc1-modules/lib/modules/6.16.0-rc1/kernel/crypto/xor.ko.xz
       >   copying dependency: /nix/store/m1r20xbk65nip85iz0b8lrsn005kyzmj-linux-6.16-rc1-modules/lib/modules/6.16.0-rc1/kernel/lib/lz4/lz4_compress.ko.xz
       >   copying dependency: /nix/store/m1r20xbk65nip85iz0b8lrsn005kyzmj-linux-6.16-rc1-modules/lib/modules/6.16.0-rc1/kernel/lib/lz4/lz4hc_compress.ko.xz
       >   copying dependency: /nix/store/m1r20xbk65nip85iz0b8lrsn005kyzmj-linux-6.16-rc1-modules/lib/modules/6.16.0-rc1/kernel/arch/x86/lib/crypto/poly1305-x86_64.ko.xz
       >   copying dependency: /nix/store/m1r20xbk65nip85iz0b8lrsn005kyzmj-linux-6.16-rc1-modules/lib/modules/6.16.0-rc1/kernel/lib/crypto/libpoly1305.ko.xz
       >   copying dependency: /nix/store/m1r20xbk65nip85iz0b8lrsn005kyzmj-linux-6.16-rc1-modules/lib/modules/6.16.0-rc1/kernel/lib/crypto/libchacha.ko.xz
       >   copying dependency: /nix/store/m1r20xbk65nip85iz0b8lrsn005kyzmj-linux-6.16-rc1-modules/lib/modules/6.16.0-rc1/kernel/arch/x86/lib/crypto/chacha-x86_64.ko.xz
       >   copying dependency: /nix/store/m1r20xbk65nip85iz0b8lrsn005kyzmj-linux-6.16-rc1-modules/lib/modules/6.16.0-rc1/kernel/fs/bcachefs/bcachefs.ko.xz
       > root module: sha256
       >   builtin dependency: sha256
       > root module: chacha20
       >   dependency already copied: /nix/store/m1r20xbk65nip85iz0b8lrsn005kyzmj-linux-6.16-rc1-modules/lib/modules/6.16.0-rc1/kernel/lib/crypto/libchacha.ko.xz
       >   dependency already copied: /nix/store/m1r20xbk65nip85iz0b8lrsn005kyzmj-linux-6.16-rc1-modules/lib/modules/6.16.0-rc1/kernel/arch/x86/lib/crypto/chacha-x86_64.ko.xz
       >   copying dependency: /nix/store/m1r20xbk65nip85iz0b8lrsn005kyzmj-linux-6.16-rc1-modules/lib/modules/6.16.0-rc1/kernel/crypto/chacha.ko.xz
       > root module: poly1305
       > modprobe: FATAL: Module poly1305 not found in directory /nix/store/m1r20xbk65nip85iz0b8lrsn005kyzmj-linux-6.16-rc1-modules/lib/modules/6.16.0-rc1
       For full logs, run 'nix log /nix/store/d1x19c4ahamjxrligg31597hdsmbylan-linux-6.16-rc1-modules-shrunk.drv'.
error: 1 dependencies of derivation '/nix/store/zdx5hxr2789hlzhln9h0gnaapycbvq17-initrd-linux-6.16-rc1.drv' failed to build
error: 1 dependencies of derivation '/nix/store/krnzhasdsjgjhg5i2wrgdydvjwaqyiwj-boot.json.drv' failed to build
error: 1 dependencies of derivation '/nix/store/bfvrg4347kgww0z3phyfcw53sr3q555b-nixos-system-nixos-desktop-25.11.20250611.3156024.drv' failed to build

[tjumar]

Broken here too with 6.16rc2

DKMS (dkms-3.2.1) make.log for zenergy/31.f77293f for kernel 6.16.0-rc2-1-cachyos-rc (x86_64)
Mo 16. Jun 23:22:22 CEST 2025

Building module(s)
command: make -j16 KERNELRELEASE=6.16.0-rc2-1-cachyos-rc default KDIR='/lib/modules/6.16.0-rc2-1-cachyos-rc/build'
export CONFIG_SENSOR_zenergy=m;
make -C /lib/modules/6.16.0-rc2-1-cachyos-rc/build M=$PWD modules
make[1]: Entering directory '/usr/lib/modules/6.16.0-rc2-1-cachyos-rc/build'
make[2]: Entering directory '/var/lib/dkms/zenergy/31.f77293f/build'
CC [M] zenergy.o
zenergy.c: In function ‘get_energy_units’:
zenergy.c:83:9: error: implicit declaration of function ‘rdmsrl_safe’; did you mean ‘rdmsrq_safe’? [-Wimplicit-function-declaration]
83 | rdmsrl_safe(ENERGY_PWR_UNIT_MSR, &rapl_units);
| ^~~~~~~~~~~
| rdmsrq_safe
zenergy.c: In function ‘__accumulate_delta’:
zenergy.c:92:9: error: implicit declaration of function ‘rdmsrl_safe_on_cpu’; did you mean ‘rdmsrq_safe_on_cpu’? [-Wimplicit-function-declaration]
92 | rdmsrl_safe_on_cpu(cpu, reg, &input);
| ^~~~~~~~~~~~~~~~~~
| rdmsrq_safe_on_cpu
make[4]: *** [/usr/lib/modules/6.16.0-rc2-1-cachyos-rc/build/scripts/Makefile.build:287: zenergy.o] Error 1
make[3]: *** [/usr/lib/modules/6.16.0-rc2-1-cachyos-rc/build/Makefile:2008: .] Error 2
make[2]: *** [/usr/lib/modules/6.16.0-rc2-1-cachyos-rc/build/Makefile:248: __sub-make] Error 2
make[2]: Leaving directory '/var/lib/dkms/zenergy/31.f77293f/build'
make[1]: *** [Makefile:248: __sub-make] Error 2
make[1]: Leaving directory '/usr/lib/modules/6.16.0-rc2-1-cachyos-rc/build'
make: *** [Makefile:17: default] Error 2

[DekoDX]

This is still an issue on rc6.

[tjumar]

This seems to be the change: https://lkml.org/lkml/2025/4/9/1720

From https://lkml.org/lkml/2025/5/25/145:

MSR API:

• Large MSR code and API cleanup (Xin Li)
• In-kernel MSR API type cleanups and renames (Ingo Molnar)

For a 6.16 kernel replacing rdmsrl_safe_on_cpu with rdmsrq_safe_on_cpu on line 92 in zenergy.c should work then.

[Riebeck-one]

This seems to be the change: https://lkml.org/lkml/2025/4/9/1720

From https://lkml.org/lkml/2025/5/25/145:

MSR API:

• Large MSR code and API cleanup (Xin Li)
• In-kernel MSR API type cleanups and renames (Ingo Molnar)

For a 6.16 kernel replacing rdmsrl_safe_on_cpu with rdmsrq_safe_on_cpu on line 92 in zenergy.c should work then.

Can confirm that replacing rdmsrl_safe_on_cpu and rdmsrl_safe in zenergy.c by rdmsrq_safe_on_cpu and rdmsrq_safe make it work again on 6.16 kernel.

[SteavenGamerYT]

#17