lenn/nixos-hardware
1
0
Fork 0
mirror of https://github.com/NixOS/nixos-hardware.git synced 2025-11-04 01:07:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'microsoft/surface/refactor-kernel-code' into microsoft/surface/kernel-6.0.11

Browse Source
This commit is contained in:
mexisme
2022-12-05 17:44:37 +13:00
parent d2b7a0fb9a be728899cf
commit 560e4f2ecf
9 changed files with 230 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
microsoft/surface/default.nix
View File

@@ -1,10 +1,17 @@
{ config, lib, pkgs, ... }: {
{ config, lib, pkgs, ... }:
let
inherit (lib) mkDefault;
in {
imports = [
./kernel
./firmware/surface-go/ath10k
];
boot.extraModprobeConfig = lib.mkDefault ''
microsoft-surface.kernelVersion = mkDefault "5.19.17";
boot.extraModprobeConfig = mkDefault ''
options i915 enable_fbc=1 enable_rc6=1 modeset=1
options snd_hda_intel power_save=1
options snd_ac97_codec power_save=1
@@ -15,18 +22,25 @@
boot.kernelParams = [ "mem_sleep_default=deep" ];
# NOTE: Check the README before enabling TLP:
services.tlp.enable = lib.mkDefault false;
services.tlp.enable = mkDefault false;
# i.e. needed for wifi firmware, see https://github.com/NixOS/nixos-hardware/issues/364
hardware.enableRedistributableFirmware = lib.mkDefault true;
hardware.sensor.iio.enable = lib.mkDefault true;
hardware.enableRedistributableFirmware = mkDefault true;
hardware.sensor.iio.enable = mkDefault true;
environment.systemPackages = with pkgs; [ surface-control ];
environment.systemPackages = [
pkgs.surface-control
];
users.groups.surface-control = { };
services.udev.packages = [ pkgs.surface-control ];
services.udev.packages = [
pkgs.surface-control
];
systemd.services.iptsd = {
description = "IPTSD";
script = "${pkgs.iptsd}/bin/iptsd";
wantedBy = [ "multi-user.target" ];
wantedBy = [
"multi-user.target"
];
};
}

7
microsoft/surface/firmware/surface-go/ath10k/ath10k-replace.nix
View File

@@ -1,9 +1,10 @@
{stdenv, lib, pkgs, firmwareLinuxNonfree, ...}:
{ stdenv, lib, pkgs, firmwareLinuxNonfree, ... }:
let
repos = (pkgs.callPackage ../../../repos.nix {});
killernetworking_firmware = repos.surface-go-ath10k-firmware_backup + "/K1535_Debian";
in
stdenv.mkDerivation {
in stdenv.mkDerivation {
pname = "microsoft-surface-go-firmware-linux-nonfree";
inherit (firmwareLinuxNonfree) version;
src = firmwareLinuxNonfree;

13
microsoft/surface/firmware/surface-go/ath10k/default.nix
View File

@@ -1,21 +1,24 @@
{ config, lib, pkgs, ... }:
let
inherit (lib) mkDefault mkEnableOption mkIf;
cfg = config.hardware.microsoft-surface.firmware.surface-go-ath10k;
in
{
in {
options = {
hardware.microsoft-surface.firmware.surface-go-ath10k = {
replace = lib.mkEnableOption ''Use the "board.bin" firmware for ath10k-based WiFi on Surface Go.'';
replace = mkEnableOption ''Use the "board.bin" firmware for ath10k-based WiFi on Surface Go.'';
};
};
config = lib.mkIf cfg.replace {
config = mkIf cfg.replace {
hardware.enableAllFirmware = true;
hardware.firmware = [
(pkgs.callPackage ./ath10k-replace.nix {})
];
boot.extraModprobeConfig = lib.mkDefault ''
boot.extraModprobeConfig = mkDefault ''
options ath10k_core skip_otp=Y
'';
};

41
microsoft/surface/kernel/default.nix
View File

@@ -1,37 +1,16 @@
{ config, lib, pkgs, ... }:
# To test the kernel build:
# nix-build -E "with import <nixpkgs> {}; (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; }
);
linux-6_0_11 = linuxPackage (
pkgs.callPackage ./linux-6.0.11.nix { inherit repos; }
);
inherit (lib) mkOption types;
in {
boot.kernelPackages = linux-6_0_11;
imports = [
./linux-5.19.17
./linux-6.0.11
];
options.microsoft-surface.kernelVersion = mkOption {
description = "Kernel Version to use (patched for MS Surface)";
type = types.enum [ ];
};
}

138
microsoft/surface/kernel/linux-5.19.17.nix
View File

@@ -1,138 +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";
}
];
}

37
microsoft/surface/kernel/linux-5.19.17/default.nix Normal file
View File

@@ -0,0 +1,37 @@
{ 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 = "5.19.17";
extraMeta.branch = "5.19";
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/v5.x/linux-${version}.tar.xz";
sha256 = "sha256-yTuzhKl60fCk8Y5ELOApEkJyL3gCPspliyI0RUHwlIk=";
};
};
in {
options.microsoft-surface.kernelVersion = mkOption {
type = types.enum [ "5.19.17" ];
};
config = mkIf (cfg.kernelVersion == "5.19.17") {
boot = {
inherit kernelPackages;
};
};
}

123
microsoft/surface/kernel/linux-5.19.17/patches.nix Normal file
View File

@@ -0,0 +1,123 @@
{ kernel,
patchDir,
version,
}:
[
{
name = "microsoft-surface-patches-linux-${version}";
patch = null;
structuredExtraConfig = with 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 = 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-surface-gpe";
patch = patchDir + "/0009-surface-gpe.patch";
}
{
name = "ms-surface/0010-cameras";
patch = patchDir + "/0010-cameras.patch";
}
{
name = "ms-surface/0011-amd-gpio";
patch = patchDir + "/0011-amd-gpio.patch";
}
]

23
microsoft/surface/kernel/linux-package.nix Normal file
View File

@@ -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';
}

4
microsoft/surface/repos.nix
View File

@@ -1,4 +1,6 @@
{ fetchFromGitHub, fetchurl }: {
{ fetchFromGitHub, fetchurl }:
{
linux-surface = fetchFromGitHub {
owner = "linux-surface";
repo = "linux-surface";