gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux/common-config: update for 7.1

Browse Source 
Ham radio is gone, DMABUF_MOVE_NOTIFY is unconditional,
NET_FOU is m on x86_64-linux but y on aarch64-linux,
which throws off IPV6_FOU_TUNNEL now.
This commit is contained in:
K900
2026-04-27 18:36:39 +03:00
parent 824cb750dd
commit be994ce8a8
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/kernel/common-config.nix
+10 -4
View File
@@ -185,6 +185,7 @@ let
X86_INTEL_LPSS = yes; X86_INTEL_LPSS = yes;
X86_INTEL_PSTATE = yes; X86_INTEL_PSTATE = yes;
X86_AMD_PSTATE = whenAtLeast "5.17" yes; X86_AMD_PSTATE = whenAtLeast "5.17" yes;
X86_AMD_PSTATE_DYNAMIC_EPP = whenAtLeast "7.1" yes;
# Intel DPTF (Dynamic Platform and Thermal Framework) Support # Intel DPTF (Dynamic Platform and Thermal Framework) Support
ACPI_DPTF = yes; ACPI_DPTF = yes;
@@ -318,13 +319,14 @@ let
IPV6_MROUTE = yes; IPV6_MROUTE = yes;
IPV6_MROUTE_MULTIPLE_TABLES = yes; IPV6_MROUTE_MULTIPLE_TABLES = yes;
IPV6_PIMSM_V2 = yes; IPV6_PIMSM_V2 = yes;
IPV6_FOU_TUNNEL = module; IPV6_FOU_TUNNEL = yes;
IPV6_SEG6_LWTUNNEL = yes; IPV6_SEG6_LWTUNNEL = yes;
IPV6_SEG6_HMAC = yes; IPV6_SEG6_HMAC = yes;
IPV6_SEG6_BPF = yes; IPV6_SEG6_BPF = yes;
NET_CLS_ACT = yes; NET_CLS_ACT = yes;
NET_CLS_BPF = module; NET_CLS_BPF = module;
NET_ACT_BPF = module; NET_ACT_BPF = module;
NET_FOU = yes;
NET_SCHED = yes; NET_SCHED = yes;
NET_SCH_BPF = whenAtLeast "6.16" (whenPlatformHasEBPFJit yes); NET_SCH_BPF = whenAtLeast "6.16" (whenPlatformHasEBPFJit yes);
L2TP_V3 = yes; L2TP_V3 = yes;
@@ -403,8 +405,8 @@ let
MAC80211_DEBUGFS = yes; MAC80211_DEBUGFS = yes;
# HAM radio # HAM radio
HAMRADIO = yes; HAMRADIO = whenOlder "7.1" yes;
AX25 = module; AX25 = whenOlder "7.1" module;
} }
// lib.optionalAttrs (stdenv.hostPlatform.system == "aarch64-linux") { // lib.optionalAttrs (stdenv.hostPlatform.system == "aarch64-linux") {
# Not enabled by default, hides modules behind it # Not enabled by default, hides modules behind it
@@ -565,6 +567,9 @@ let
# Enable CEC over DisplayPort # Enable CEC over DisplayPort
DRM_DP_CEC = whenOlder "6.10" yes; DRM_DP_CEC = whenOlder "6.10" yes;
DRM_DISPLAY_DP_AUX_CEC = whenAtLeast "6.10" yes; DRM_DISPLAY_DP_AUX_CEC = whenAtLeast "6.10" yes;
# Enable RAS reporting via netlink
DRM_RAS = whenAtLeast "7.1" yes;
} }
// //
lib.optionalAttrs lib.optionalAttrs
@@ -705,6 +710,7 @@ let
EXT4_FS_SECURITY = yes; EXT4_FS_SECURITY = yes;
NTFS_FS = whenBetween "5.15" "6.9" no; NTFS_FS = whenBetween "5.15" "6.9" no;
NTFS_FS_POSIX_ACL = whenAtLeast "7.1" yes;
NTFS3_LZX_XPRESS = whenAtLeast "5.15" yes; NTFS3_LZX_XPRESS = whenAtLeast "5.15" yes;
NTFS3_FS_POSIX_ACL = whenAtLeast "5.15" yes; NTFS3_FS_POSIX_ACL = whenAtLeast "5.15" yes;
@@ -1379,7 +1385,7 @@ let
) yes; ) yes;
# required for P2P DMABUF # required for P2P DMABUF
DMABUF_MOVE_NOTIFY = lib.mkIf stdenv.hostPlatform.is64bit (whenAtLeast "6.6" yes); DMABUF_MOVE_NOTIFY = lib.mkIf stdenv.hostPlatform.is64bit (whenBetween "6.6" "7.1" yes);
# required for P2P transfers between accelerators # required for P2P transfers between accelerators
HSA_AMD_P2P = lib.mkIf stdenv.hostPlatform.is64bit (whenAtLeast "6.6" yes); HSA_AMD_P2P = lib.mkIf stdenv.hostPlatform.is64bit (whenAtLeast "6.6" yes);