Merge pull request #115 from michaelpj/imp/throttled

Replace ad hoc throttling fix with throttled
NixOS · Oct 21, 2019 · 1ea7efa · 1ea7efa
2 parents ed0d3cc + 2bf9422
commit 1ea7efa
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 47 deletions.
diff --git a/common/pc/laptop/cpu-throttling-bug.nix b/common/pc/laptop/cpu-throttling-bug.nix
diff --git a/dell/xps/13-9370/default.nix b/dell/xps/13-9370/default.nix
@@ -5,12 +5,13 @@
     ../../../common/cpu/intel/kaby-lake
     ../../../common/pc/laptop
     ../../../common/pc/laptop/acpi_call.nix
-    ../../../common/pc/laptop/cpu-throttling-bug.nix
   ];
 
   # Force S3 sleep mode. See README.wiki for details.
   boot.kernelParams = [ "mem_sleep_default=deep" ];
 
   # touchpad goes over i2c
   boot.blacklistedKernelModules = [ "psmouse" ];
+
+  services.throttled.enable = lib.mkDefault true;
 }
diff --git a/lenovo/thinkpad/p53/default.nix b/lenovo/thinkpad/p53/default.nix
@@ -1,9 +1,10 @@
-{ nixos, pkgs, config, stdenv, ... }:
+{ nixos, pkgs, lib, config, stdenv, ... }:
 {
   imports = [
     ../../../common/cpu/intel
     ../../../common/pc/laptop/acpi_call.nix
-    ../../../common/pc/laptop/cpu-throttling-bug.nix
     ../.
   ];
+
+  services.throttled.enable = lib.mkDefault true;
 }
diff --git a/lenovo/thinkpad/t480s/default.nix b/lenovo/thinkpad/t480s/default.nix
@@ -4,7 +4,8 @@
   imports = [
     ../../../common/cpu/intel
     ../../../common/pc/laptop/acpi_call.nix
-    ../../../common/pc/laptop/cpu-throttling-bug.nix
     ../.
   ];
+
+  services.throttled.enable = lib.mkDefault true;
 }
diff --git a/lenovo/thinkpad/t490/default.nix b/lenovo/thinkpad/t490/default.nix
@@ -1,9 +1,8 @@
-{ nixos, pkgs, config, stdenv, ... }:
+{ nixos, lib, pkgs, config, stdenv, ... }:
 {
   imports = [
     ../../../common/cpu/intel
     ../../../common/pc/laptop/acpi_call.nix
-    ../../../common/pc/laptop/cpu-throttling-bug.nix
     ../.
   ];
 
@@ -26,5 +25,7 @@
 
     LABEL="pulseaudio_end"
     '';
+
+    throttled.enable = lib.mkDefault true;
   };
 }
diff --git a/lenovo/thinkpad/x1-extreme/gen2/default.nix b/lenovo/thinkpad/x1-extreme/gen2/default.nix
@@ -5,7 +5,6 @@ with lib;
 {
   imports = [
     ../.
-    ../../../../common/pc/laptop/cpu-throttling-bug.nix
   ];
 
   # Fixes an issue with incorrect battery reporting. See
@@ -44,4 +43,6 @@ with lib;
       videoDrivers = [ "intel" ];
     })
   ];
+
+  services.throttled.enable = lib.mkDefault true;
 }
diff --git a/lenovo/thinkpad/x1/6th-gen/default.nix b/lenovo/thinkpad/x1/6th-gen/default.nix
@@ -5,15 +5,16 @@
 #
 # Enable the lower-power S3 suspend state by upgrading the BIOS to version >= 1.30,
 # then manually selecting Linux in the power management section.
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 {
   imports = [
     ../.
     ../../../../common/pc/laptop/acpi_call.nix
-    ../../../../common/pc/laptop/cpu-throttling-bug.nix
   ];
 
   # New ThinkPads have a different TrackPoint manufacturer/name.
   # See also https://certification.ubuntu.com/catalog/component/input/5313/input%3ATPPS/2ElanTrackPoint/
   hardware.trackpoint.device = "TPPS/2 Elan TrackPoint";
+
+  services.throttled.enable = lib.mkDefault true;
 }