Skip to content

Commit c9d718d

Browse files
committed
fix: adjust kernel options around ACPI/PCI/EFI
Align options borrowing from other distribution kernel configurations. Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
1 parent eb9d566 commit c9d718d

2 files changed

Lines changed: 41 additions & 15 deletions

File tree

kernel/build/config-amd64

Lines changed: 40 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -574,6 +574,7 @@ CONFIG_PM_DEBUG=y
574574
# CONFIG_PM_ADVANCED_DEBUG is not set
575575
# CONFIG_PM_TEST_SUSPEND is not set
576576
CONFIG_PM_SLEEP_DEBUG=y
577+
# CONFIG_DPM_WATCHDOG is not set
577578
CONFIG_PM_TRACE=y
578579
CONFIG_PM_TRACE_RTC=y
579580
CONFIG_PM_CLK=y
@@ -587,7 +588,7 @@ CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y
587588
CONFIG_ACPI_THERMAL_LIB=y
588589
# CONFIG_ACPI_DEBUGGER is not set
589590
CONFIG_ACPI_SPCR_TABLE=y
590-
# CONFIG_ACPI_FPDT is not set
591+
CONFIG_ACPI_FPDT=y
591592
CONFIG_ACPI_LPIT=y
592593
CONFIG_ACPI_SLEEP=y
593594
CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y
@@ -611,28 +612,34 @@ CONFIG_ACPI_THERMAL=y
611612
CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y
612613
CONFIG_ACPI_TABLE_UPGRADE=y
613614
# CONFIG_ACPI_DEBUG is not set
614-
# CONFIG_ACPI_PCI_SLOT is not set
615+
CONFIG_ACPI_PCI_SLOT=y
615616
CONFIG_ACPI_CONTAINER=y
616617
CONFIG_ACPI_HOTPLUG_MEMORY=y
617618
CONFIG_ACPI_HOTPLUG_IOAPIC=y
618619
# CONFIG_ACPI_SBS is not set
619-
# CONFIG_ACPI_HED is not set
620-
# CONFIG_ACPI_BGRT is not set
620+
CONFIG_ACPI_HED=y
621+
CONFIG_ACPI_BGRT=y
621622
# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
622623
# CONFIG_ACPI_NFIT is not set
623624
CONFIG_ACPI_NUMA=y
624-
# CONFIG_ACPI_HMAT is not set
625+
CONFIG_ACPI_HMAT=y
625626
CONFIG_HAVE_ACPI_APEI=y
626627
CONFIG_HAVE_ACPI_APEI_NMI=y
627-
# CONFIG_ACPI_APEI is not set
628-
# CONFIG_ACPI_DPTF is not set
628+
CONFIG_ACPI_APEI=y
629+
CONFIG_ACPI_APEI_GHES=y
630+
CONFIG_ACPI_APEI_PCIEAER=y
631+
# CONFIG_ACPI_APEI_EINJ is not set
632+
# CONFIG_ACPI_APEI_ERST_DEBUG is not set
633+
CONFIG_ACPI_DPTF=y
634+
CONFIG_DPTF_POWER=m
635+
CONFIG_DPTF_PCH_FIVR=m
629636
CONFIG_ACPI_WATCHDOG=y
630637
# CONFIG_ACPI_EXTLOG is not set
631638
CONFIG_ACPI_ADXL=y
632639
# CONFIG_ACPI_CONFIGFS is not set
633640
# CONFIG_ACPI_PFRUT is not set
634641
CONFIG_ACPI_PCC=y
635-
# CONFIG_ACPI_FFH is not set
642+
CONFIG_ACPI_FFH=y
636643
# CONFIG_PMIC_OPREGION is not set
637644
CONFIG_ACPI_PRMT=y
638645
CONFIG_X86_PM_TIMER=y
@@ -1934,7 +1941,7 @@ CONFIG_XEN_PCIDEV_FRONTEND=y
19341941
CONFIG_PCI_ATS=y
19351942
CONFIG_PCI_LOCKLESS_CONFIG=y
19361943
CONFIG_PCI_IOV=y
1937-
# CONFIG_PCI_NPEM is not set
1944+
CONFIG_PCI_NPEM=y
19381945
CONFIG_PCI_PRI=y
19391946
CONFIG_PCI_PASID=y
19401947
# CONFIG_PCI_P2PDMA is not set
@@ -1967,9 +1974,13 @@ CONFIG_PCI_HYPERV_INTERFACE=y
19671974
#
19681975
# DesignWare-based PCIe controllers
19691976
#
1977+
CONFIG_PCIE_DW=y
1978+
CONFIG_PCIE_DW_HOST=y
1979+
CONFIG_PCIE_DW_EP=y
19701980
# CONFIG_PCI_MESON is not set
1971-
# CONFIG_PCIE_DW_PLAT_HOST is not set
1972-
# CONFIG_PCIE_DW_PLAT_EP is not set
1981+
CONFIG_PCIE_DW_PLAT=y
1982+
CONFIG_PCIE_DW_PLAT_HOST=y
1983+
CONFIG_PCIE_DW_PLAT_EP=y
19731984
# end of DesignWare-based PCIe controllers
19741985

19751986
#
@@ -2032,6 +2043,7 @@ CONFIG_ALLOW_DEV_COREDUMP=y
20322043
# CONFIG_DEBUG_DRIVER is not set
20332044
CONFIG_DEBUG_DEVRES=y
20342045
# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
2046+
CONFIG_HMEM_REPORTING=y
20352047
# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
20362048
CONFIG_SYS_HYPERVISOR=y
20372049
CONFIG_GENERIC_CPU_DEVICES=y
@@ -2083,6 +2095,8 @@ CONFIG_SYSFB=y
20832095
# EFI (Extensible Firmware Interface) Support
20842096
#
20852097
CONFIG_EFI_ESRT=y
2098+
# CONFIG_EFI_VARS_PSTORE is not set
2099+
CONFIG_EFI_SOFT_RESERVE=y
20862100
CONFIG_EFI_DXE_MEM_ATTRIBUTES=y
20872101
CONFIG_EFI_RUNTIME_WRAPPERS=y
20882102
# CONFIG_EFI_BOOTLOADER_CONTROL is not set
@@ -2099,6 +2113,8 @@ CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
20992113
# CONFIG_EFI_COCO_SECRET is not set
21002114
# end of EFI (Extensible Firmware Interface) Support
21012115

2116+
CONFIG_UEFI_CPER=y
2117+
CONFIG_UEFI_CPER_X86=y
21022118
# CONFIG_IMX_SCMI_MISC_DRV is not set
21032119

21042120
#
@@ -5484,6 +5500,7 @@ CONFIG_EDAC=y
54845500
CONFIG_EDAC_LEGACY_SYSFS=y
54855501
# CONFIG_EDAC_DEBUG is not set
54865502
CONFIG_EDAC_DECODE_MCE=y
5503+
# CONFIG_EDAC_GHES is not set
54875504
CONFIG_EDAC_AMD64=m
54885505
CONFIG_EDAC_E752X=m
54895506
CONFIG_EDAC_I82975X=m
@@ -5667,8 +5684,8 @@ CONFIG_VFIO_PCI_CORE=m
56675684
CONFIG_VFIO_PCI_MMAP=y
56685685
CONFIG_VFIO_PCI_INTX=y
56695686
CONFIG_VFIO_PCI=m
5670-
# CONFIG_VFIO_PCI_VGA is not set
5671-
# CONFIG_VFIO_PCI_IGD is not set
5687+
CONFIG_VFIO_PCI_VGA=y
5688+
CONFIG_VFIO_PCI_IGD=y
56725689
# CONFIG_MLX5_VFIO_PCI is not set
56735690
# CONFIG_VIRTIO_VFIO_PCI is not set
56745691
# end of VFIO support for PCI devices
@@ -6045,6 +6062,7 @@ CONFIG_USB4=m
60456062
# CONFIG_LIBNVDIMM is not set
60466063
CONFIG_DAX=y
60476064
# CONFIG_DEV_DAX is not set
6065+
# CONFIG_DEV_DAX_HMEM is not set
60486066
CONFIG_NVMEM=y
60496067
CONFIG_NVMEM_SYSFS=y
60506068
# CONFIG_NVMEM_LAYOUTS is not set
@@ -6243,7 +6261,14 @@ CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
62436261
# CONFIG_QNX4FS_FS is not set
62446262
# CONFIG_QNX6FS_FS is not set
62456263
# CONFIG_ROMFS_FS is not set
6246-
# CONFIG_PSTORE is not set
6264+
CONFIG_PSTORE=y
6265+
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
6266+
CONFIG_PSTORE_COMPRESS=y
6267+
# CONFIG_PSTORE_CONSOLE is not set
6268+
# CONFIG_PSTORE_PMSG is not set
6269+
# CONFIG_PSTORE_FTRACE is not set
6270+
# CONFIG_PSTORE_RAM is not set
6271+
# CONFIG_PSTORE_BLK is not set
62476272
# CONFIG_SYSV_FS is not set
62486273
# CONFIG_UFS_FS is not set
62496274
# CONFIG_EROFS_FS is not set
@@ -6889,6 +6914,7 @@ CONFIG_FONT_TER16x32=y
68896914
# CONFIG_FONT_6x8 is not set
68906915
CONFIG_SG_POOL=y
68916916
CONFIG_ARCH_HAS_PMEM_API=y
6917+
CONFIG_MEMREGION=y
68926918
CONFIG_ARCH_HAS_CPU_CACHE_INVALIDATE_MEMREGION=y
68936919
CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
68946920
CONFIG_ARCH_HAS_COPY_MC=y

kernel/build/config-arm64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1934,7 +1934,7 @@ CONFIG_PCI_ATS=y
19341934
CONFIG_PCI_ECAM=y
19351935
CONFIG_PCI_BRIDGE_EMUL=y
19361936
CONFIG_PCI_IOV=y
1937-
# CONFIG_PCI_NPEM is not set
1937+
CONFIG_PCI_NPEM=y
19381938
CONFIG_PCI_PRI=y
19391939
CONFIG_PCI_PASID=y
19401940
# CONFIG_PCI_P2PDMA is not set

0 commit comments

Comments
 (0)