aviallon/nixos-lib
1
0
Fork 0
mirror of https://github.com/aviallon/nixos-lib.git synced 2026-04-06 01:38:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Boot] only apply patches or backports if they don't already exist in upstream

Browse source
This commit is contained in:
Antoine Viallon 2023-06-26 20:39:46 +02:00
parent db25cf92f8
commit 8b05a0634d
Signed by: aviallon
GPG key ID: 186FC35EDEB25716
1 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

21
boot.nix
View file

@ -32,6 +32,16 @@ let
SCHED_CLUSTER y SCHED_CLUSTER y
''; '';
}; };
backports = {
zenLLCIdle = {
name = "zen-llc-idle";
patch = pkgs.fetchpatch {
url = "https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git/patch/?id=c5214e13ad60bd0022bab45cbac2c9db6bc1e0d4";
hash = "sha256-3uDieD7XOaMM5yqOSvyLNsr2OqBxXESB5sM2gnGYoWk=";
};
};
};
optimizeForCPUArch = arch: let optimizeForCPUArch = arch: let
archConfigMap = { archConfigMap = {
"k8" = "K8"; "opteron" = "K8"; "athlon64" = "K8"; "athlon-fx" = "K8"; "k8" = "K8"; "opteron" = "K8"; "athlon64" = "K8"; "athlon-fx" = "K8";
@ -88,6 +98,8 @@ let
isXanmod = kernel: ! isNull (strings.match ".*(xanmod).*" kernel.modDirVersion); isXanmod = kernel: ! isNull (strings.match ".*(xanmod).*" kernel.modDirVersion);
kernelVersionOlder = ver: versionOlder cfg.kernel.version ver;
cfg = config.aviallon.boot; cfg = config.aviallon.boot;
generalCfg = config.aviallon.general; generalCfg = config.aviallon.general;
allowUnfree = (types.isType types.attrs config.nixpkgs.config) allowUnfree = (types.isType types.attrs config.nixpkgs.config)
@ -114,7 +126,11 @@ in {
kvdo.enable = mkEnableOption "dm-kvdo kernel module"; kvdo.enable = mkEnableOption "dm-kvdo kernel module";
rtGroupSched.enable = mkEnableOption "RT cgroups"; rtGroupSched.enable = mkEnableOption "RT cgroups";
energyModel.enable = mkEnableOption "Energy Model"; energyModel.enable = mkEnableOption "Energy Model";
amdClusterId.enable = mkEnableOption "Energy Model";
patches = {
amdClusterId.enable = mkEnableOption "Energy Model";
zenLLCIdle.enable = mkEnableOption "Zen LLC Idle patch";
};
efi = mkOption rec { efi = mkOption rec {
description = "Use EFI bootloader"; description = "Use EFI bootloader";
@ -202,7 +218,8 @@ in {
++ optional cfg.x32abi.enable customKernelPatches.enableX32ABI ++ optional cfg.x32abi.enable customKernelPatches.enableX32ABI
++ optional cfg.rtGroupSched.enable customKernelPatches.enableRTGroupSched ++ optional cfg.rtGroupSched.enable customKernelPatches.enableRTGroupSched
++ optional cfg.energyModel.enable customKernelPatches.enableEnergyModel ++ optional cfg.energyModel.enable customKernelPatches.enableEnergyModel
++ optional cfg.amdClusterId.enable customKernelPatches.amdClusterId ++ optional (cfg.patches.amdClusterId.enable && kernelVersionOlder "6.4") customKernelPatches.amdClusterId
++ optional (cfg.patches.zenLLCIdle.enable && kernelVersionOlder "6.5") customKernelPatches.backports.zenLLCIdle
++ optional (isXanmod cfg.kernel && config.aviallon.optimizations.enable) (customKernelPatches.optimizeForCPUArch config.aviallon.general.cpu.arch) ++ optional (isXanmod cfg.kernel && config.aviallon.optimizations.enable) (customKernelPatches.optimizeForCPUArch config.aviallon.general.cpu.arch)
; ;