Merge 065bae1c89 into 52113c4f5c

Rename some modules to their correct names

common/cpu/intel/arrow-lake/cpu-only.nix

@@ -0,0 +1,5 @@
+{
+  imports = [
+    ../cpu-only.nix
+  ];
+}

common/cpu/intel/arrow-lake/default.nix

@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./cpu-only.nix
+    ../../../gpu/intel/arrow-lake
+  ];
+}

common/gpu/intel/arrow-lake/default.nix

@@ -0,0 +1,8 @@
+{ config, lib, ... }:
+{
+  imports = [ ../. ];
+  hardware.intelgpu = {
+    driver = lib.mkIf (lib.versionAtLeast config.boot.kernelPackages.kernel.version "6.8") "xe";
+    vaapiDriver = "intel-media-driver";
+  };
+}

dell/precision/7520/default.nix

@@ -15,7 +15,7 @@
   boot.initrd.availableKernelModules = [
     "xhci_pci"
     "ahci"
-    "usb_storage"
+    "usb-storage"
     "sd_mod"
     "rtsx_pci_sdmmc"
   ];

flake.nix

@@ -202,6 +202,7 @@
           intel-nuc-5i5ryb = import ./intel/nuc/5i5ryb;
           intel-nuc-8i7beh = import ./intel/nuc/8i7beh;
           lenovo-ideacentre-k330 = import ./lenovo/ideacentre/k330;
+          lenovo-ideapad-14iah10 = import ./lenovo/ideapad/14iah10;
           lenovo-ideapad-14imh9 = import ./lenovo/ideapad/14imh9;
           lenovo-ideapad-15alc6 = import ./lenovo/ideapad/15alc6;
           lenovo-ideapad-15arh05 = import ./lenovo/ideapad/15arh05;

focus/m2/gen1/default.nix

@@ -13,7 +13,7 @@
     "xhci_pci"
     "ahci"
     "nvme"
-    "usb_storage"
+    "usb-storage"
     "sd_mod"
     "rtsx_pci_sdmmc"
   ];

lenovo/ideapad/14iah10/README.md

@@ -0,0 +1,7 @@
+# Lenovo IdeaPad 5 Pro / XiaoXin Pro 14 GT (14IAH10)
+
+This module provides configuration common to all Arrow Lake (Core Ultra 200H
+series)-based devices and rectifies a few quirks with the system that are mostly
+all caused by firmware or BIOS bugs. While the solution isn't perfect, the
+laptop is decently usable with these tweaks, including networking and speakers
+output.

lenovo/ideapad/14iah10/default.nix

@@ -0,0 +1,40 @@
+{
+  lib,
+  ...
+}:
+{
+  imports = [
+    ../../../common/cpu/intel/arrow-lake
+    ../../../common/pc/laptop
+    ../../../common/pc/ssd
+  ];
+
+  boot = {
+    # DSP-based SOF drivers currently don't work due to missing topology
+    # definitions, so we fall back to old snd_hda_intel drivers
+    # See https://thesofproject.github.io/latest/getting_started/intel_debug/introduction.html#pci-devices-introduced-after-2016
+    #
+    # Last tested with sof-firmware version 2025.05; newer SOF releases
+    # may include updated topologies
+    extraModprobeConfig = ''
+      options snd-intel-dspcfg dsp_driver=1
+    '';
+
+    # HACK: Fix the infamous "Unable to change power state from D3cold to D0"
+    # error when resuming the system from a suspended state, by _completely_
+    # disabling PCIe port power management and thereby preventing the Wi-Fi
+    # adapter from turning off at all.
+    #
+    # This is theoretically bad from a battery life standpoint, but it's
+    # necessary until Intel ships a functioning firmware release that doesn't
+    # suffer from this issue. In my real-world testing this doesn't seem to
+    # have caused a noticable decrease in battery life, however.
+    #
+    # See Intel's (non-)response regarding this issue with this exact model at:
+    # https://community.intel.com/t5/Wireless/Intel-WiFi-7-BE200-loses-connection-after-suspend-resume-on/m-p/1700055
+    #
+    # Last tested to be necessary on ucode version 98 — this might no
+    # longer be necessary for newer firmware releases!
+    kernelParams = [ "pcie_port_pm=off" ];
+  };
+}

purism/librem/5r4/initrd.nix

@@ -14,7 +14,7 @@ lib.mkIf config.hardware.librem5.customInitrdModules {
       "tps6598x"
       "xhci_hcd"
       "usbcore"
-      "usb_storage"
+      "usb-storage"
       "uas"
       "xhci_plat_hcd"
     ];
@@ -56,7 +56,7 @@ lib.mkIf config.hardware.librem5.customInitrdModules {
       "tps6598x"
       "xhci_hcd"
       "usbcore"
-      "usb_storage"
+      "usb-storage"
       "uas"
       "xhci_plat_hcd"
     ];

raspberry-pi/3/default.nix

@@ -9,7 +9,7 @@
     kernelPackages = lib.mkDefault pkgs.linuxKernel.packages.linux_rpi3;
     initrd.availableKernelModules = [
       "usbhid"
-      "usb_storage"
+      "usb-storage"
     ];
   };
 

raspberry-pi/4/default.nix

@@ -31,9 +31,9 @@
     kernelPackages = lib.mkDefault pkgs.linuxKernel.packages.linux_rpi4;
     initrd.availableKernelModules = [
       "usbhid"
-      "usb_storage"
+      "usb-storage"
       "vc4"
-      "pcie_brcmstb" # required for the pcie bus to work
+      "pcie-brcmstb" # required for the pcie bus to work
       "reset-raspberrypi" # required for vl805 firmware to load
     ]
     ++ lib.optional config.boot.initrd.network.enable "genet";

raspberry-pi/5/default.nix

@@ -16,7 +16,7 @@ in
     initrd.availableKernelModules = [
       "nvme"
       "usbhid"
-      "usb_storage"
+      "usb-storage"
     ];
   };