提交 19081172 编写于 作者: J Joseph Qi 提交者: Caspar Zhang

configs: merge intel configs into mainline

To support intel icelake, now enable RAS features, dax pmem and icelake
related configs.
Signed-off-by: NJoseph Qi <joseph.qi@linux.alibaba.com>
上级 cfa2b8c2
...@@ -290,6 +290,7 @@ CONFIG_RETPOLINE=y ...@@ -290,6 +290,7 @@ CONFIG_RETPOLINE=y
# CONFIG_X86_AMD_PLATFORM_DEVICE is not set # CONFIG_X86_AMD_PLATFORM_DEVICE is not set
CONFIG_IOSF_MBI=m CONFIG_IOSF_MBI=m
# CONFIG_IOSF_MBI_DEBUG is not set # CONFIG_IOSF_MBI_DEBUG is not set
CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
# CONFIG_SCHED_OMIT_FRAME_POINTER is not set # CONFIG_SCHED_OMIT_FRAME_POINTER is not set
CONFIG_HYPERVISOR_GUEST=y CONFIG_HYPERVISOR_GUEST=y
CONFIG_PARAVIRT=y CONFIG_PARAVIRT=y
...@@ -319,11 +320,12 @@ CONFIG_X86_MINIMUM_CPU_FAMILY=64 ...@@ -319,11 +320,12 @@ CONFIG_X86_MINIMUM_CPU_FAMILY=64
CONFIG_X86_DEBUGCTLMSR=y CONFIG_X86_DEBUGCTLMSR=y
CONFIG_PROCESSOR_SELECT=y CONFIG_PROCESSOR_SELECT=y
CONFIG_CPU_SUP_INTEL=y CONFIG_CPU_SUP_INTEL=y
# CONFIG_CPU_SUP_AMD is not set CONFIG_CPU_SUP_AMD=y
# CONFIG_CPU_SUP_CENTAUR is not set # CONFIG_CPU_SUP_CENTAUR is not set
CONFIG_HPET_TIMER=y CONFIG_HPET_TIMER=y
CONFIG_HPET_EMULATE_RTC=y CONFIG_HPET_EMULATE_RTC=y
CONFIG_DMI=y CONFIG_DMI=y
# CONFIG_GART_IOMMU is not set
# CONFIG_CALGARY_IOMMU is not set # CONFIG_CALGARY_IOMMU is not set
# CONFIG_MAXSMP is not set # CONFIG_MAXSMP is not set
CONFIG_NR_CPUS_RANGE_BEGIN=2 CONFIG_NR_CPUS_RANGE_BEGIN=2
...@@ -336,7 +338,13 @@ CONFIG_SCHED_MC_PRIO=y ...@@ -336,7 +338,13 @@ CONFIG_SCHED_MC_PRIO=y
CONFIG_X86_LOCAL_APIC=y CONFIG_X86_LOCAL_APIC=y
CONFIG_X86_IO_APIC=y CONFIG_X86_IO_APIC=y
# CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set # CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set
# CONFIG_X86_MCE is not set CONFIG_X86_MCE=y
CONFIG_X86_MCELOG_LEGACY=y
CONFIG_X86_MCE_INTEL=y
CONFIG_X86_MCE_AMD=y
CONFIG_X86_MCE_THRESHOLD=y
CONFIG_X86_MCE_INJECT=m
CONFIG_X86_THERMAL_VECTOR=y
# #
# Performance monitoring # Performance monitoring
...@@ -344,6 +352,7 @@ CONFIG_X86_IO_APIC=y ...@@ -344,6 +352,7 @@ CONFIG_X86_IO_APIC=y
CONFIG_PERF_EVENTS_INTEL_UNCORE=y CONFIG_PERF_EVENTS_INTEL_UNCORE=y
CONFIG_PERF_EVENTS_INTEL_RAPL=y CONFIG_PERF_EVENTS_INTEL_RAPL=y
CONFIG_PERF_EVENTS_INTEL_CSTATE=y CONFIG_PERF_EVENTS_INTEL_CSTATE=y
# CONFIG_PERF_EVENTS_AMD_POWER is not set
CONFIG_X86_VSYSCALL_EMULATION=y CONFIG_X86_VSYSCALL_EMULATION=y
# CONFIG_I8K is not set # CONFIG_I8K is not set
# CONFIG_MICROCODE is not set # CONFIG_MICROCODE is not set
...@@ -353,6 +362,7 @@ CONFIG_X86_CPUID=y ...@@ -353,6 +362,7 @@ CONFIG_X86_CPUID=y
CONFIG_X86_DIRECT_GBPAGES=y CONFIG_X86_DIRECT_GBPAGES=y
# CONFIG_X86_CPA_STATISTICS is not set # CONFIG_X86_CPA_STATISTICS is not set
CONFIG_ARCH_HAS_MEM_ENCRYPT=y CONFIG_ARCH_HAS_MEM_ENCRYPT=y
# CONFIG_AMD_MEM_ENCRYPT is not set
CONFIG_NUMA=y CONFIG_NUMA=y
# CONFIG_AMD_NUMA is not set # CONFIG_AMD_NUMA is not set
CONFIG_X86_64_ACPI_NUMA=y CONFIG_X86_64_ACPI_NUMA=y
...@@ -467,15 +477,23 @@ CONFIG_ACPI_CONTAINER=y ...@@ -467,15 +477,23 @@ CONFIG_ACPI_CONTAINER=y
CONFIG_ACPI_HOTPLUG_MEMORY=y CONFIG_ACPI_HOTPLUG_MEMORY=y
CONFIG_ACPI_HOTPLUG_IOAPIC=y CONFIG_ACPI_HOTPLUG_IOAPIC=y
# CONFIG_ACPI_SBS is not set # CONFIG_ACPI_SBS is not set
# CONFIG_ACPI_HED is not set CONFIG_ACPI_HED=y
# CONFIG_ACPI_CUSTOM_METHOD is not set # CONFIG_ACPI_CUSTOM_METHOD is not set
# CONFIG_ACPI_BGRT is not set # CONFIG_ACPI_BGRT is not set
# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
CONFIG_ACPI_NFIT=y CONFIG_ACPI_NFIT=m
CONFIG_ACPI_HMAT=y
CONFIG_HAVE_ACPI_APEI=y CONFIG_HAVE_ACPI_APEI=y
CONFIG_HAVE_ACPI_APEI_NMI=y CONFIG_HAVE_ACPI_APEI_NMI=y
# CONFIG_ACPI_APEI is not set CONFIG_ACPI_APEI=y
CONFIG_ACPI_APEI_GHES=y
CONFIG_ACPI_APEI_PCIEAER=y
CONFIG_ACPI_APEI_MEMORY_FAILURE=y
CONFIG_ACPI_APEI_EINJ=m
# CONFIG_ACPI_APEI_ERST_DEBUG is not set
# CONFIG_DPTF_POWER is not set # CONFIG_DPTF_POWER is not set
CONFIG_ACPI_EXTLOG=m
CONFIG_ACPI_ADXL=y
# CONFIG_PMIC_OPREGION is not set # CONFIG_PMIC_OPREGION is not set
# CONFIG_ACPI_CONFIGFS is not set # CONFIG_ACPI_CONFIGFS is not set
# CONFIG_X86_PM_TIMER is not set # CONFIG_X86_PM_TIMER is not set
...@@ -531,7 +549,9 @@ CONFIG_MMCONF_FAM10H=y ...@@ -531,7 +549,9 @@ CONFIG_MMCONF_FAM10H=y
# CONFIG_PCI_CNB20LE_QUIRK is not set # CONFIG_PCI_CNB20LE_QUIRK is not set
CONFIG_PCIEPORTBUS=y CONFIG_PCIEPORTBUS=y
CONFIG_HOTPLUG_PCI_PCIE=y CONFIG_HOTPLUG_PCI_PCIE=y
# CONFIG_PCIEAER is not set CONFIG_PCIEAER=y
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIE_ECRC=y
CONFIG_PCIEASPM=y CONFIG_PCIEASPM=y
# CONFIG_PCIEASPM_DEBUG is not set # CONFIG_PCIEASPM_DEBUG is not set
CONFIG_PCIEASPM_DEFAULT=y CONFIG_PCIEASPM_DEFAULT=y
...@@ -539,6 +559,7 @@ CONFIG_PCIEASPM_DEFAULT=y ...@@ -539,6 +559,7 @@ CONFIG_PCIEASPM_DEFAULT=y
# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set # CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
# CONFIG_PCIEASPM_PERFORMANCE is not set # CONFIG_PCIEASPM_PERFORMANCE is not set
CONFIG_PCIE_PME=y CONFIG_PCIE_PME=y
# CONFIG_PCIE_DPC is not set
# CONFIG_PCIE_PTM is not set # CONFIG_PCIE_PTM is not set
CONFIG_PCI_MSI=y CONFIG_PCI_MSI=y
CONFIG_PCI_MSI_IRQ_DOMAIN=y CONFIG_PCI_MSI_IRQ_DOMAIN=y
...@@ -584,6 +605,7 @@ CONFIG_HOTPLUG_PCI_SHPC=y ...@@ -584,6 +605,7 @@ CONFIG_HOTPLUG_PCI_SHPC=y
# CONFIG_PCI_SW_SWITCHTEC is not set # CONFIG_PCI_SW_SWITCHTEC is not set
CONFIG_ISA_BUS=y CONFIG_ISA_BUS=y
# CONFIG_ISA_DMA_API is not set # CONFIG_ISA_DMA_API is not set
CONFIG_AMD_NB=y
# CONFIG_PCCARD is not set # CONFIG_PCCARD is not set
# CONFIG_RAPIDIO is not set # CONFIG_RAPIDIO is not set
# CONFIG_X86_SYSFB is not set # CONFIG_X86_SYSFB is not set
...@@ -631,6 +653,8 @@ CONFIG_EFI_CAPSULE_LOADER=y ...@@ -631,6 +653,8 @@ CONFIG_EFI_CAPSULE_LOADER=y
# CONFIG_EFI_TEST is not set # CONFIG_EFI_TEST is not set
# CONFIG_APPLE_PROPERTIES is not set # CONFIG_APPLE_PROPERTIES is not set
# CONFIG_RESET_ATTACK_MITIGATION is not set # CONFIG_RESET_ATTACK_MITIGATION is not set
CONFIG_UEFI_CPER=y
CONFIG_UEFI_CPER_X86=y
# #
# Tegra firmware driver # Tegra firmware driver
...@@ -899,6 +923,9 @@ CONFIG_VIRT_TO_BUS=y ...@@ -899,6 +923,9 @@ CONFIG_VIRT_TO_BUS=y
CONFIG_MMU_NOTIFIER=y CONFIG_MMU_NOTIFIER=y
CONFIG_KSM=y CONFIG_KSM=y
CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
CONFIG_MEMORY_FAILURE=y
CONFIG_HWPOISON_INJECT=m
CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_TRANSPARENT_HUGEPAGE=y
# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set # CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
...@@ -1594,6 +1621,7 @@ CONFIG_ALLOW_DEV_COREDUMP=y ...@@ -1594,6 +1621,7 @@ CONFIG_ALLOW_DEV_COREDUMP=y
# CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DRIVER is not set
CONFIG_DEBUG_DEVRES=y CONFIG_DEBUG_DEVRES=y
# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
CONFIG_HMEM_REPORTING=y
# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
CONFIG_GENERIC_CPU_AUTOPROBE=y CONFIG_GENERIC_CPU_AUTOPROBE=y
CONFIG_GENERIC_CPU_VULNERABILITIES=y CONFIG_GENERIC_CPU_VULNERABILITIES=y
...@@ -2455,7 +2483,7 @@ CONFIG_PTP_1588_CLOCK_KVM=y ...@@ -2455,7 +2483,7 @@ CONFIG_PTP_1588_CLOCK_KVM=y
CONFIG_THERMAL=y CONFIG_THERMAL=y
# CONFIG_THERMAL_STATISTICS is not set # CONFIG_THERMAL_STATISTICS is not set
CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=100 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=100
# CONFIG_THERMAL_WRITABLE_TRIPS is not set CONFIG_THERMAL_WRITABLE_TRIPS=y
# CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE is not set # CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE is not set
# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE=y CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE=y
...@@ -2467,6 +2495,7 @@ CONFIG_THERMAL_GOV_USER_SPACE=y ...@@ -2467,6 +2495,7 @@ CONFIG_THERMAL_GOV_USER_SPACE=y
# CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set # CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set
# CONFIG_THERMAL_EMULATION is not set # CONFIG_THERMAL_EMULATION is not set
# CONFIG_INTEL_POWERCLAMP is not set # CONFIG_INTEL_POWERCLAMP is not set
CONFIG_X86_PKG_TEMP_THERMAL=m
# CONFIG_INTEL_SOC_DTS_THERMAL is not set # CONFIG_INTEL_SOC_DTS_THERMAL is not set
# #
...@@ -2998,6 +3027,28 @@ CONFIG_NEW_LEDS=y ...@@ -2998,6 +3027,28 @@ CONFIG_NEW_LEDS=y
# CONFIG_INFINIBAND is not set # CONFIG_INFINIBAND is not set
CONFIG_EDAC_ATOMIC_SCRUB=y CONFIG_EDAC_ATOMIC_SCRUB=y
CONFIG_EDAC_SUPPORT=y CONFIG_EDAC_SUPPORT=y
CONFIG_EDAC=y
CONFIG_EDAC_LEGACY_SYSFS=y
# CONFIG_EDAC_DEBUG is not set
CONFIG_EDAC_DECODE_MCE=m
CONFIG_EDAC_GHES=y
CONFIG_EDAC_AMD64=m
# CONFIG_EDAC_AMD64_ERROR_INJECTION is not set
CONFIG_EDAC_E752X=m
CONFIG_EDAC_I82975X=m
CONFIG_EDAC_I3000=m
CONFIG_EDAC_I3200=m
# CONFIG_EDAC_IE31200 is not set
CONFIG_EDAC_X38=m
CONFIG_EDAC_I5400=m
CONFIG_EDAC_I7CORE=m
CONFIG_EDAC_I5000=m
CONFIG_EDAC_I5100=m
CONFIG_EDAC_I7300=m
CONFIG_EDAC_SBRIDGE=m
CONFIG_EDAC_SKX=m
CONFIG_EDAC_I10NM=m
CONFIG_EDAC_PND2=m
CONFIG_RTC_LIB=y CONFIG_RTC_LIB=y
CONFIG_RTC_MC146818_LIB=y CONFIG_RTC_MC146818_LIB=y
CONFIG_RTC_CLASS=y CONFIG_RTC_CLASS=y
...@@ -3158,6 +3209,11 @@ CONFIG_PVPANIC=m ...@@ -3158,6 +3209,11 @@ CONFIG_PVPANIC=m
# CONFIG_INTEL_TURBO_MAX_3 is not set # CONFIG_INTEL_TURBO_MAX_3 is not set
# CONFIG_I2C_MULTI_INSTANTIATE is not set # CONFIG_I2C_MULTI_INSTANTIATE is not set
# CONFIG_INTEL_ATOMISP2_PM is not set # CONFIG_INTEL_ATOMISP2_PM is not set
#
# Intel Speed Select Technology interface support
#
CONFIG_INTEL_SPEED_SELECT_INTERFACE=m
CONFIG_PMC_ATOM=y CONFIG_PMC_ATOM=y
# CONFIG_CHROME_PLATFORMS is not set # CONFIG_CHROME_PLATFORMS is not set
# CONFIG_MELLANOX_PLATFORM is not set # CONFIG_MELLANOX_PLATFORM is not set
...@@ -3266,13 +3322,17 @@ CONFIG_ARM_GIC_MAX_NR=1 ...@@ -3266,13 +3322,17 @@ CONFIG_ARM_GIC_MAX_NR=1
# CONFIG_BCM_KONA_USB2_PHY is not set # CONFIG_BCM_KONA_USB2_PHY is not set
# CONFIG_PHY_PXA_28NM_HSIC is not set # CONFIG_PHY_PXA_28NM_HSIC is not set
# CONFIG_PHY_PXA_28NM_USB2 is not set # CONFIG_PHY_PXA_28NM_USB2 is not set
# CONFIG_POWERCAP is not set CONFIG_POWERCAP=y
CONFIG_INTEL_RAPL_CORE=m
CONFIG_INTEL_RAPL=m
# CONFIG_IDLE_INJECT is not set
# CONFIG_MCB is not set # CONFIG_MCB is not set
# #
# Performance monitor support # Performance monitor support
# #
# CONFIG_RAS is not set CONFIG_RAS=y
CONFIG_RAS_CEC=y
# CONFIG_THUNDERBOLT is not set # CONFIG_THUNDERBOLT is not set
# #
...@@ -3281,7 +3341,7 @@ CONFIG_ARM_GIC_MAX_NR=1 ...@@ -3281,7 +3341,7 @@ CONFIG_ARM_GIC_MAX_NR=1
# CONFIG_ANDROID is not set # CONFIG_ANDROID is not set
CONFIG_LIBNVDIMM=y CONFIG_LIBNVDIMM=y
CONFIG_BLK_DEV_PMEM=y CONFIG_BLK_DEV_PMEM=y
CONFIG_ND_BLK=y CONFIG_ND_BLK=m
CONFIG_ND_CLAIM=y CONFIG_ND_CLAIM=y
CONFIG_ND_BTT=y CONFIG_ND_BTT=y
CONFIG_BTT=y CONFIG_BTT=y
...@@ -3291,8 +3351,9 @@ CONFIG_NVDIMM_DAX=y ...@@ -3291,8 +3351,9 @@ CONFIG_NVDIMM_DAX=y
CONFIG_DAX_DRIVER=y CONFIG_DAX_DRIVER=y
CONFIG_DAX=y CONFIG_DAX=y
CONFIG_DEV_DAX=y CONFIG_DEV_DAX=y
CONFIG_DEV_DAX_PMEM=m CONFIG_DEV_DAX_PMEM=y
# CONFIG_NVMEM is not set CONFIG_DEV_DAX_KMEM=y
CONFIG_NVMEM=y
# #
# HW tracing support # HW tracing support
...@@ -3894,6 +3955,7 @@ CONFIG_XZ_DEC_BCJ=y ...@@ -3894,6 +3955,7 @@ CONFIG_XZ_DEC_BCJ=y
# CONFIG_XZ_DEC_TEST is not set # CONFIG_XZ_DEC_TEST is not set
CONFIG_DECOMPRESS_GZIP=y CONFIG_DECOMPRESS_GZIP=y
CONFIG_DECOMPRESS_XZ=y CONFIG_DECOMPRESS_XZ=y
CONFIG_GENERIC_ALLOCATOR=y
CONFIG_TEXTSEARCH=y CONFIG_TEXTSEARCH=y
CONFIG_TEXTSEARCH_KMP=m CONFIG_TEXTSEARCH_KMP=m
CONFIG_TEXTSEARCH_BM=m CONFIG_TEXTSEARCH_BM=m
...@@ -3941,6 +4003,7 @@ CONFIG_SG_POOL=y ...@@ -3941,6 +4003,7 @@ CONFIG_SG_POOL=y
CONFIG_ARCH_HAS_SG_CHAIN=y CONFIG_ARCH_HAS_SG_CHAIN=y
CONFIG_ARCH_HAS_PMEM_API=y CONFIG_ARCH_HAS_PMEM_API=y
CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
CONFIG_ARCH_HAS_UACCESS_MCSAFE=y
CONFIG_SBITMAP=y CONFIG_SBITMAP=y
# CONFIG_STRING_SELFTEST is not set # CONFIG_STRING_SELFTEST is not set
...@@ -3975,7 +4038,7 @@ CONFIG_FRAME_WARN=1024 ...@@ -3975,7 +4038,7 @@ CONFIG_FRAME_WARN=1024
CONFIG_DEBUG_FS=y CONFIG_DEBUG_FS=y
# CONFIG_HEADERS_CHECK is not set # CONFIG_HEADERS_CHECK is not set
CONFIG_DEBUG_SECTION_MISMATCH=y CONFIG_DEBUG_SECTION_MISMATCH=y
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set CONFIG_SECTION_MISMATCH_WARN_ONLY=y
CONFIG_STACK_VALIDATION=y CONFIG_STACK_VALIDATION=y
# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
......
...@@ -295,6 +295,7 @@ CONFIG_RETPOLINE=y ...@@ -295,6 +295,7 @@ CONFIG_RETPOLINE=y
# CONFIG_X86_AMD_PLATFORM_DEVICE is not set # CONFIG_X86_AMD_PLATFORM_DEVICE is not set
CONFIG_IOSF_MBI=m CONFIG_IOSF_MBI=m
# CONFIG_IOSF_MBI_DEBUG is not set # CONFIG_IOSF_MBI_DEBUG is not set
CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
# CONFIG_SCHED_OMIT_FRAME_POINTER is not set # CONFIG_SCHED_OMIT_FRAME_POINTER is not set
CONFIG_HYPERVISOR_GUEST=y CONFIG_HYPERVISOR_GUEST=y
CONFIG_PARAVIRT=y CONFIG_PARAVIRT=y
...@@ -324,11 +325,12 @@ CONFIG_X86_MINIMUM_CPU_FAMILY=64 ...@@ -324,11 +325,12 @@ CONFIG_X86_MINIMUM_CPU_FAMILY=64
CONFIG_X86_DEBUGCTLMSR=y CONFIG_X86_DEBUGCTLMSR=y
CONFIG_PROCESSOR_SELECT=y CONFIG_PROCESSOR_SELECT=y
CONFIG_CPU_SUP_INTEL=y CONFIG_CPU_SUP_INTEL=y
# CONFIG_CPU_SUP_AMD is not set CONFIG_CPU_SUP_AMD=y
# CONFIG_CPU_SUP_CENTAUR is not set # CONFIG_CPU_SUP_CENTAUR is not set
CONFIG_HPET_TIMER=y CONFIG_HPET_TIMER=y
CONFIG_HPET_EMULATE_RTC=y CONFIG_HPET_EMULATE_RTC=y
CONFIG_DMI=y CONFIG_DMI=y
# CONFIG_GART_IOMMU is not set
# CONFIG_CALGARY_IOMMU is not set # CONFIG_CALGARY_IOMMU is not set
# CONFIG_MAXSMP is not set # CONFIG_MAXSMP is not set
CONFIG_NR_CPUS_RANGE_BEGIN=2 CONFIG_NR_CPUS_RANGE_BEGIN=2
...@@ -341,7 +343,13 @@ CONFIG_SCHED_MC_PRIO=y ...@@ -341,7 +343,13 @@ CONFIG_SCHED_MC_PRIO=y
CONFIG_X86_LOCAL_APIC=y CONFIG_X86_LOCAL_APIC=y
CONFIG_X86_IO_APIC=y CONFIG_X86_IO_APIC=y
# CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set # CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set
# CONFIG_X86_MCE is not set CONFIG_X86_MCE=y
CONFIG_X86_MCELOG_LEGACY=y
CONFIG_X86_MCE_INTEL=y
CONFIG_X86_MCE_AMD=y
CONFIG_X86_MCE_THRESHOLD=y
CONFIG_X86_MCE_INJECT=m
CONFIG_X86_THERMAL_VECTOR=y
# #
# Performance monitoring # Performance monitoring
...@@ -349,6 +357,7 @@ CONFIG_X86_IO_APIC=y ...@@ -349,6 +357,7 @@ CONFIG_X86_IO_APIC=y
CONFIG_PERF_EVENTS_INTEL_UNCORE=y CONFIG_PERF_EVENTS_INTEL_UNCORE=y
CONFIG_PERF_EVENTS_INTEL_RAPL=y CONFIG_PERF_EVENTS_INTEL_RAPL=y
CONFIG_PERF_EVENTS_INTEL_CSTATE=y CONFIG_PERF_EVENTS_INTEL_CSTATE=y
# CONFIG_PERF_EVENTS_AMD_POWER is not set
CONFIG_X86_VSYSCALL_EMULATION=y CONFIG_X86_VSYSCALL_EMULATION=y
# CONFIG_I8K is not set # CONFIG_I8K is not set
# CONFIG_MICROCODE is not set # CONFIG_MICROCODE is not set
...@@ -358,6 +367,7 @@ CONFIG_X86_CPUID=y ...@@ -358,6 +367,7 @@ CONFIG_X86_CPUID=y
CONFIG_X86_DIRECT_GBPAGES=y CONFIG_X86_DIRECT_GBPAGES=y
# CONFIG_X86_CPA_STATISTICS is not set # CONFIG_X86_CPA_STATISTICS is not set
CONFIG_ARCH_HAS_MEM_ENCRYPT=y CONFIG_ARCH_HAS_MEM_ENCRYPT=y
# CONFIG_AMD_MEM_ENCRYPT is not set
CONFIG_NUMA=y CONFIG_NUMA=y
# CONFIG_AMD_NUMA is not set # CONFIG_AMD_NUMA is not set
CONFIG_X86_64_ACPI_NUMA=y CONFIG_X86_64_ACPI_NUMA=y
...@@ -472,15 +482,23 @@ CONFIG_ACPI_CONTAINER=y ...@@ -472,15 +482,23 @@ CONFIG_ACPI_CONTAINER=y
CONFIG_ACPI_HOTPLUG_MEMORY=y CONFIG_ACPI_HOTPLUG_MEMORY=y
CONFIG_ACPI_HOTPLUG_IOAPIC=y CONFIG_ACPI_HOTPLUG_IOAPIC=y
# CONFIG_ACPI_SBS is not set # CONFIG_ACPI_SBS is not set
# CONFIG_ACPI_HED is not set CONFIG_ACPI_HED=y
# CONFIG_ACPI_CUSTOM_METHOD is not set # CONFIG_ACPI_CUSTOM_METHOD is not set
# CONFIG_ACPI_BGRT is not set # CONFIG_ACPI_BGRT is not set
# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
CONFIG_ACPI_NFIT=y CONFIG_ACPI_NFIT=m
CONFIG_ACPI_HMAT=y
CONFIG_HAVE_ACPI_APEI=y CONFIG_HAVE_ACPI_APEI=y
CONFIG_HAVE_ACPI_APEI_NMI=y CONFIG_HAVE_ACPI_APEI_NMI=y
# CONFIG_ACPI_APEI is not set CONFIG_ACPI_APEI=y
CONFIG_ACPI_APEI_GHES=y
CONFIG_ACPI_APEI_PCIEAER=y
CONFIG_ACPI_APEI_MEMORY_FAILURE=y
CONFIG_ACPI_APEI_EINJ=m
# CONFIG_ACPI_APEI_ERST_DEBUG is not set
# CONFIG_DPTF_POWER is not set # CONFIG_DPTF_POWER is not set
CONFIG_ACPI_EXTLOG=m
CONFIG_ACPI_ADXL=y
# CONFIG_PMIC_OPREGION is not set # CONFIG_PMIC_OPREGION is not set
# CONFIG_ACPI_CONFIGFS is not set # CONFIG_ACPI_CONFIGFS is not set
# CONFIG_X86_PM_TIMER is not set # CONFIG_X86_PM_TIMER is not set
...@@ -536,7 +554,9 @@ CONFIG_MMCONF_FAM10H=y ...@@ -536,7 +554,9 @@ CONFIG_MMCONF_FAM10H=y
# CONFIG_PCI_CNB20LE_QUIRK is not set # CONFIG_PCI_CNB20LE_QUIRK is not set
CONFIG_PCIEPORTBUS=y CONFIG_PCIEPORTBUS=y
CONFIG_HOTPLUG_PCI_PCIE=y CONFIG_HOTPLUG_PCI_PCIE=y
# CONFIG_PCIEAER is not set CONFIG_PCIEAER=y
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIE_ECRC=y
CONFIG_PCIEASPM=y CONFIG_PCIEASPM=y
# CONFIG_PCIEASPM_DEBUG is not set # CONFIG_PCIEASPM_DEBUG is not set
CONFIG_PCIEASPM_DEFAULT=y CONFIG_PCIEASPM_DEFAULT=y
...@@ -544,6 +564,7 @@ CONFIG_PCIEASPM_DEFAULT=y ...@@ -544,6 +564,7 @@ CONFIG_PCIEASPM_DEFAULT=y
# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set # CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
# CONFIG_PCIEASPM_PERFORMANCE is not set # CONFIG_PCIEASPM_PERFORMANCE is not set
CONFIG_PCIE_PME=y CONFIG_PCIE_PME=y
# CONFIG_PCIE_DPC is not set
# CONFIG_PCIE_PTM is not set # CONFIG_PCIE_PTM is not set
CONFIG_PCI_MSI=y CONFIG_PCI_MSI=y
CONFIG_PCI_MSI_IRQ_DOMAIN=y CONFIG_PCI_MSI_IRQ_DOMAIN=y
...@@ -589,6 +610,7 @@ CONFIG_HOTPLUG_PCI_SHPC=y ...@@ -589,6 +610,7 @@ CONFIG_HOTPLUG_PCI_SHPC=y
# CONFIG_PCI_SW_SWITCHTEC is not set # CONFIG_PCI_SW_SWITCHTEC is not set
CONFIG_ISA_BUS=y CONFIG_ISA_BUS=y
# CONFIG_ISA_DMA_API is not set # CONFIG_ISA_DMA_API is not set
CONFIG_AMD_NB=y
# CONFIG_PCCARD is not set # CONFIG_PCCARD is not set
# CONFIG_RAPIDIO is not set # CONFIG_RAPIDIO is not set
# CONFIG_X86_SYSFB is not set # CONFIG_X86_SYSFB is not set
...@@ -636,6 +658,8 @@ CONFIG_EFI_CAPSULE_LOADER=y ...@@ -636,6 +658,8 @@ CONFIG_EFI_CAPSULE_LOADER=y
# CONFIG_EFI_TEST is not set # CONFIG_EFI_TEST is not set
# CONFIG_APPLE_PROPERTIES is not set # CONFIG_APPLE_PROPERTIES is not set
# CONFIG_RESET_ATTACK_MITIGATION is not set # CONFIG_RESET_ATTACK_MITIGATION is not set
CONFIG_UEFI_CPER=y
CONFIG_UEFI_CPER_X86=y
# #
# Tegra firmware driver # Tegra firmware driver
...@@ -899,6 +923,9 @@ CONFIG_VIRT_TO_BUS=y ...@@ -899,6 +923,9 @@ CONFIG_VIRT_TO_BUS=y
CONFIG_MMU_NOTIFIER=y CONFIG_MMU_NOTIFIER=y
CONFIG_KSM=y CONFIG_KSM=y
CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
CONFIG_MEMORY_FAILURE=y
CONFIG_HWPOISON_INJECT=m
CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_TRANSPARENT_HUGEPAGE=y
# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set # CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
...@@ -1594,6 +1621,7 @@ CONFIG_ALLOW_DEV_COREDUMP=y ...@@ -1594,6 +1621,7 @@ CONFIG_ALLOW_DEV_COREDUMP=y
# CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DRIVER is not set
CONFIG_DEBUG_DEVRES=y CONFIG_DEBUG_DEVRES=y
# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
CONFIG_HMEM_REPORTING=y
# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
CONFIG_GENERIC_CPU_AUTOPROBE=y CONFIG_GENERIC_CPU_AUTOPROBE=y
CONFIG_GENERIC_CPU_VULNERABILITIES=y CONFIG_GENERIC_CPU_VULNERABILITIES=y
...@@ -2458,7 +2486,7 @@ CONFIG_PTP_1588_CLOCK_KVM=y ...@@ -2458,7 +2486,7 @@ CONFIG_PTP_1588_CLOCK_KVM=y
CONFIG_THERMAL=y CONFIG_THERMAL=y
# CONFIG_THERMAL_STATISTICS is not set # CONFIG_THERMAL_STATISTICS is not set
CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=100 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=100
# CONFIG_THERMAL_WRITABLE_TRIPS is not set CONFIG_THERMAL_WRITABLE_TRIPS=y
# CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE is not set # CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE is not set
# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE=y CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE=y
...@@ -2470,6 +2498,7 @@ CONFIG_THERMAL_GOV_USER_SPACE=y ...@@ -2470,6 +2498,7 @@ CONFIG_THERMAL_GOV_USER_SPACE=y
# CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set # CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set
# CONFIG_THERMAL_EMULATION is not set # CONFIG_THERMAL_EMULATION is not set
# CONFIG_INTEL_POWERCLAMP is not set # CONFIG_INTEL_POWERCLAMP is not set
CONFIG_X86_PKG_TEMP_THERMAL=m
# CONFIG_INTEL_SOC_DTS_THERMAL is not set # CONFIG_INTEL_SOC_DTS_THERMAL is not set
# #
...@@ -3001,6 +3030,28 @@ CONFIG_NEW_LEDS=y ...@@ -3001,6 +3030,28 @@ CONFIG_NEW_LEDS=y
# CONFIG_INFINIBAND is not set # CONFIG_INFINIBAND is not set
CONFIG_EDAC_ATOMIC_SCRUB=y CONFIG_EDAC_ATOMIC_SCRUB=y
CONFIG_EDAC_SUPPORT=y CONFIG_EDAC_SUPPORT=y
CONFIG_EDAC=y
CONFIG_EDAC_LEGACY_SYSFS=y
# CONFIG_EDAC_DEBUG is not set
CONFIG_EDAC_DECODE_MCE=m
CONFIG_EDAC_GHES=y
CONFIG_EDAC_AMD64=m
# CONFIG_EDAC_AMD64_ERROR_INJECTION is not set
CONFIG_EDAC_E752X=m
CONFIG_EDAC_I82975X=m
CONFIG_EDAC_I3000=m
CONFIG_EDAC_I3200=m
# CONFIG_EDAC_IE31200 is not set
CONFIG_EDAC_X38=m
CONFIG_EDAC_I5400=m
CONFIG_EDAC_I7CORE=m
CONFIG_EDAC_I5000=m
CONFIG_EDAC_I5100=m
CONFIG_EDAC_I7300=m
CONFIG_EDAC_SBRIDGE=m
CONFIG_EDAC_SKX=m
CONFIG_EDAC_I10NM=m
CONFIG_EDAC_PND2=m
CONFIG_RTC_LIB=y CONFIG_RTC_LIB=y
CONFIG_RTC_MC146818_LIB=y CONFIG_RTC_MC146818_LIB=y
CONFIG_RTC_CLASS=y CONFIG_RTC_CLASS=y
...@@ -3161,6 +3212,11 @@ CONFIG_PVPANIC=m ...@@ -3161,6 +3212,11 @@ CONFIG_PVPANIC=m
# CONFIG_INTEL_TURBO_MAX_3 is not set # CONFIG_INTEL_TURBO_MAX_3 is not set
# CONFIG_I2C_MULTI_INSTANTIATE is not set # CONFIG_I2C_MULTI_INSTANTIATE is not set
# CONFIG_INTEL_ATOMISP2_PM is not set # CONFIG_INTEL_ATOMISP2_PM is not set
#
# Intel Speed Select Technology interface support
#
CONFIG_INTEL_SPEED_SELECT_INTERFACE=m
CONFIG_PMC_ATOM=y CONFIG_PMC_ATOM=y
# CONFIG_CHROME_PLATFORMS is not set # CONFIG_CHROME_PLATFORMS is not set
# CONFIG_MELLANOX_PLATFORM is not set # CONFIG_MELLANOX_PLATFORM is not set
...@@ -3269,13 +3325,17 @@ CONFIG_ARM_GIC_MAX_NR=1 ...@@ -3269,13 +3325,17 @@ CONFIG_ARM_GIC_MAX_NR=1
# CONFIG_BCM_KONA_USB2_PHY is not set # CONFIG_BCM_KONA_USB2_PHY is not set
# CONFIG_PHY_PXA_28NM_HSIC is not set # CONFIG_PHY_PXA_28NM_HSIC is not set
# CONFIG_PHY_PXA_28NM_USB2 is not set # CONFIG_PHY_PXA_28NM_USB2 is not set
# CONFIG_POWERCAP is not set CONFIG_POWERCAP=y
CONFIG_INTEL_RAPL_CORE=m
CONFIG_INTEL_RAPL=m
# CONFIG_IDLE_INJECT is not set
# CONFIG_MCB is not set # CONFIG_MCB is not set
# #
# Performance monitor support # Performance monitor support
# #
# CONFIG_RAS is not set CONFIG_RAS=y
CONFIG_RAS_CEC=y
# CONFIG_THUNDERBOLT is not set # CONFIG_THUNDERBOLT is not set
# #
...@@ -3284,7 +3344,7 @@ CONFIG_ARM_GIC_MAX_NR=1 ...@@ -3284,7 +3344,7 @@ CONFIG_ARM_GIC_MAX_NR=1
# CONFIG_ANDROID is not set # CONFIG_ANDROID is not set
CONFIG_LIBNVDIMM=y CONFIG_LIBNVDIMM=y
CONFIG_BLK_DEV_PMEM=y CONFIG_BLK_DEV_PMEM=y
CONFIG_ND_BLK=y CONFIG_ND_BLK=m
CONFIG_ND_CLAIM=y CONFIG_ND_CLAIM=y
CONFIG_ND_BTT=y CONFIG_ND_BTT=y
CONFIG_BTT=y CONFIG_BTT=y
...@@ -3294,8 +3354,9 @@ CONFIG_NVDIMM_DAX=y ...@@ -3294,8 +3354,9 @@ CONFIG_NVDIMM_DAX=y
CONFIG_DAX_DRIVER=y CONFIG_DAX_DRIVER=y
CONFIG_DAX=y CONFIG_DAX=y
CONFIG_DEV_DAX=y CONFIG_DEV_DAX=y
CONFIG_DEV_DAX_PMEM=m CONFIG_DEV_DAX_PMEM=y
# CONFIG_NVMEM is not set CONFIG_DEV_DAX_KMEM=y
CONFIG_NVMEM=y
# #
# HW tracing support # HW tracing support
...@@ -3896,6 +3957,7 @@ CONFIG_XZ_DEC_BCJ=y ...@@ -3896,6 +3957,7 @@ CONFIG_XZ_DEC_BCJ=y
# CONFIG_XZ_DEC_TEST is not set # CONFIG_XZ_DEC_TEST is not set
CONFIG_DECOMPRESS_GZIP=y CONFIG_DECOMPRESS_GZIP=y
CONFIG_DECOMPRESS_XZ=y CONFIG_DECOMPRESS_XZ=y
CONFIG_GENERIC_ALLOCATOR=y
CONFIG_TEXTSEARCH=y CONFIG_TEXTSEARCH=y
CONFIG_TEXTSEARCH_KMP=m CONFIG_TEXTSEARCH_KMP=m
CONFIG_TEXTSEARCH_BM=m CONFIG_TEXTSEARCH_BM=m
...@@ -3944,6 +4006,7 @@ CONFIG_SG_POOL=y ...@@ -3944,6 +4006,7 @@ CONFIG_SG_POOL=y
CONFIG_ARCH_HAS_SG_CHAIN=y CONFIG_ARCH_HAS_SG_CHAIN=y
CONFIG_ARCH_HAS_PMEM_API=y CONFIG_ARCH_HAS_PMEM_API=y
CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
CONFIG_ARCH_HAS_UACCESS_MCSAFE=y
CONFIG_STACKDEPOT=y CONFIG_STACKDEPOT=y
CONFIG_SBITMAP=y CONFIG_SBITMAP=y
# CONFIG_STRING_SELFTEST is not set # CONFIG_STRING_SELFTEST is not set
...@@ -3979,7 +4042,7 @@ CONFIG_FRAME_WARN=1024 ...@@ -3979,7 +4042,7 @@ CONFIG_FRAME_WARN=1024
CONFIG_DEBUG_FS=y CONFIG_DEBUG_FS=y
# CONFIG_HEADERS_CHECK is not set # CONFIG_HEADERS_CHECK is not set
CONFIG_DEBUG_SECTION_MISMATCH=y CONFIG_DEBUG_SECTION_MISMATCH=y
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set CONFIG_SECTION_MISMATCH_WARN_ONLY=y
CONFIG_STACK_VALIDATION=y CONFIG_STACK_VALIDATION=y
# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册