From 800786f11d0d195af558d67db151a33055604087 Mon Sep 17 00:00:00 2001 From: mexisme Date: Mon, 9 Jan 2023 23:05:15 +1300 Subject: [PATCH 1/4] Add Kernel 6.0.17 --- microsoft/surface/kernel/default.nix | 1 + .../surface/kernel/linux-6.0.17/default.nix | 38 ++++++ .../surface/kernel/linux-6.0.17/patches.nix | 122 ++++++++++++++++++ 3 files changed, 161 insertions(+) create mode 100644 microsoft/surface/kernel/linux-6.0.17/default.nix create mode 100644 microsoft/surface/kernel/linux-6.0.17/patches.nix diff --git a/microsoft/surface/kernel/default.nix b/microsoft/surface/kernel/default.nix index 6eba2ca..2b19413 100644 --- a/microsoft/surface/kernel/default.nix +++ b/microsoft/surface/kernel/default.nix @@ -7,6 +7,7 @@ in { imports = [ ./linux-5.19.17 ./linux-6.0.11 + ./linux-6.0.17 ]; options.microsoft-surface.kernelVersion = mkOption { diff --git a/microsoft/surface/kernel/linux-6.0.17/default.nix b/microsoft/surface/kernel/linux-6.0.17/default.nix new file mode 100644 index 0000000..5196065 --- /dev/null +++ b/microsoft/surface/kernel/linux-6.0.17/default.nix @@ -0,0 +1,38 @@ +{ config, lib, pkgs, ... }: + +let + inherit (lib) mkIf mkOption types; + inherit (pkgs) fetchurl; + + inherit (pkgs.callPackage ../linux-package.nix { }) linuxPackage repos; + + cfg = config.microsoft-surface; + + version = "6.0.17"; + extraMeta.branch = "6.0"; + patchDir = repos.linux-surface + "/patches/${extraMeta.branch}"; + kernelPatches = pkgs.callPackage ./patches.nix { + inherit (lib) kernel; + inherit version patchDir; + }; + + kernelPackages = linuxPackage { + inherit version extraMeta kernelPatches; + src = fetchurl { + url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; + sha256 = "sha256-p+6SCSpUWbtGq/C1RJpOV+i3klkaxOesBO0lQtLOHQg="; + }; + }; + + +in { + options.microsoft-surface.kernelVersion = mkOption { + type = types.enum [ "6.0.17" ]; + }; + + config = mkIf (cfg.kernelVersion == "6.0.17") { + boot = { + inherit kernelPackages; + }; + }; +} diff --git a/microsoft/surface/kernel/linux-6.0.17/patches.nix b/microsoft/surface/kernel/linux-6.0.17/patches.nix new file mode 100644 index 0000000..7b0d096 --- /dev/null +++ b/microsoft/surface/kernel/linux-6.0.17/patches.nix @@ -0,0 +1,122 @@ +{ kernel, + patchDir, + version, +}: + +[ + { + name = "microsoft-surface-patches-linux-${version}"; + patch = null; + structuredExtraConfig = with kernel; { + # + # Surface Aggregator Module + # + CONFIG_SURFACE_AGGREGATOR = module; + CONFIG_SURFACE_AGGREGATOR_ERROR_INJECTION = no; + 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; + + # + # Surface Hotplug + # + CONFIG_SURFACE_HOTPLUG = module; + + # + # IPTS touchscreen + # + # This only enables the user interface for IPTS data. + # For the touchscreen to work, you need to install iptsd. + # + CONFIG_MISC_IPTS = module; + + # + # Cameras: IPU3 + # + CONFIG_VIDEO_DW9719 = module; + CONFIG_VIDEO_IPU3_IMGU = module; + CONFIG_VIDEO_IPU3_CIO2 = module; + CONFIG_CIO2_BRIDGE = yes; + CONFIG_INTEL_SKL_INT3472 = module; + CONFIG_REGULATOR_TPS68470 = module; + CONFIG_COMMON_CLK_TPS68470 = module; + + # + # Cameras: Sensor drivers + # + CONFIG_VIDEO_OV5693 = module; + CONFIG_VIDEO_OV7251 = module; + CONFIG_VIDEO_OV8865 = module; + + # + # ALS Sensor for Surface Book 3, Surface Laptop 3, Surface Pro 7 + # + CONFIG_APDS9960 = 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-surface3-oemb"; + patch = patchDir + "/0001-surface3-oemb.patch"; + } + { + name = "ms-surface/0002-mwifiex"; + patch = patchDir + "/0002-mwifiex.patch"; + } + { + name = "ms-surface/0003-ath10k"; + patch = patchDir + "/0003-ath10k.patch"; + } + { + name = "ms-surface/0004-ipts"; + patch = patchDir + "/0004-ipts.patch"; + } + { + name = "ms-surface/0005-surface-sam"; + patch = patchDir + "/0005-surface-sam.patch"; + } + { + name = "ms-surface/0006-surface-sam-over-hid"; + patch = patchDir + "/0006-surface-sam-over-hid.patch"; + } + { + name = "ms-surface/0007-surface-button"; + patch = patchDir + "/0007-surface-button.patch"; + } + { + name = "ms-surface/0008-surface-typecover"; + patch = patchDir + "/0008-surface-typecover.patch"; + } + { + name = "ms-surface/0009-cameras"; + patch = patchDir + "/0009-cameras.patch"; + } + { + name = "ms-surface/0010-amd-gpio"; + patch = patchDir + "/0010-amd-gpio.patch"; + } + { + name = "ms-surface/0011-rtc"; + patch = patchDir + "/0011-rtc.patch"; + } +] From 0ee9d61fa68486b1b9ff8ddaf9f0dd91662e8766 Mon Sep 17 00:00:00 2001 From: mexisme Date: Mon, 9 Jan 2023 23:44:36 +1300 Subject: [PATCH 2/4] Update the rev. and sha256 of linux-surface repo to match latest "master" --- microsoft/surface/repos.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/microsoft/surface/repos.nix b/microsoft/surface/repos.nix index b15dd7e..eb9e5fa 100644 --- a/microsoft/surface/repos.nix +++ b/microsoft/surface/repos.nix @@ -4,8 +4,8 @@ linux-surface = fetchFromGitHub { owner = "linux-surface"; repo = "linux-surface"; - rev = "8995c6b3b4fb659397f4ebc760c6ac8b5efc5488"; - sha256 = "sha256-r7nbW0WKmvw7mMZL1BzuFwgwftyN5FIfP5xLDiQMEiI="; + rev = "487e64047ca047dde9a062909a87410e7bb86845"; + sha256 = "sha256-HTIuRBZk0prhUPd2KnsXGo+ZyBsMwERN7P8WJH1RG3M="; }; # This is the owner and repo for the pre-patched kernel from the "linux-surface" project: From 9020a320f5bd3c550a427b3a6c945979a68168bf Mon Sep 17 00:00:00 2001 From: mexisme Date: Mon, 9 Jan 2023 23:45:16 +1300 Subject: [PATCH 3/4] Install kernel 6.0.17 by default --- microsoft/surface/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/microsoft/surface/default.nix b/microsoft/surface/default.nix index 2952dae..1c0e628 100644 --- a/microsoft/surface/default.nix +++ b/microsoft/surface/default.nix @@ -9,7 +9,7 @@ in { ./firmware/surface-go/ath10k ]; - microsoft-surface.kernelVersion = mkDefault "6.0.11"; + microsoft-surface.kernelVersion = mkDefault "6.0.17"; boot.extraModprobeConfig = mkDefault '' options i915 enable_fbc=1 enable_rc6=1 modeset=1 From 51e3be9885b7d095eb1f7ba8a62ef6771e616e28 Mon Sep 17 00:00:00 2001 From: mexisme Date: Tue, 10 Jan 2023 12:41:58 +1300 Subject: [PATCH 4/4] Remove kernel 6.0.11 from MS Surface profile --- microsoft/surface/kernel/default.nix | 1 - .../surface/kernel/linux-6.0.11/default.nix | 38 ------ .../surface/kernel/linux-6.0.11/patches.nix | 118 ------------------ 3 files changed, 157 deletions(-) delete mode 100644 microsoft/surface/kernel/linux-6.0.11/default.nix delete mode 100644 microsoft/surface/kernel/linux-6.0.11/patches.nix diff --git a/microsoft/surface/kernel/default.nix b/microsoft/surface/kernel/default.nix index 2b19413..af2a2ba 100644 --- a/microsoft/surface/kernel/default.nix +++ b/microsoft/surface/kernel/default.nix @@ -6,7 +6,6 @@ let in { imports = [ ./linux-5.19.17 - ./linux-6.0.11 ./linux-6.0.17 ]; diff --git a/microsoft/surface/kernel/linux-6.0.11/default.nix b/microsoft/surface/kernel/linux-6.0.11/default.nix deleted file mode 100644 index 652f241..0000000 --- a/microsoft/surface/kernel/linux-6.0.11/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ config, lib, pkgs, ... }: - -let - inherit (lib) mkIf mkOption types; - inherit (pkgs) fetchurl; - - inherit (pkgs.callPackage ../linux-package.nix { }) linuxPackage repos; - - cfg = config.microsoft-surface; - - version = "6.0.11"; - extraMeta.branch = "6.0"; - patchDir = repos.linux-surface + "/patches/${extraMeta.branch}"; - kernelPatches = pkgs.callPackage ./patches.nix { - inherit (lib) kernel; - inherit version patchDir; - }; - - kernelPackages = linuxPackage { - inherit version extraMeta kernelPatches; - src = fetchurl { - url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "sha256-K65hMeZJceHjT/OV+lQpcRNMhXvbCykGmrhHx8mpx2I="; - }; - }; - - -in { - options.microsoft-surface.kernelVersion = mkOption { - type = types.enum [ "6.0.11" ]; - }; - - config = mkIf (cfg.kernelVersion == "6.0.11") { - boot = { - inherit kernelPackages; - }; - }; -} diff --git a/microsoft/surface/kernel/linux-6.0.11/patches.nix b/microsoft/surface/kernel/linux-6.0.11/patches.nix deleted file mode 100644 index e111c26..0000000 --- a/microsoft/surface/kernel/linux-6.0.11/patches.nix +++ /dev/null @@ -1,118 +0,0 @@ -{ kernel, - patchDir, - version, -}: - -[ - { - name = "microsoft-surface-patches-linux-${version}"; - patch = null; - structuredExtraConfig = with kernel; { - # - # Surface Aggregator Module - # - CONFIG_SURFACE_AGGREGATOR = module; - CONFIG_SURFACE_AGGREGATOR_ERROR_INJECTION = no; - 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; - - # - # Surface Hotplug - # - CONFIG_SURFACE_HOTPLUG = module; - - # - # IPTS touchscreen - # - # This only enables the user interface for IPTS data. - # For the touchscreen to work, you need to install iptsd. - # - CONFIG_MISC_IPTS = module; - - # - # Cameras: IPU3 - # - CONFIG_VIDEO_DW9719 = module; - CONFIG_VIDEO_IPU3_IMGU = module; - CONFIG_VIDEO_IPU3_CIO2 = module; - CONFIG_CIO2_BRIDGE = yes; - CONFIG_INTEL_SKL_INT3472 = module; - CONFIG_REGULATOR_TPS68470 = module; - CONFIG_COMMON_CLK_TPS68470 = module; - - # - # Cameras: Sensor drivers - # - CONFIG_VIDEO_OV5693 = module; - CONFIG_VIDEO_OV7251 = module; - CONFIG_VIDEO_OV8865 = module; - - # - # ALS Sensor for Surface Book 3, Surface Laptop 3, Surface Pro 7 - # - CONFIG_APDS9960 = 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-surface3-oemb"; - patch = patchDir + "/0001-surface3-oemb.patch"; - } - { - name = "ms-surface/0002-mwifiex"; - patch = patchDir + "/0002-mwifiex.patch"; - } - { - name = "ms-surface/0003-ath10k"; - patch = patchDir + "/0003-ath10k.patch"; - } - { - name = "ms-surface/0004-ipts"; - patch = patchDir + "/0004-ipts.patch"; - } - { - name = "ms-surface/0005-surface-sam"; - patch = patchDir + "/0005-surface-sam.patch"; - } - { - name = "ms-surface/0006-surface-sam-over-hid"; - patch = patchDir + "/0006-surface-sam-over-hid.patch"; - } - { - name = "ms-surface/0007-surface-button"; - patch = patchDir + "/0007-surface-button.patch"; - } - { - name = "ms-surface/0008-surface-typecover"; - patch = patchDir + "/0008-surface-typecover.patch"; - } - { - name = "ms-surface/0009-cameras"; - patch = patchDir + "/0009-cameras.patch"; - } - # { - # name = "ms-surface/0010-amd-gpio"; - # patch = patchDir + "/0010-amd-gpio.patch"; - # } -]