diff --git a/hosts/idols-aquamarine/README.md b/hosts/idols-aquamarine/README.md index 354af049..a902f0c8 100644 --- a/hosts/idols-aquamarine/README.md +++ b/hosts/idols-aquamarine/README.md @@ -63,8 +63,7 @@ run on `youko`, not on this host, so opening a dashboard does not wake `aquamari still need to be enabled in BIOS before this knob can save more power. - Safe BIOS-side changes: enable C1E, Intel Speed Shift and CPU/package C-states (limit `Auto` or `C10`), and enable iGPU Render Standby/RC6. Disable unused Wi-Fi/Bluetooth, onboard audio, SATA, - serial ports and RGB lighting. Do not change the storage mode, and do not enable PCIe ASPM while - the NVMe/GPU stability workarounds are in place. + serial ports and RGB lighting. Do not change the storage mode. The iGPU carries display and video work: the kernel binds `i915`, and [hardware-intel-igpu.nix](./hardware-intel-igpu.nix) installs `intel-media-driver` (VA-API), diff --git a/hosts/idols-aquamarine/ROCM.md b/hosts/idols-aquamarine/ROCM.md index e9b6139b..1a6ff66b 100644 --- a/hosts/idols-aquamarine/ROCM.md +++ b/hosts/idols-aquamarine/ROCM.md @@ -122,11 +122,9 @@ default `0xfff7bfff`; `0xfff7ffff` works). **verified** `amdgpu.ppfeaturemask=0xffffffff` does not address the ATPX/SMU path; it comes from a community tuning repository and no primary source ties it to it. **community-reported** -([r9700-setup](https://github.com/stew675/r9700-setup/blob/HEAD/README.md)). The host's own -`pcie_aspm=off` is unrelated to this path too — it is set for PCIe link retraining, with its reason -in [hardware-configuration.nix](./hardware-configuration.nix). CPU C-state depth is no longer -capped; the old `processor.max_cstate=2` trade-off was removed for idle power, so re-check inference -tail latency after that change. +([r9700-setup](https://github.com/stew675/r9700-setup/blob/HEAD/README.md)). CPU C-state depth is no +longer capped; the old `processor.max_cstate=2` trade-off was removed for idle power, so re-check +inference tail latency after that change. ## Kernel parameters and module options diff --git a/hosts/idols-aquamarine/hardware-configuration.nix b/hosts/idols-aquamarine/hardware-configuration.nix index 32091135..d0ee6c46 100644 --- a/hosts/idols-aquamarine/hardware-configuration.nix +++ b/hosts/idols-aquamarine/hardware-configuration.nix @@ -16,11 +16,6 @@ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.kernelParams = [ - # Keep PCIe ASPM disabled. The R9700 links have retraining/timeout issues. - "pcie_aspm=off" - ]; - boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.efiSysMountPoint = "/boot"; diff --git a/outputs/x86_64-linux/tests/idols-aquamarine/expected.nix b/outputs/x86_64-linux/tests/idols-aquamarine/expected.nix index 947dea93..08f70b7c 100644 --- a/outputs/x86_64-linux/tests/idols-aquamarine/expected.nix +++ b/outputs/x86_64-linux/tests/idols-aquamarine/expected.nix @@ -4,7 +4,6 @@ iommuPassthrough = true; runtimePmDisabled = true; gpuRecoveryEnabled = true; - aspmDisabled = true; deepCStatesAllowed = true; cpuEppConfigured = true; nativeIpv6Preference = true; diff --git a/outputs/x86_64-linux/tests/idols-aquamarine/expr.nix b/outputs/x86_64-linux/tests/idols-aquamarine/expr.nix index 4399a37f..b82949bd 100644 --- a/outputs/x86_64-linux/tests/idols-aquamarine/expr.nix +++ b/outputs/x86_64-linux/tests/idols-aquamarine/expr.nix @@ -22,7 +22,6 @@ in # An unattended host recovers a hung card itself instead of waiting for a reboot. gpuRecoveryEnabled = builtins.elem "amdgpu.gpu_recovery=1" cfg.boot.kernelParams; - aspmDisabled = builtins.elem "pcie_aspm=off" cfg.boot.kernelParams; deepCStatesAllowed = !(builtins.elem "processor.max_cstate=2" cfg.boot.kernelParams); cpuEppConfigured = lib.attrByPath [