Merge #509

509: surface/kernel: 5.16.11 -> 5.19.17 r=Mic92 a=christophcharles



Co-authored-by: Christoph Charles <23055925+christophcharles@users.noreply.github.com>

microsoft/surface/kernel/default.nix

@@ -1,5 +1,5 @@
 { config, lib, pkgs, ... }:
 
 {
-  boot.kernelPackages = pkgs.callPackage ./linux-5.16.11.nix { };
+  boot.kernelPackages = pkgs.callPackage ./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 { }))

microsoft/surface/repos.nix

@@ -1,9 +1,9 @@
 { lib, pkgs, fetchFromGitHub, fetchurl }: {
-  linux-surface-kernel = fetchFromGitHub {
+  linux-surface = fetchFromGitHub {
     owner = "linux-surface";
-    repo = "kernel";
+    repo = "linux-surface";
-    rev = "db94c89f56d6ceae03ca3802e11197f48e6c539f";
+    rev = "fe2bed0f88a1803d87cd1805dc81272be32844ae";
-    sha256 = "0c58ri0i9gdb4w7l361pnkvq6ap17kmgnxngh0bcdmgn4dc88wx2";
+    sha256 = "sha256-sOJ4oN1F+/bNrGcqxh2IG4rn6twu//TExnn+qmQPW/0=";
   };
 
   ath10k-firmware = fetchFromGitHub {