Merge branch 'up/master' into microsoft/surface/kernel-6.0.11

README.md

@@ -126,6 +126,7 @@ See code for all available configurations.
 | [Lenovo IdeaPad Z510](lenovo/ideapad/z510)                          | `<nixos-hardware/lenovo/ideapad/z510>`             |
 | [Lenovo Legion 5 15arh05h](lenovo/legion/15arh05h)                  | `<nixos-hardware/lenovo/legion/15arh05h>`          |
 | [Lenovo Legion 7 Slim 15ach6](lenovo/legion/15ach6)                 | `<nixos-hardware/lenovo/legion/15ach6>`            |
+| [Lenovo Legion 5 Pro 16ach6h](lenovo/legion/16ach6h)                | `<nixos-hardware/lenovo/legion/16ach6h>`           |
 | [Lenovo ThinkPad E14 (AMD)](lenovo/thinkpad/e14/amd)                | `<nixos-hardware/lenovo/thinkpad/e14/amd>`         |
 | [Lenovo ThinkPad E14 (Intel)](lenovo/thinkpad/e14/intel)            | `<nixos-hardware/lenovo/thinkpad/e14/intel>`       |
 | [Lenovo ThinkPad E470](lenovo/thinkpad/e470)                        | `<nixos-hardware/lenovo/thinkpad/e470>`            |

flake.nix

@@ -60,6 +60,7 @@
       lenovo-ideapad-z510 = import ./lenovo/ideapad/z510;
       lenovo-legion-15ach6 = import ./lenovo/legion/15ach6;
       lenovo-legion-15arh05h = import ./lenovo/legion/15arh05h;
+      lenovo-legion-16ach6h = import ./lenovo/legion/16ach6h;
       lenovo-legion-16ithg6 = import ./lenovo/legion/16ithg6;
       lenovo-thinkpad = import ./lenovo/thinkpad;
       lenovo-thinkpad-e14-amd = import ./lenovo/thinkpad/e14/amd;

lenovo/legion/16ach6h/README.md

@@ -0,0 +1,19 @@
+## Setup at the time of testing
+```
+$ nix-info -m
+ - system: `"x86_64-linux"`
+ - host os: `Linux 6.0.9, NixOS, 22.11 (Raccoon), 22.11beta19.c9538a9b707`
+ - multi-user?: `yes`
+ - sandbox: `yes`
+ - version: `nix-env (Nix) 2.11.0`
+ - channels(root): `"nixos-22.11"`
+ - nixpkgs: `/nix/var/nix/profiles/per-user/root/channels/nixos`
+ ```
+ ```
+ $ lspci
+...
+01:00.0 VGA compatible controller: NVIDIA Corporation GA104M [GeForce RTX 3070 Mobile / Max-Q] (rev a1)
+...
+06:00.0 VGA compatible controller: Advanced Micro Devices, Inc. [AMD/ATI] Cezanne (rev c5)
+...
+```

lenovo/legion/16ach6h/default.nix

@@ -0,0 +1,18 @@
+{ lib, ... }:
+
+{
+  imports = [
+    ../../../common/cpu/amd
+    ../../../common/gpu/amd
+    ../../../common/gpu/nvidia/prime.nix
+    ../../../common/pc/laptop
+    ../../../common/pc/laptop/ssd
+  ];
+
+  hardware.nvidia.prime = {
+    amdgpuBusId = "PCI:6:0:0";
+    nvidiaBusId = "PCI:1:0:0";
+  };
+
+  services.thermald.enable = lib.mkDefault true;
+}

microsoft/surface/kernel/default.nix

@@ -24,13 +24,10 @@ let
       linuxPackagesFor' = linuxPackagesFor buildLinux';
     in recurseIntoAttrs linuxPackagesFor';
 
-  linux-5_16_11 = linuxPackage (
+  linux-5_19_17 = linuxPackage (
-    pkgs.callPackage ./linux-5.16.11.nix { inherit repos; }
+    pkgs.callPackage ./linux-5.19.17 { inherit repos; };
-  );
-  linux-5_19_2 = linuxPackage (
-    pkgs.callPackage ./linux-5.19.2.nix { inherit repos; }
   );
 
 in {
-  boot.kernelPackages = linux-5_19_2;
+  boot.kernelPackages = linux-5_19_17;
 }

microsoft/surface/kernel/linux-5.16.11.nix

@@ -1,87 +0,0 @@
-{ lib, callPackage, linuxPackagesFor, ... }:
-# To test the kernel build:
-# nix-build -E "with import <nixpkgs> {}; (pkgs.callPackage ./linux-5.16.11.nix {}).kernel"
-let
-  repos = callPackage ../repos.nix {};
-  linuxPkg = { fetchurl, buildLinux, ... }@args:
-    buildLinux (args // rec {
-      version = "5.16.11";
-      modDirVersion = version;
-      extraMeta.branch = "5.16";
-
-      src = repos.linux-surface-kernel;
-
-      kernelPatches = [{
-        name = "microsoft-surface-patches-linux-5.16.2";
-        patch = null;
-        structuredExtraConfig = with lib.kernel; {
-          #
-          # Surface Aggregator Module
-          #
-          SURFACE_AGGREGATOR = module;
-          SURFACE_AGGREGATOR_ERROR_INJECTION = no;
-          SURFACE_AGGREGATOR_BUS = yes;
-          SURFACE_AGGREGATOR_CDEV = module;
-          SURFACE_AGGREGATOR_REGISTRY = module;
-
-          SURFACE_ACPI_NOTIFY = module;
-          SURFACE_DTX = module;
-          SURFACE_PLATFORM_PROFILE = module;
-
-          SURFACE_HID = module;
-          SURFACE_KBD = module;
-
-          BATTERY_SURFACE = module;
-          CHARGER_SURFACE = module;
-
-          #
-          # Surface laptop 1 keyboard
-          #
-          SERIAL_DEV_BUS = yes;
-          SERIAL_DEV_CTRL_TTYPORT = yes;
-
-          #
-          # Surface Hotplug
-          #
-          SURFACE_HOTPLUG = module;
-
-          #
-          # IPTS touchscreen
-          #
-          # This only enables the user interface for IPTS data.
-          # For the touchscreen to work, you need to install iptsd.
-          #
-          MISC_IPTS = module;
-
-          #
-          # Cameras: IPU3
-          #
-          VIDEO_IPU3_IMGU = module;
-          VIDEO_IPU3_CIO2 = module;
-          CIO2_BRIDGE = yes;
-          INTEL_SKL_INT3472 = module;
-
-          #
-          # Cameras: Sensor drivers
-          #
-          VIDEO_OV5693 = module;
-          VIDEO_OV8865 = module;
-
-          #
-          # ALS Sensor for Surface Book 3, Surface Laptop 3, Surface Pro 7
-          #
-          APDS9960 = module;
-
-          #
-          # Other Drivers
-          #
-          INPUT_SOC_BUTTON_ARRAY = module;
-          SURFACE_3_BUTTON = module;
-          SURFACE_3_POWER_OPREGION = module;
-          SURFACE_PRO3_BUTTON = module;
-          SURFACE_GPE = module;
-          SURFACE_BOOK1_DGPU_SWITCH = module;
-        };
-      }];
-    } // (args.argsOverride or {}));
-in lib.recurseIntoAttrs (linuxPackagesFor (callPackage linuxPkg {}))

microsoft/surface/kernel/linux-5.19.17/default.nix

@@ -0,0 +1,126 @@
+{ config, lib, pkgs, ... }:
+let
+  repos = (pkgs.callPackage ../../repos.nix { });
+  patches = repos.linux-surface + "/patches";
+  surface_kernelPatches = [
+    {
+      name = "microsoft-surface-patches-linux-5.19.17";
+      patch = null;
+      structuredExtraConfig = with lib.kernel; {
+        #
+        # Surface Aggregator Module
+        #
+        SURFACE_AGGREGATOR = module;
+        SURFACE_AGGREGATOR_ERROR_INJECTION = no;
+        SURFACE_AGGREGATOR_BUS = yes;
+        SURFACE_AGGREGATOR_CDEV = module;
+        SURFACE_AGGREGATOR_REGISTRY = module;
+
+        SURFACE_ACPI_NOTIFY = module;
+        SURFACE_DTX = module;
+        SURFACE_PLATFORM_PROFILE = module;
+
+        SURFACE_HID = module;
+        SURFACE_KBD = module;
+
+        BATTERY_SURFACE = module;
+        CHARGER_SURFACE = module;
+        
+        #
+        # Surface laptop 1 keyboard
+        #
+        SERIAL_DEV_BUS = yes;
+        SERIAL_DEV_CTRL_TTYPORT = yes;
+
+        #
+        # Surface Hotplug
+        #
+        SURFACE_HOTPLUG = module;
+
+        #
+        # IPTS touchscreen
+        #
+        # This only enables the user interface for IPTS data.
+        # For the touchscreen to work, you need to install iptsd.
+        #
+        MISC_IPTS = module;
+
+        #
+        # Cameras: IPU3
+        #
+        VIDEO_IPU3_IMGU = module;
+        VIDEO_IPU3_CIO2 = module;
+        CIO2_BRIDGE = yes;
+        INTEL_SKL_INT3472 = module;
+
+        #
+        # Cameras: Sensor drivers
+        #
+        VIDEO_OV5693 = module;
+        VIDEO_OV8865 = module;
+
+        #
+        # ALS Sensor for Surface Book 3, Surface Laptop 3, Surface Pro 7
+        #
+        APDS9960 = module;
+
+        #
+        # Other Drivers
+        #
+        INPUT_SOC_BUTTON_ARRAY = module;
+        SURFACE_3_BUTTON = module;
+        SURFACE_3_POWER_OPREGION = module;
+        SURFACE_PRO3_BUTTON = module;
+        SURFACE_GPE = module;
+        SURFACE_BOOK1_DGPU_SWITCH = module;
+      };
+    }
+    {
+      name = "ms-surface/0001-surface3-oemb";
+      patch = patches + "/5.19/0001-surface3-oemb.patch";
+    }
+    {
+      name = "ms-surface/0002-mwifiex";
+      patch = patches + "/5.19/0002-mwifiex.patch";
+    }
+    {
+      name = "ms-surface/0003-ath10k";
+      patch = patches + "/5.19/0003-ath10k.patch";
+    }
+    {
+      name = "ms-surface/0004-ipts";
+      patch = patches + "/5.19/0004-ipts.patch";
+    }
+    {
+      name = "ms-surface/0005-surface-sam";
+      patch = patches + "/5.19/0005-surface-sam.patch";
+    }
+    {
+      name = "ms-surface/0006-surface-sam-over-hid";
+      patch = patches + "/5.19/0006-surface-sam-over-hid.patch";
+    }
+    {
+      name = "ms-surface/0007-surface-button";
+      patch = patches + "/5.19/0007-surface-button.patch";
+    }
+    {
+      name = "ms-surface/0008-surface-typecover";
+      patch = patches + "/5.19/0008-surface-typecover.patch";
+    }
+    {
+      name = "ms-surface/0009-surface-gpe";
+      patch = patches + "/5.19/0009-surface-gpe.patch";
+    }
+    {
+      name = "ms-surface/0010-cameras";
+      patch = patches + "/5.19/0010-cameras.patch";
+    }
+    {
+      name = "ms-surface/0011-amd-gpio";
+      patch = patches + "/5.19/0011-amd-gpio.patch";
+    }
+  ];
+in (with pkgs;
+  recurseIntoAttrs (linuxPackagesFor (callPackage ./linux-5.19.17.nix {
+    kernelPatches = surface_kernelPatches;
+  })))

microsoft/surface/kernel/linux-5.19.17/linux-5.19.17.nix

@@ -0,0 +1,22 @@
+{ lib, stdenv, buildPackages, fetchurl, perl, buildLinux
+, modDirVersionArg ? null, ... }@args:
+
+with lib;
+
+buildLinux (args // rec {
+  version = "5.19.17";
+
+  # modDirVersion needs to be x.y.z, will automatically add .0 if needed
+  modDirVersion = if (modDirVersionArg == null) then
+    concatStringsSep "." (take 3 (splitVersion "${version}.0"))
+  else
+    modDirVersionArg;
+
+  # branchVersion needs to be x.y
+  extraMeta.branch = versions.majorMinor version;
+
+  src = fetchurl {
+    url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
+    sha256 = "sha256-yTuzhKl60fCk8Y5ELOApEkJyL3gCPspliyI0RUHwlIk=";
+  };
+} // (args.argsOverride or { }))