eeva/nixos-hardware
1
0
Fork 0
mirror of https://github.com/NixOS/nixos-hardware synced 2024-11-14 23:19:41 +01:00
Code Issues Releases Wiki Activity

Framework: add workaround for Bluetooth device issues

Browse source 
Framework have published a workaround for a bug that affects the
MediaTek Bluetooth and Wi-Fi cards used in their laptops on kernel
version 6.11.  Their workaround assumes a writable /etc/systemd
directory, so reimplement the workaround for NixOS.

For the Framework version of the workaround, see:
eab0148ae8/hibernation/kernel-6-11-workarounds
This commit is contained in:
Adam Dinwoodie 2024-11-01 17:51:53 +00:00 committed by mergify[bot]
parent da14839ac5
commit e4ad9ce38f
3 changed files with 39 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
framework/13-inch/common/default.nix
View file

@ -2,6 +2,7 @@
imports = [
../../../common/pc/laptop
../../../common/pc/laptop/ssd
../../bluetooth.nix
../../kmod.nix
../../framework-tool.nix
];

1
framework/16-inch/common/default.nix
View file

@ -2,6 +2,7 @@
imports = [
../../../common/pc/laptop
../../../common/pc/laptop/ssd
../../bluetooth.nix
../../kmod.nix
../../framework-tool.nix
];

37
framework/bluetooth.nix Normal file
View file

@ -0,0 +1,37 @@
# There is apparently a bug that affects Framework computers that causes black
# screen on resume from sleep or hibernate with kernel version 6.11. Framework
# have published a workaround; this applies that workaround.
#
# https://fosstodon.org/@frameworkcomputer/113406887743149089
# https://github.com/FrameworkComputer/linux-docs/blob/main/hibernation/kernel-6-11-workarounds/suspend-hibernate-bluetooth-workaround.md#workaround-for-suspendhibernate-black-screen-on-resume-kernel-611
{
config,
lib,
pkgs,
...
}: lib.mkIf ((config.boot.kernelPackages.kernelAtLeast "6.11") && (config.boot.kernelPackages.kernelOlder "6.12")) {
systemd.services = {
bluetooth-rfkill-suspend = {
description = "Soft block Bluetooth on suspend/hibernate";
before = ["sleep.target"];
unitConfig.StopWhenUnneeded = true;
serviceConfig = {
Type = "oneshot";
ExecStart = "${pkgs.util-linux}/bin/rfkill block bluetooth";
ExecStartPost = "${pkgs.coreutils}/bin/sleep 3";
RemainAfterExit = true;
};
wantedBy = ["suspend.target" "hibernate.target" "suspend-then-hibernate.target"];
};
bluetooth-rfkill-resume = {
description = "Unblock Bluetooth on resume";
after = ["suspend.target" "hibernate.target" "suspend-then-hibernate.target"];
serviceConfig = {
Type = "oneshot";
ExecStart = "${pkgs.util-linux}/bin/rfkill unblock bluetooth";
};
wantedBy = ["suspend.target" "hibernate.target" "suspend-then-hibernate.target"];
};
};
}