From e37520e48b3882f4ec773d2e56d41dd914cae34d Mon Sep 17 00:00:00 2001 From: mexisme Date: Mon, 5 Dec 2022 17:32:25 +1300 Subject: [PATCH] Rearrange the kernels to make them self-defining --- microsoft/surface/default.nix | 2 + microsoft/surface/kernel/default.nix | 37 ++--- microsoft/surface/kernel/linux-5.19.17.nix | 135 ---------------- .../surface/kernel/linux-5.19.17/default.nix | 153 ++++++++++++++++++ microsoft/surface/kernel/linux-package.nix | 23 +++ 5 files changed, 188 insertions(+), 162 deletions(-) delete mode 100644 microsoft/surface/kernel/linux-5.19.17.nix create mode 100644 microsoft/surface/kernel/linux-5.19.17/default.nix create mode 100644 microsoft/surface/kernel/linux-package.nix diff --git a/microsoft/surface/default.nix b/microsoft/surface/default.nix index da01f16f..e193d2a0 100644 --- a/microsoft/surface/default.nix +++ b/microsoft/surface/default.nix @@ -9,6 +9,8 @@ in { ./firmware/surface-go/ath10k ]; + microsoft-surface.kernel-version = mkDefault "5.19.17"; + boot.extraModprobeConfig = mkDefault '' options i915 enable_fbc=1 enable_rc6=1 modeset=1 options snd_hda_intel power_save=1 diff --git a/microsoft/surface/kernel/default.nix b/microsoft/surface/kernel/default.nix index 893f1bde..0c8dcfce 100644 --- a/microsoft/surface/kernel/default.nix +++ b/microsoft/surface/kernel/default.nix @@ -1,33 +1,16 @@ { config, lib, pkgs, ... }: -# To test the kernel build: -# nix-build -E "with import {}; (pkgs.callPackage ./. {}).boot.kernelPackages.kernel" - let - inherit (lib) kernel recurseIntoAttrs; - inherit (pkgs) buildLinux linuxPackagesFor; - repos = pkgs.callPackage ../repos.nix {}; - - linuxPackage = - { version, - modDirVersion ? version, - branch, - src, - kernelPatches ? [], - ... - }: let - buildLinux' = buildLinux { - inherit version src kernelPatches; - modDirVersion = version; - extraMeta.branch = branch; - }; - linuxPackagesFor' = linuxPackagesFor buildLinux'; - in recurseIntoAttrs linuxPackagesFor'; - - linux-5_19_17 = linuxPackage ( - pkgs.callPackage ./linux-5.19.17.nix { inherit repos; } - ); + inherit (lib) mkOption types; in { - boot.kernelPackages = linux-5_19_17; + imports = [ + ./linux-5.19.17 + ]; + + options.microsoft-surface.kernel-version = mkOption { + description = "Kernel Version to use (patched for MS Surface)"; + type = types.enum [ ]; + # default = "5.19.17"; + }; } diff --git a/microsoft/surface/kernel/linux-5.19.17.nix b/microsoft/surface/kernel/linux-5.19.17.nix deleted file mode 100644 index ddd8c912..00000000 --- a/microsoft/surface/kernel/linux-5.19.17.nix +++ /dev/null @@ -1,135 +0,0 @@ -{ lib, fetchurl, repos,}: - -let - inherit (lib) kernel; - version = "5.19.17"; - branch = "5.19"; - patches = repos.linux-surface + "/patches/${branch}"; - -in { - inherit version branch; - modDirVersion = version; - src = fetchurl { - url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "sha256-yTuzhKl60fCk8Y5ELOApEkJyL3gCPspliyI0RUHwlIk="; - }; - - kernelPatches = [ - { - name = "microsoft-surface-patches-linux-${version}"; - 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 + "/0001-surface3-oemb.patch"; - } - { - name = "ms-surface/0002-mwifiex"; - patch = patches + "/0002-mwifiex.patch"; - } - { - name = "ms-surface/0003-ath10k"; - patch = patches + "/0003-ath10k.patch"; - } - { - name = "ms-surface/0004-ipts"; - patch = patches + "/0004-ipts.patch"; - } - { - name = "ms-surface/0005-surface-sam"; - patch = patches + "/0005-surface-sam.patch"; - } - { - name = "ms-surface/0006-surface-sam-over-hid"; - patch = patches + "/0006-surface-sam-over-hid.patch"; - } - { - name = "ms-surface/0007-surface-button"; - patch = patches + "/0007-surface-button.patch"; - } - { - name = "ms-surface/0008-surface-typecover"; - patch = patches + "/0008-surface-typecover.patch"; - } - { - name = "ms-surface/0009-surface-gpe"; - patch = patches + "/0009-surface-gpe.patch"; - } - { - name = "ms-surface/0010-cameras"; - patch = patches + "/0010-cameras.patch"; - } - { - name = "ms-surface/0011-amd-gpio"; - patch = patches + "/0011-amd-gpio.patch"; - } - ]; -} diff --git a/microsoft/surface/kernel/linux-5.19.17/default.nix b/microsoft/surface/kernel/linux-5.19.17/default.nix new file mode 100644 index 00000000..e1bf29da --- /dev/null +++ b/microsoft/surface/kernel/linux-5.19.17/default.nix @@ -0,0 +1,153 @@ +{ config, lib, pkgs, ... }: + +let + inherit (lib) kernel mkIf mkOption types; + inherit (pkgs) fetchurl; + + inherit (pkgs.callPackage ../linux-package.nix { }) linuxPackage repos; + + cfg = config.microsoft-surface.kernel-version; + + version = "5.19.17"; + extraMeta.branch = "5.19"; + patches = repos.linux-surface + "/patches/${extraMeta.branch}"; + + kernelPackages = linuxPackage { + inherit version extraMeta; + # modDirVersion = version; + src = fetchurl { + url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; + sha256 = "sha256-yTuzhKl60fCk8Y5ELOApEkJyL3gCPspliyI0RUHwlIk="; + }; + + kernelPatches = [ + { + name = "microsoft-surface-patches-linux-${version}"; + 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 + "/0001-surface3-oemb.patch"; + } + { + name = "ms-surface/0002-mwifiex"; + patch = patches + "/0002-mwifiex.patch"; + } + { + name = "ms-surface/0003-ath10k"; + patch = patches + "/0003-ath10k.patch"; + } + { + name = "ms-surface/0004-ipts"; + patch = patches + "/0004-ipts.patch"; + } + { + name = "ms-surface/0005-surface-sam"; + patch = patches + "/0005-surface-sam.patch"; + } + { + name = "ms-surface/0006-surface-sam-over-hid"; + patch = patches + "/0006-surface-sam-over-hid.patch"; + } + { + name = "ms-surface/0007-surface-button"; + patch = patches + "/0007-surface-button.patch"; + } + { + name = "ms-surface/0008-surface-typecover"; + patch = patches + "/0008-surface-typecover.patch"; + } + { + name = "ms-surface/0009-surface-gpe"; + patch = patches + "/0009-surface-gpe.patch"; + } + { + name = "ms-surface/0010-cameras"; + patch = patches + "/0010-cameras.patch"; + } + { + name = "ms-surface/0011-amd-gpio"; + patch = patches + "/0011-amd-gpio.patch"; + } + ]; + }; + +in { + options.microsoft-surface.kernel-version = mkOption { + type = types.enum [ "5.19.17" ]; + }; + + config = mkIf (cfg == "5.19.17") { + boot = { + inherit kernelPackages; + }; + }; +} diff --git a/microsoft/surface/kernel/linux-package.nix b/microsoft/surface/kernel/linux-package.nix new file mode 100644 index 00000000..4858e4f5 --- /dev/null +++ b/microsoft/surface/kernel/linux-package.nix @@ -0,0 +1,23 @@ +{ lib, + buildLinux, + callPackage, + fetchurl, + linuxPackagesFor, +}: + +let + inherit (lib) kernel recurseIntoAttrs; + +in { + repos = callPackage ../repos.nix {}; + + linuxPackage = + { version, + modDirVersion ? version, + ... + } @ args: + let + buildLinux' = buildLinux (args // { inherit modDirVersion; }); + linuxPackagesFor' = linuxPackagesFor buildLinux'; + in recurseIntoAttrs linuxPackagesFor'; +}