Skip to content

fix: switch darp11-b to S3 deep sleep and harden PCI suspend #1753

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
brianmcgillion wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −12
Draft

fix: switch darp11-b to S3 deep sleep and harden PCI suspend #1753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@

# Hot-plugging USB devices into virtual machines
vhotplug = {
url = "github:tiiuae/vhotplug";
url = "github:brianmcgillion/vhotplug/fix-device-recheck";
inputs = {
nixpkgs.follows = "nixpkgs";
flake-parts.follows = "flake-parts";
Expand Down
7 changes: 5 additions & 2 deletions modules/common/services/power.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,11 @@ let
case "$action" in
suspend)
echo "Suspending PCI devices for $vm_name..."
vhotplugcli pci suspend --vm "$vm_name"

if ! vhotplugcli pci suspend --vm "$vm_name"; then
echo "Failed to detach PCI devices for $vm_name. Please check the logs."
echo "Fallback: restarting $vm_name to ensure clean state before suspend..."
systemctl restart microvm@"$vm_name".service
fi
;;
resume)
echo "Resuming PCI devices for $vm_name..."
Expand Down
8 changes: 4 additions & 4 deletions targets/laptop/flake-module.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ let
extraConfig = {
reference.profiles.mvp-user-trial.enable = true;
partitioning.disko.enable = true;
services.power-manager.suspend.mode = "s2idle";
services.power-manager.suspend.mode = "deep";
# Enable PCI ACS override to split IOMMU groups
# Needed to separate Ethernet (8086:550a) from Audio devices
hardware.passthrough.pciAcsOverride = {
Expand Down Expand Up @@ -310,7 +310,7 @@ let
extraConfig = {
reference.profiles.mvp-user-trial.enable = true;
partitioning.disko.enable = true;
services.power-manager.suspend.mode = "s2idle";
services.power-manager.suspend.mode = "deep";
virtualization.microvm.storeOnDisk = true;
hardware.passthrough.pciAcsOverride = {
enable = true;
Expand Down Expand Up @@ -531,7 +531,7 @@ let
extraConfig = {
reference.profiles.mvp-user-trial.enable = true;
partitioning.disko.enable = true;
services.power-manager.suspend.mode = "s2idle";
services.power-manager.suspend.mode = "deep";
hardware.passthrough.pciAcsOverride = {
enable = true;
ids = [ "8086:550a" ];
Expand Down Expand Up @@ -562,7 +562,7 @@ let
extraConfig = {
reference.profiles.mvp-user-trial.enable = true;
partitioning.disko.enable = true;
services.power-manager.suspend.mode = "s2idle";
services.power-manager.suspend.mode = "deep";
virtualization.microvm.storeOnDisk = true;
hardware.passthrough.pciAcsOverride = {
enable = true;
Expand Down
Loading