From 9925ef3c17baedb1c816158b733e8b107f68a2e4 Mon Sep 17 00:00:00 2001 From: Andre Date: Mon, 11 May 2026 15:06:23 +0200 Subject: [PATCH 1/4] nixos-hardware: testing Surface kernel 7.0 --- microsoft/surface/common/default.nix | 29 ++- .../surface/common/kernel/7.0/patches.nix | 165 ++++++++++++++++++ 2 files changed, 186 insertions(+), 8 deletions(-) create mode 100644 microsoft/surface/common/kernel/7.0/patches.nix diff --git a/microsoft/surface/common/default.nix b/microsoft/surface/common/default.nix index 32c9ce474..7182ce80f 100644 --- a/microsoft/surface/common/default.nix +++ b/microsoft/surface/common/default.nix @@ -23,11 +23,14 @@ let version = "6.18.13"; hash = "sha256-7Sw8Vf045oNsCU/ONW8lZ/lRYTC3M1SimFeWA2jFaH8="; }; - + stable-kernel = { + version = "7.0.9"; + hash = "sha256-rAes33bPRiHMUYeiZwJwoaaZUzyKayJeSHjEFq2D8cQ="; + }; in { "longterm" = lts-kernel; - "stable" = lts-kernel; + "stable" = stable-kernel; }; # Set the version and hash for the kernel sources @@ -35,12 +38,22 @@ let srcHash = supportedKernels.${config.hardware.microsoft-surface.kernelVersion}.hash; # Fetch the latest linux-surface patches - linux-surface = pkgs.fetchFromGitHub { - owner = "linux-surface"; - repo = "linux-surface"; - rev = "829ceccd5970ed3621a30d9fcfb2fe6584a3aab7"; - hash = "sha256-H/qjP2dR5yjUvHUhI6pis+EHHSRXxc4+c4zir/pDA54="; - }; + linux-surface = ( + if (versions.majorMinor srcVersion == "longterm") then + pkgs.fetchFromGitHub { + owner = "linux-surface"; + repo = "linux-surface"; + rev = "829ceccd5970ed3621a30d9fcfb2fe6584a3aab7"; + hash = "sha256-H/qjP2dR5yjUvHUhI6pis+EHHSRXxc4+c4zir/pDA54="; + } + else + (pkgs.fetchFromGitHub { + owner = "Apiznel"; + repo = "linux-surface"; + rev = "d9173b9ac33e5730fb15f803ddc7c9d91332c174"; + hash = "sha256-Ja5gAVsknjoXZuQGY9grb1pICvsyMnm8ur3mK/711vw="; + }) + ); # Fetch and build the kernel inherit (pkgs.callPackage ./kernel/linux-package.nix { }) diff --git a/microsoft/surface/common/kernel/7.0/patches.nix b/microsoft/surface/common/kernel/7.0/patches.nix new file mode 100644 index 000000000..f4f0c2a25 --- /dev/null +++ b/microsoft/surface/common/kernel/7.0/patches.nix @@ -0,0 +1,165 @@ +{ + 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"; + } +] From 48eedc533d6a8f86e96344602663659c452769a2 Mon Sep 17 00:00:00 2001 From: Andre Date: Sat, 6 Jun 2026 10:58:06 -0400 Subject: [PATCH 2/4] microsoft/surface: update to kernel 7.0.11 --- microsoft/surface/common/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/microsoft/surface/common/default.nix b/microsoft/surface/common/default.nix index ce7c9b392..86a1a4e75 100644 --- a/microsoft/surface/common/default.nix +++ b/microsoft/surface/common/default.nix @@ -24,8 +24,8 @@ let hash = "sha256-qtpHItuLz6C5cyhRhW1AUIK2pPouOrBnvo2xfN0RWzg="; }; stable-kernel = { - version = "7.0.9"; - hash = "sha256-rAes33bPRiHMUYeiZwJwoaaZUzyKayJeSHjEFq2D8cQ="; + version = "7.0.11"; + hash = "sha256-5WyDVt2gETamBBxu+DK9Dsmb0tNd/5eDKqXsEO0BQwQ="; }; in { @@ -50,8 +50,8 @@ let (pkgs.fetchFromGitHub { owner = "Apiznel"; repo = "linux-surface"; - rev = "d9173b9ac33e5730fb15f803ddc7c9d91332c174"; - hash = "sha256-Ja5gAVsknjoXZuQGY9grb1pICvsyMnm8ur3mK/711vw="; + rev = "6dc9bc6a90830fb523a93d73fb2656bcf3aaa9cd"; + hash = "sha256-yKqnK78WQ2LX7VUNuY1fhYkddr042xB4YI1KuyaO78g="; }) ); From 2849f0f641082cd6933346dc9bbce9b09f5ccf37 Mon Sep 17 00:00:00 2001 From: Andre Date: Fri, 19 Jun 2026 11:45:05 -0400 Subject: [PATCH 3/4] microsoft/surface: update to kernel 7.1.1 --- microsoft/surface/common/default.nix | 8 ++++---- .../common/kernel/{7.0 => 7.1}/patches.nix | 20 ++++++++----------- 2 files changed, 12 insertions(+), 16 deletions(-) rename microsoft/surface/common/kernel/{7.0 => 7.1}/patches.nix (92%) diff --git a/microsoft/surface/common/default.nix b/microsoft/surface/common/default.nix index 86a1a4e75..647d1b5de 100644 --- a/microsoft/surface/common/default.nix +++ b/microsoft/surface/common/default.nix @@ -24,8 +24,8 @@ let hash = "sha256-qtpHItuLz6C5cyhRhW1AUIK2pPouOrBnvo2xfN0RWzg="; }; stable-kernel = { - version = "7.0.11"; - hash = "sha256-5WyDVt2gETamBBxu+DK9Dsmb0tNd/5eDKqXsEO0BQwQ="; + version = "7.1.1"; + hash = "sha256-UhX6NUHcfn9bzVG/flfxac7G/OUIylTj3IX97hQ3HX0="; }; in { @@ -50,8 +50,8 @@ let (pkgs.fetchFromGitHub { owner = "Apiznel"; repo = "linux-surface"; - rev = "6dc9bc6a90830fb523a93d73fb2656bcf3aaa9cd"; - hash = "sha256-yKqnK78WQ2LX7VUNuY1fhYkddr042xB4YI1KuyaO78g="; + rev = "f694fbab50b0905c71fa2148cdad57c47c5df3c0"; + hash = "sha256-/281m7knzni7mR7z4ES1q6mWBDAV98a//YCRe0yUSEc="; }) ); diff --git a/microsoft/surface/common/kernel/7.0/patches.nix b/microsoft/surface/common/kernel/7.1/patches.nix similarity index 92% rename from microsoft/surface/common/kernel/7.0/patches.nix rename to microsoft/surface/common/kernel/7.1/patches.nix index f4f0c2a25..8a7c466b6 100644 --- a/microsoft/surface/common/kernel/7.0/patches.nix +++ b/microsoft/surface/common/kernel/7.1/patches.nix @@ -81,12 +81,6 @@ ## CONFIG_APDS9960 = module; - ## - ## Build-in UFS support (required for some Surface Go devices) - ## - CONFIG_SCSI_UFSHCD = module; - CONFIG_SCSI_UFSHCD_PCI = module; - ## ## Other Drivers ## @@ -96,6 +90,12 @@ CONFIG_SURFACE_GPE = module; CONFIG_SURFACE_BOOK1_DGPU_SWITCH = module; CONFIG_HID_SURFACE = module; + + ## + ## HOTFIX FOR CVE-2026-31431 + ## + + # CONFIG_CRYPTO_USER_API_AEAD is not set }; } { @@ -155,11 +155,7 @@ 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/0015-hid-surface"; + patch = patchSrc + "/0015-hid-surface.patch"; } ] From 09d649d40a6c0f4c4af80de39faf4ac2ead452fa Mon Sep 17 00:00:00 2001 From: Andre Date: Tue, 14 Jul 2026 21:03:10 -0400 Subject: [PATCH 4/4] microsoft/surface: update to kernel 7.1.3 --- microsoft/surface/common/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/microsoft/surface/common/default.nix b/microsoft/surface/common/default.nix index 647d1b5de..cb8110fb5 100644 --- a/microsoft/surface/common/default.nix +++ b/microsoft/surface/common/default.nix @@ -24,8 +24,8 @@ let hash = "sha256-qtpHItuLz6C5cyhRhW1AUIK2pPouOrBnvo2xfN0RWzg="; }; stable-kernel = { - version = "7.1.1"; - hash = "sha256-UhX6NUHcfn9bzVG/flfxac7G/OUIylTj3IX97hQ3HX0="; + version = "7.1.3"; + hash = "sha256-vkHAaOiPUkKhm8zb/74HexjEe0X2J+IyVQS0+red0dw="; }; in {