Merge pull request #1763 from mexisme/microsoft-surface/update-kernel-6.18.8

microsoft/surface: update kernel patches to 6.18.8

microsoft/surface/common/default.nix

@@ -6,6 +6,10 @@
 }:
 
 let
+  inherit (builtins)
+    attrNames
+    ;
+
   inherit (lib)
     mkDefault
     mkOption
@@ -13,31 +17,27 @@ let
     versions
     ;
 
-  # Set the version and hash for the kernel sources
+  supportedKernels = {
-  srcVersion =
+    "longterm" = {
-    with config.hardware.microsoft-surface;
+      version = "6.12.19";
-    if kernelVersion == "longterm" then
+      hash = "sha256-1zvwV77ARDSxadG2FkGTb30Ml865I6KB8y413U3MZTE=";
-      "6.12.19"
+    };
-    else if kernelVersion == "stable" then
+    "stable" = {
-      "6.15.9"
+      version = "6.18.8";
-    else
+      hash = "sha256-N/DF1cJCwdYE6H1I8IeV6GGlqF9yW0yhHQpTjxL/jP8=";
-      abort "Invalid kernel version: ${kernelVersion}";
+    };
+  };
 
-  srcHash =
+  # Set the version and hash for the kernel sources
-    with config.hardware.microsoft-surface;
+  srcVersion = supportedKernels.${config.hardware.microsoft-surface.kernelVersion}.version;
-    if kernelVersion == "longterm" then
+  srcHash = supportedKernels.${config.hardware.microsoft-surface.kernelVersion}.hash;
-      "sha256-1zvwV77ARDSxadG2FkGTb30Ml865I6KB8y413U3MZTE="
-    else if kernelVersion == "stable" then
-      "sha256-6U86+FSSMC96gZRBRY+AvKCtmRLlpMg8aZ/zxjxSlX0="
-    else
-      abort "Invalid kernel version: ${kernelVersion}";
 
   # Fetch the latest linux-surface patches
   linux-surface = pkgs.fetchFromGitHub {
     owner = "linux-surface";
     repo = "linux-surface";
-    rev = "50d0ed6be462a5fdb643cfe8469bf69158afae42";
+    rev = "faedd344762f9db3fe3c79e4f085d4ca7891e0c8"; # debian-6.18.8-1
-    hash = "sha256-VEoZH3dFsLn9GnUyjnbOoJeTRM3KEQ9fhlMk03NXoXs=";
+    hash = "sha256-2t5tMvne8W1q/hCO+O5XfuHj6DAzO6iKtCC6egXsWWM=";
   };
 
   # Fetch and build the kernel
@@ -48,7 +48,7 @@ let
   kernelPatches = surfacePatches {
     version = srcVersion;
     patchFn = ./kernel/${versions.majorMinor srcVersion}/patches.nix;
-    patchSrc = (linux-surface + "/patches/${versions.majorMinor srcVersion}");
+    patchSrc = linux-surface + "/patches/${versions.majorMinor srcVersion}";
   };
   kernelPackages = linuxPackage {
     inherit kernelPatches;
@@ -61,10 +61,7 @@ in
 {
   options.hardware.microsoft-surface.kernelVersion = mkOption {
     description = "Kernel Version to use (patched for MS Surface)";
-    type = types.enum [
+    type = types.enum (attrNames supportedKernels);
-      "longterm"
-      "stable"
-    ];
     default = "longterm";
   };
 

microsoft/surface/common/kernel/6.18/patches.nix

@@ -0,0 +1,169 @@
+{
+  lib,
+  kernel ? lib.kernel,
+  patchSrc,
+  version,
+}:
+
+[
+  {
+    name = "microsoft-surface-patches-linux-${version}";
+    patch = null;
+    structuredExtraConfig = with kernel; {
+      ##
+      ## Surface Aggregator Module
+      ##
+      CONFIG_SURFACE_AGGREGATOR = module;
+      # CONFIG_SURFACE_AGGREGATOR_ERROR_INJECTION is not set
+      CONFIG_SURFACE_AGGREGATOR_BUS = yes;
+      CONFIG_SURFACE_AGGREGATOR_CDEV = module;
+      CONFIG_SURFACE_AGGREGATOR_HUB = module;
+      CONFIG_SURFACE_AGGREGATOR_REGISTRY = module;
+      CONFIG_SURFACE_AGGREGATOR_TABLET_SWITCH = module;
+
+      CONFIG_SURFACE_ACPI_NOTIFY = module;
+      CONFIG_SURFACE_DTX = module;
+      CONFIG_SURFACE_PLATFORM_PROFILE = module;
+
+      CONFIG_SURFACE_HID = module;
+      CONFIG_SURFACE_KBD = module;
+
+      CONFIG_BATTERY_SURFACE = module;
+      CONFIG_CHARGER_SURFACE = module;
+
+      CONFIG_SENSORS_SURFACE_TEMP = module;
+      CONFIG_SENSORS_SURFACE_FAN = module;
+
+      CONFIG_RTC_DRV_SURFACE = module;
+
+      ##
+      ## Surface Hotplug
+      ##
+      CONFIG_SURFACE_HOTPLUG = module;
+
+      ##
+      ## IPTS and ITHC touchscreen
+      ##
+      ## This only enables the user interface for IPTS/ITHC data.
+      ## For the touchscreen to work, you need to install iptsd.
+      ##
+      CONFIG_HID_IPTS = module;
+      CONFIG_HID_ITHC = module;
+      CONFIG_INTEL_THC_HID = module;
+      CONFIG_INTEL_QUICKSPI = module;
+
+      ##
+      ## Cameras: IPU3
+      ##
+      CONFIG_VIDEO_DW9719 = module;
+      CONFIG_VIDEO_IPU3_IMGU = module;
+      CONFIG_VIDEO_IPU3_CIO2 = module;
+      CONFIG_IPU_BRIDGE = module;
+      CONFIG_INTEL_SKL_INT3472 = module;
+      CONFIG_REGULATOR_TPS68470 = module;
+      CONFIG_COMMON_CLK_TPS68470 = module;
+      CONFIG_LEDS_TPS68470 = module;
+
+      ##
+      ## Cameras: Sensor drivers
+      ##
+      CONFIG_VIDEO_OV5693 = module;
+      CONFIG_VIDEO_OV7251 = module;
+      CONFIG_VIDEO_OV8865 = module;
+
+      ##
+      ## Surface 3: atomisp causes problems (see issue #1095). Disable it for now.
+      ##
+      # CONFIG_INTEL_ATOMISP is not set
+
+      ##
+      ## ALS Sensor for Surface Book 3, Surface Laptop 3, Surface Pro 7
+      ##
+      CONFIG_APDS9960 = module;
+
+      ##
+      ## Build-in UFS support (required for some Surface Go devices)
+      ##
+      CONFIG_SCSI_UFSHCD = module;
+      CONFIG_SCSI_UFSHCD_PCI = module;
+
+      ##
+      ## Other Drivers
+      ##
+      CONFIG_INPUT_SOC_BUTTON_ARRAY = module;
+      CONFIG_SURFACE_3_POWER_OPREGION = module;
+      CONFIG_SURFACE_PRO3_BUTTON = module;
+      CONFIG_SURFACE_GPE = module;
+      CONFIG_SURFACE_BOOK1_DGPU_SWITCH = module;
+      CONFIG_HID_SURFACE = module;
+    };
+  }
+  {
+    name = "ms-surface/0001-secureboot";
+    patch = patchSrc + "/0001-secureboot.patch";
+  }
+  {
+    name = "ms-surface/0002-surface3";
+    patch = patchSrc + "/0002-surface3.patch";
+  }
+  {
+    name = "ms-surface/0003-mwifiex";
+    patch = patchSrc + "/0003-mwifiex.patch";
+  }
+  {
+    name = "ms-surface/0004-ath10k";
+    patch = patchSrc + "/0004-ath10k.patch";
+  }
+  {
+    name = "ms-surface/0005-ipts";
+    patch = patchSrc + "/0005-ipts.patch";
+  }
+  {
+    name = "ms-surface/0006-ithc";
+    patch = patchSrc + "/0006-ithc.patch";
+  }
+  {
+    name = "ms-surface/0007-surface-sam";
+    patch = patchSrc + "/0007-surface-sam.patch";
+  }
+  {
+    name = "ms-surface/0008-surface-sam-over-hid";
+    patch = patchSrc + "/0008-surface-sam-over-hid.patch";
+  }
+  {
+    name = "ms-surface/0009-surface-button";
+    patch = patchSrc + "/0009-surface-button.patch";
+  }
+  {
+    name = "ms-surface/0010-surface-typecover";
+    patch = patchSrc + "/0010-surface-typecover.patch";
+  }
+  {
+    name = "ms-surface/0011-surface-shutdown";
+    patch = patchSrc + "/0011-surface-shutdown.patch";
+  }
+  {
+    name = "ms-surface/0012-surface-gpe";
+    patch = patchSrc + "/0012-surface-gpe.patch";
+  }
+  {
+    name = "ms-surface/0013-cameras";
+    patch = patchSrc + "/0013-cameras.patch";
+  }
+  {
+    name = "ms-surface/0014-amd-gpio";
+    patch = patchSrc + "/0014-amd-gpio.patch";
+  }
+  {
+    name = "ms-surface/0015-rtc";
+    patch = patchSrc + "/0015-rtc.patch";
+  }
+  {
+    name = "ms-surface/0016-hid-surface";
+    patch = patchSrc + "/0016-hid-surface.patch";
+  }
+  {
+    name = "ms-surface/0017-powercap";
+    patch = patchSrc + "/0017-powercap.patch";
+  }
+]

microsoft/surface/default.nix

@@ -1,4 +1,4 @@
-{ ... }:
+_:
 
 {
   assertions = [