Skip to content
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

linuxManualConfig: forbid config errors on aarch64 #366004

Merged
merged 7 commits into from
Dec 24, 2024
Merged

linuxManualConfig: forbid config errors on aarch64 #366004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1af3b58
linux/common-config: add missing items for aarch64
alyssais Dec 17, 2024
7227afe
linux/common-config: conditionalize x86 specifics
alyssais Dec 17, 2024
88439df
linux/common-config: don't set PM_TRACE
alyssais Dec 17, 2024
3021842
linux/common-config: set NFS_FS=m
alyssais Dec 17, 2024
9c322b3
linux/common-config: don't set DEVKMEM on aarch64
alyssais Dec 17, 2024
48a2a37
linux/common-config: add CMA_SYSFS version bound
alyssais Dec 17, 2024
b44d3ea
linuxManualConfig: forbid config errors on aarch64
alyssais Dec 17, 2024
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
96 changes: 58 additions & 38 deletions pkgs/os-specific/linux/kernel/common-config.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,9 @@ let
# Enable CPU lockup detection
LOCKUP_DETECTOR = yes;
SOFTLOCKUP_DETECTOR = yes;
HARDLOCKUP_DETECTOR = yes;
HARDLOCKUP_DETECTOR = lib.mkIf (
with stdenv.hostPlatform; isPower || isx86 || lib.versionAtLeast version "6.5"
) yes;

# Enable streaming logs to a remote device over a network
NETCONSOLE = module;
Expand All @@ -106,6 +108,7 @@ let
{
CPU_FREQ_DEFAULT_GOV_SCHEDUTIL = yes;
CPU_FREQ_GOV_SCHEDUTIL = yes;
PM_DEBUG = yes;
PM_ADVANCED_DEBUG = yes;
PM_WAKELOCKS = yes;
POWERCAP = yes;
Expand Down Expand Up @@ -213,7 +216,7 @@ let
MEMORY_FAILURE = yes;

# Collect ECC errors and retire pages that fail too often
RAS_CEC = yes;
RAS_CEC = lib.mkIf stdenv.hostPlatform.isx86 yes;
}
// lib.optionalAttrs (stdenv.hostPlatform.is32bit) {
# Enable access to the full memory range (aka PAE) on 32-bit architectures
Expand Down Expand Up @@ -282,6 +285,7 @@ let
CGROUP_BPF = option yes;
CGROUP_NET_PRIO = yes; # Required by systemd
IP_ROUTE_VERBOSE = yes;
IP_MROUTE = yes;
IP_MROUTE_MULTIPLE_TABLES = yes;
IP_MULTICAST = yes;
IP_MULTIPLE_TABLES = yes;
Expand Down Expand Up @@ -430,7 +434,7 @@ let
FB_SIS_300 = yes;
FB_SIS_315 = yes;
FB_3DFX_ACCEL = yes;
FB_VESA = yes;
FB_VESA = lib.mkIf stdenv.hostPlatform.isx86 yes;
FRAMEBUFFER_CONSOLE = yes;
FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER = yes;
FRAMEBUFFER_CONSOLE_ROTATION = yes;
Expand All @@ -456,7 +460,7 @@ let
in
{
# compile in DRM so simpledrm can load before initrd if necessary
AGP = yes;
AGP = lib.mkIf (with stdenv.hostPlatform; isPower || isx86) yes;
DRM = yes;

DRM_LEGACY = whenOlder "6.8" no;
Expand All @@ -470,11 +474,11 @@ let

# Allow specifying custom EDID on the kernel command line
DRM_LOAD_EDID_FIRMWARE = yes;
VGA_SWITCHEROO = yes; # Hybrid graphics support
DRM_GMA500 = whenAtLeast "5.12" module;
DRM_GMA600 = whenOlder "5.13" yes;
DRM_GMA3600 = whenOlder "5.12" yes;
DRM_VMWGFX_FBCON = whenOlder "6.1" yes;
VGA_SWITCHEROO = lib.mkIf stdenv.hostPlatform.isx86 yes; # Hybrid graphics support
DRM_GMA500 = lib.mkIf stdenv.hostPlatform.isx86 (whenAtLeast "5.12" module);
DRM_GMA600 = lib.mkIf stdenv.hostPlatform.isx86 (whenOlder "5.13" yes);
DRM_GMA3600 = lib.mkIf stdenv.hostPlatform.isx86 (whenOlder "5.12" yes);
DRM_VMWGFX_FBCON = lib.mkIf stdenv.hostPlatform.isx86 (whenOlder "6.1" yes);
# (experimental) amdgpu support for verde and newer chipsets
DRM_AMDGPU_SI = yes;
# (stable) amdgpu support for bonaire and newer chipsets
Expand All @@ -486,8 +490,10 @@ let
DRM_AMD_DC_DCN1_0 = whenOlder "5.6" yes;
DRM_AMD_DC_DCN2_0 = whenOlder "5.6" yes;
DRM_AMD_DC_DCN2_1 = whenOlder "5.6" yes;
DRM_AMD_DC_DCN3_0 = whenBetween "5.9" "5.11" yes;
DRM_AMD_DC_DCN = whenBetween "5.11" "6.4" yes;
DRM_AMD_DC_DCN3_0 = lib.mkIf (with stdenv.hostPlatform; isx86) (whenBetween "5.9" "5.11" yes);
DRM_AMD_DC_DCN = lib.mkIf (with stdenv.hostPlatform; isx86 || isPower64) (
whenBetween "5.11" "6.4" yes
);
DRM_AMD_DC_FP = whenAtLeast "6.4" yes;
DRM_AMD_DC_HDCP = whenBetween "5.5" "6.4" yes;
DRM_AMD_DC_SI = whenAtLeast "5.10" yes;
Expand All @@ -496,7 +502,13 @@ let
DRM_AMD_ACP = yes;

# Enable AMD secure display when available
DRM_AMD_SECURE_DISPLAY = whenAtLeast "5.13" yes;
DRM_AMD_SECURE_DISPLAY = lib.mkIf (
with stdenv.hostPlatform;
(lib.versionAtLeast version "5.13" && (isx86 || isPower64))
|| (lib.versionAtLeast version "6.2" && isAarch64 && !stdenv.cc.isClang)
|| (lib.versionAtLeast version "6.5" && isLoongarch64 && !stdenv.cc.isClang)
|| (lib.versionAtLeast version "6.10" && isRiscV64 && !stdenv.cc.isClang)
) yes;

# Enable AMD image signal processor
DRM_AMD_ISP = whenAtLeast "6.11" yes;
Expand Down Expand Up @@ -674,6 +686,7 @@ let
NFSD_V4 = yes;
NFSD_V4_SECURITY_LABEL = yes;

NFS_FS = module;
NFS_FSCACHE = yes;
NFS_SWAP = yes;
NFS_V3_ACL = yes;
Expand Down Expand Up @@ -741,7 +754,7 @@ let
# This does not have any effect if a program does not support it
SECURITY_LANDLOCK = whenAtLeast "5.13" yes;

DEVKMEM = whenOlder "5.13" no; # Disable /dev/kmem
DEVKMEM = lib.mkIf (!stdenv.hostPlatform.isAarch64) (whenOlder "5.13" no); # Disable /dev/kmem

USER_NS = yes; # Support for user namespaces

Expand Down Expand Up @@ -822,9 +835,9 @@ let
};

microcode = {
MICROCODE = yes;
MICROCODE_INTEL = whenOlder "6.6" yes;
MICROCODE_AMD = whenOlder "6.6" yes;
MICROCODE = lib.mkIf stdenv.hostPlatform.isx86 yes;
MICROCODE_INTEL = lib.mkIf stdenv.hostPlatform.isx86 (whenOlder "6.6" yes);
MICROCODE_AMD = lib.mkIf stdenv.hostPlatform.isx86 (whenOlder "6.6" yes);
# Write Back Throttling
# https://lwn.net/Articles/682582/
# https://bugzilla.kernel.org/show_bug.cgi?id=12309#c655
Expand Down Expand Up @@ -885,12 +898,12 @@ let
virtualisation = {
PARAVIRT = option yes;

HYPERVISOR_GUEST = yes;
HYPERVISOR_GUEST = lib.mkIf stdenv.hostPlatform.isx86 yes;
PARAVIRT_SPINLOCKS = option yes;

KVM_ASYNC_PF = yes;
KVM_ASYNC_PF = lib.mkIf (with stdenv.hostPlatform; isS390 || isx86) yes;
KVM_GENERIC_DIRTYLOG_READ_PROTECT = yes;
KVM_GUEST = yes;
KVM_GUEST = lib.mkIf (with stdenv.hostPlatform; isPower || isx86) yes;
KVM_MMIO = yes;
KVM_VFIO = yes;
KSM = yes;
Expand All @@ -901,7 +914,7 @@ let
tristate = lib.mkIf (!stdenv.hostPlatform.is64bit) "y";
};

VFIO_PCI_VGA = lib.mkIf stdenv.hostPlatform.is64bit yes;
VFIO_PCI_VGA = lib.mkIf stdenv.hostPlatform.isx86_64 yes;

UDMABUF = yes;

Expand Down Expand Up @@ -1011,7 +1024,7 @@ let

# Allows soft-dirty tracking on pages, used by CRIU.
# See https://docs.kernel.org/admin-guide/mm/soft-dirty.html
MEM_SOFT_DIRTY = lib.mkIf (!stdenv.hostPlatform.isx86_32) yes;
MEM_SOFT_DIRTY = lib.mkIf (with stdenv.hostPlatform; isS390 || isPower64 || isx86_64) yes;
};

misc =
Expand All @@ -1024,7 +1037,11 @@ let
# stdenv.hostPlatform.linux-kernel.target assumes uncompressed on RISC-V.
KERNEL_UNCOMPRESSED = lib.mkIf stdenv.hostPlatform.isRiscV yes;
KERNEL_XZ = lib.mkIf (!stdenv.hostPlatform.isRiscV && !useZstd) yes;
KERNEL_ZSTD = lib.mkIf (!stdenv.hostPlatform.isRiscV && useZstd) yes;
KERNEL_ZSTD = lib.mkIf (
with stdenv.hostPlatform;
(isMips || isS390 || isx86 || (lib.versionAtLeast version "6.1" && isAarch64 || isLoongArch64))
&& useZstd
) yes;

HID_BATTERY_STRENGTH = yes;
# enabled by default in x86_64 but not arm64, so we do that here
Expand All @@ -1037,6 +1054,7 @@ let
DRAGONRISE_FF = yes;
GREENASIA_FF = yes;
HOLTEK_FF = yes;
INPUT_JOYSTICK = yes;
JOYSTICK_PSXPAD_SPI_FF = yes;
LOGIG940_FF = yes;
NINTENDO_FF = whenAtLeast "5.16" yes;
Expand Down Expand Up @@ -1066,8 +1084,7 @@ let
BLK_DEV_INITRD = yes;

# Allows debugging systems that get stuck during suspend/resume
PM_TRACE = yes;
PM_TRACE_RTC = yes;
PM_TRACE_RTC = lib.mkIf stdenv.hostPlatform.isx86 yes;

ACCESSIBILITY = yes; # Accessibility support
AUXDISPLAY = yes; # Auxiliary Display support
Expand Down Expand Up @@ -1139,13 +1156,15 @@ let
POSIX_MQUEUE = yes;
FRONTSWAP = whenOlder "6.6" yes;
FUSION = yes; # Fusion MPT device support
IDE = whenOlder "5.14" no; # deprecated IDE support, removed in 5.14
IDE = lib.mkIf (with stdenv.hostPlatform; isAarch32 || isM68k || isMips || isPower || isx86) (
whenOlder "5.14" no
); # deprecated IDE support, removed in 5.14
IDLE_PAGE_TRACKING = yes;

JOYSTICK_XPAD_FF = option yes; # X-Box gamepad rumble support
JOYSTICK_XPAD_LEDS = option yes; # LED Support for Xbox360 controller 'BigX' LED

KEYBOARD_APPLESPI = module;
KEYBOARD_APPLESPI = lib.mkIf stdenv.hostPlatform.isx86 module;

KEXEC_FILE = option yes;
KEXEC_JUMP = option yes;
Expand Down Expand Up @@ -1181,16 +1200,16 @@ let

MOUSE_ELAN_I2C_SMBUS = yes;
MOUSE_PS2_ELANTECH = yes; # Elantech PS/2 protocol extension
MOUSE_PS2_VMMOUSE = yes;
MTRR_SANITIZER = yes;
MOUSE_PS2_VMMOUSE = lib.mkIf stdenv.hostPlatform.isx86 yes;
MTRR_SANITIZER = lib.mkIf stdenv.hostPlatform.isx86 yes;
NET_FC = yes; # Fibre Channel driver support
# Needed for touchpads to work on some AMD laptops
PINCTRL_AMD = whenAtLeast "5.19" yes;
# GPIO on Intel Bay Trail, for some Chromebook internal eMMC disks
PINCTRL_BAYTRAIL = yes;
PINCTRL_BAYTRAIL = lib.mkIf stdenv.hostPlatform.isx86 yes;
# GPIO for Braswell and Cherryview devices
# Needs to be built-in to for integrated keyboards to function properly
PINCTRL_CHERRYVIEW = yes;
PINCTRL_CHERRYVIEW = lib.mkIf stdenv.hostPlatform.isx86 yes;
# 8 is default. Modern gpt tables on eMMC may go far beyond 8.
MMC_BLOCK_MINORS = freeform "32";

Expand Down Expand Up @@ -1219,8 +1238,8 @@ let
UEVENT_HELPER = no;

USERFAULTFD = yes;
X86_CHECK_BIOS_CORRUPTION = yes;
X86_MCE = yes;
X86_CHECK_BIOS_CORRUPTION = lib.mkIf stdenv.hostPlatform.isx86 yes;
X86_MCE = lib.mkIf stdenv.hostPlatform.isx86 yes;

RAS = yes; # Needed for EDAC support

Expand Down Expand Up @@ -1249,9 +1268,9 @@ let
PREEMPT = no;
PREEMPT_VOLUNTARY = yes;

X86_AMD_PLATFORM_DEVICE = yes;
X86_PLATFORM_DRIVERS_DELL = whenAtLeast "5.12" yes;
X86_PLATFORM_DRIVERS_HP = whenAtLeast "6.1" yes;
X86_AMD_PLATFORM_DEVICE = lib.mkIf stdenv.hostPlatform.isx86 yes;
X86_PLATFORM_DRIVERS_DELL = lib.mkIf stdenv.hostPlatform.isx86 (whenAtLeast "5.12" yes);
X86_PLATFORM_DRIVERS_HP = lib.mkIf stdenv.hostPlatform.isx86 (whenAtLeast "6.1" yes);

LIRC = yes;

Expand Down Expand Up @@ -1335,8 +1354,6 @@ let
CROS_EC = module;
CROS_EC_I2C = module;
CROS_EC_SPI = module;
CROS_EC_LPC = module;
CROS_EC_ISHTP = module;
CROS_KBD_LED_BACKLIGHT = module;
TCG_TIS_SPI_CR50 = whenAtLeast "5.5" yes;
}
Expand All @@ -1358,7 +1375,7 @@ let

# Add debug interfaces for CMA
CMA_DEBUGFS = yes;
CMA_SYSFS = yes;
CMA_SYSFS = whenAtLeast "5.13" yes;

# https://docs.kernel.org/arch/arm/mem_alignment.html
# tldr:
Expand Down Expand Up @@ -1393,6 +1410,9 @@ let
CP15_BARRIER_EMULATION = lib.mkIf (stdenv.hostPlatform.system == "aarch64-linux") yes;
}
// lib.optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux") {
CROS_EC_LPC = module;
CROS_EC_ISHTP = module;

CHROMEOS_LAPTOP = module;
CHROMEOS_PSTORE = module;

Expand Down
3 changes: 2 additions & 1 deletion pkgs/os-specific/linux/kernel/generic.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ lib.makeOverridable ({ # The kernel source tarball.
# symbolic name and `patch' is the actual patch. The patch may
# optionally be compressed with gzip or bzip2.
kernelPatches ? []
, ignoreConfigErrors ? stdenv.hostPlatform.linux-kernel.name != "pc"
, ignoreConfigErrors ?
!lib.elem stdenv.hostPlatform.linux-kernel.name [ "aarch64-multiplatform" "pc" ]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we make this a normal platform check or something? It took me a bit to figure out why pc is here.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would like that in the end, but I want to be gradual about it — people using platforms other than the defaults are more likely to have weird configs that'll break, so I think we should start with this, make sure it doesn't break too much, and then further expand the ignoreConfigErrors default.

, extraMeta ? {}

, isZen ? false
Expand Down
Loading