diff --git a/microsoft/surface/common/default.nix b/microsoft/surface/common/default.nix index f4dbfe9..5656d97 100644 --- a/microsoft/surface/common/default.nix +++ b/microsoft/surface/common/default.nix @@ -8,7 +8,7 @@ in { ./kernel ]; - microsoft-surface.kernelVersion = mkDefault "6.10"; + microsoft-surface.kernelVersion = mkDefault "6.11"; # Seems to be required to properly enable S0ix "Modern Standby": boot.kernelParams = mkDefault [ "mem_sleep_default=deep" ]; diff --git a/microsoft/surface/common/kernel/default.nix b/microsoft/surface/common/kernel/default.nix index 84edc89..490ecd0 100644 --- a/microsoft/surface/common/kernel/default.nix +++ b/microsoft/surface/common/kernel/default.nix @@ -5,7 +5,7 @@ let in { imports = [ - ./linux-6.10.x + ./linux-surface ]; options.microsoft-surface.kernelVersion = mkOption { diff --git a/microsoft/surface/common/kernel/linux-6.10.x/patches.nix b/microsoft/surface/common/kernel/linux-6.10.x/patches.nix deleted file mode 100644 index 9590b9e..0000000 --- a/microsoft/surface/common/kernel/linux-6.10.x/patches.nix +++ /dev/null @@ -1,148 +0,0 @@ -{ lib, - kernel ? lib.kernel, - patchSrc, - version, -}: - -[ - { - name = "microsoft-surface-patches-linux-${version}"; - patch = null; - extraStructuredConfig = with kernel; { - STAGING_MEDIA = yes; - - # - # Surface Aggregator Module - # - SURFACE_AGGREGATOR = module; - # SURFACE_AGGREGATOR_ERROR_INJECTION is not set - SURFACE_AGGREGATOR_BUS = yes; - SURFACE_AGGREGATOR_CDEV = module; - SURFACE_AGGREGATOR_HUB = module; - SURFACE_AGGREGATOR_REGISTRY = module; - SURFACE_AGGREGATOR_TABLET_SWITCH = 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 Hotplug - ## - 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. - ## - HID_IPTS = module; - HID_ITHC = module; - - ## - ## Cameras: IPU3 - ## - VIDEO_DW9719 = module; - VIDEO_IPU3_IMGU = module; - VIDEO_IPU3_CIO2 = module; - IPU_BRIDGE = module; - INTEL_SKL_INT3472 = module; - REGULATOR_TPS68470 = module; - COMMON_CLK_TPS68470 = module; - LEDS_TPS68470 = module; - - ## - ## Cameras: Sensor drivers - ## - VIDEO_OV5693 = module; - VIDEO_OV7251 = module; - VIDEO_OV8865 = module; - - ## - ## Surface 3: atomisp causes problems (see issue #1095). Disable it for now. - ## - # INTEL_ATOMISP is not set - - ## - ## ALS Sensor for Surface Book 3, Surface Laptop 3, Surface Pro 7 - ## - APDS9960 = module; - - ## - ## Other Drivers - ## - INPUT_SOC_BUTTON_ARRAY = module; - SURFACE_3_POWER_OPREGION = module; - SURFACE_PRO3_BUTTON = module; - SURFACE_GPE = module; - SURFACE_BOOK1_DGPU_SWITCH = module; - }; - } - { - name = "ms-surface/0001-secureboot"; - patch = patchSrc + "/0001-secureboot.patch"; - } - { - name = "ms-surface/0002-surface3-oemb"; - patch = patchSrc + "/0002-surface3-oemb.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"; - } -] diff --git a/microsoft/surface/common/kernel/linux-6.10.x/default.nix b/microsoft/surface/common/kernel/linux-surface/default.nix similarity index 87% rename from microsoft/surface/common/kernel/linux-6.10.x/default.nix rename to microsoft/surface/common/kernel/linux-surface/default.nix index 484e162..fa31751 100644 --- a/microsoft/surface/common/kernel/linux-6.10.x/default.nix +++ b/microsoft/surface/common/kernel/linux-surface/default.nix @@ -7,14 +7,14 @@ let cfg = config.microsoft-surface; - version = "6.10.5"; + version = "6.11.4"; kernelPatches = surfacePatches { inherit version; patchFn = ./patches.nix; }; kernelPackages = linuxPackage { inherit version kernelPatches; - sha256 = "02yckkh6sxvcrwzbqgmw4jhqhxmbvz87xn9wm6bwwka3w2r9x41h"; + sha256 = "0mcg1rrw9b0lwj88jkaw6ic2mks8xh8i92v90sbr2x35ljhb0m5x"; ignoreConfigErrors=true; }; diff --git a/microsoft/surface/common/kernel/linux-surface/patches.nix b/microsoft/surface/common/kernel/linux-surface/patches.nix new file mode 100644 index 0000000..92916c9 --- /dev/null +++ b/microsoft/surface/common/kernel/linux-surface/patches.nix @@ -0,0 +1,157 @@ +{ lib, + kernel ? lib.kernel, + patchSrc, + version, +}: + +[ + { + name = "microsoft-surface-patches-linux-${version}"; + patch = null; + extraStructuredConfig = with kernel; { + STAGING_MEDIA = yes; + +## +## 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; + +## +## 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; + +## +## 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; + }; + } + { + name = "ms-surface/0001-secureboot"; + patch = patchSrc + "/0001-secureboot.patch"; + } + { + name = "ms-surface/0002-surface3-oemb"; + patch = patchSrc + "/0002-surface3-oemb.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"; + } +] diff --git a/microsoft/surface/common/repos.nix b/microsoft/surface/common/repos.nix index cb7ddba..8ca0701 100644 --- a/microsoft/surface/common/repos.nix +++ b/microsoft/surface/common/repos.nix @@ -4,8 +4,8 @@ linux-surface = fetchFromGitHub { owner = "linux-surface"; repo = "linux-surface"; - rev = "arch-6.10.3-1"; - hash = "sha256-T7voXofI5W+YodHB2DtNSKKc4iUlN3NS0onP4TKFvQM="; + rev = "arch-6.11.4-1"; + hash = "sha256-5rKfAIkGoD5Y4nMobr7wGvzZqN2yFElXqHdcQS2VL14="; }; # This is the owner and repo for the pre-patched kernel from the "linux-surface" project: