diff options
author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2019-07-08 09:56:00 +0300 |
---|---|---|
committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2019-07-09 12:48:46 +0000 |
commit | 8abf66e4e06412db08918dcde31f2d515040a409 (patch) | |
tree | 42f13869f4a0da507452ea66f1bca9dad89f05cc /src/cpu | |
parent | 4d372c7353727e9ffce9ec4e6b2de3cd6ab8e320 (diff) | |
download | coreboot-8abf66e4e06412db08918dcde31f2d515040a409.tar.gz coreboot-8abf66e4e06412db08918dcde31f2d515040a409.tar.bz2 coreboot-8abf66e4e06412db08918dcde31f2d515040a409.zip |
cpu/x86: Flip SMM_TSEG default
This is only a qualifier between TSEG and ASEG.
Change-Id: I8051df92d9014e3574f6e7d5b6f1d6677fe77c82
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34135
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Diffstat (limited to 'src/cpu')
-rw-r--r-- | src/cpu/intel/fsp_model_406dx/Kconfig | 1 | ||||
-rw-r--r-- | src/cpu/intel/haswell/Kconfig | 1 | ||||
-rw-r--r-- | src/cpu/intel/model_2065x/Kconfig | 1 | ||||
-rw-r--r-- | src/cpu/intel/model_206ax/Kconfig | 1 | ||||
-rw-r--r-- | src/cpu/intel/slot_1/Kconfig | 1 | ||||
-rw-r--r-- | src/cpu/x86/Kconfig | 15 |
6 files changed, 13 insertions, 7 deletions
diff --git a/src/cpu/intel/fsp_model_406dx/Kconfig b/src/cpu/intel/fsp_model_406dx/Kconfig index f40842fce846..6bf8dc7eecdd 100644 --- a/src/cpu/intel/fsp_model_406dx/Kconfig +++ b/src/cpu/intel/fsp_model_406dx/Kconfig @@ -35,6 +35,7 @@ config CPU_SPECIFIC_OPTIONS select TSC_SYNC_MFENCE select LAPIC_MONOTONIC_TIMER select CPU_INTEL_COMMON + select NO_SMM # Microcode header files are delivered in FSP package select USES_MICROCODE_HEADER_FILES if HAVE_FSP_BIN diff --git a/src/cpu/intel/haswell/Kconfig b/src/cpu/intel/haswell/Kconfig index 5936953b5262..9cc040ec6219 100644 --- a/src/cpu/intel/haswell/Kconfig +++ b/src/cpu/intel/haswell/Kconfig @@ -16,7 +16,6 @@ config CPU_SPECIFIC_OPTIONS select SSE2 select UDELAY_TSC select TSC_CONSTANT_RATE - select SMM_TSEG select SUPPORT_CPU_UCODE_IN_CBFS #select AP_IN_SIPI_WAIT select TSC_SYNC_MFENCE diff --git a/src/cpu/intel/model_2065x/Kconfig b/src/cpu/intel/model_2065x/Kconfig index 0af0d35dda82..089b3fead029 100644 --- a/src/cpu/intel/model_2065x/Kconfig +++ b/src/cpu/intel/model_2065x/Kconfig @@ -14,7 +14,6 @@ config CPU_SPECIFIC_OPTIONS select UDELAY_TSC select TSC_CONSTANT_RATE select TSC_MONOTONIC_TIMER - select SMM_TSEG select SUPPORT_CPU_UCODE_IN_CBFS select PARALLEL_CPU_INIT #select AP_IN_SIPI_WAIT diff --git a/src/cpu/intel/model_206ax/Kconfig b/src/cpu/intel/model_206ax/Kconfig index dbb898212152..2af63d60790b 100644 --- a/src/cpu/intel/model_206ax/Kconfig +++ b/src/cpu/intel/model_206ax/Kconfig @@ -15,7 +15,6 @@ config CPU_SPECIFIC_OPTIONS select UDELAY_TSC select TSC_CONSTANT_RATE select TSC_MONOTONIC_TIMER - select SMM_TSEG select SUPPORT_CPU_UCODE_IN_CBFS #select AP_IN_SIPI_WAIT select TSC_SYNC_MFENCE diff --git a/src/cpu/intel/slot_1/Kconfig b/src/cpu/intel/slot_1/Kconfig index ab6663258fbb..890e33bbf818 100644 --- a/src/cpu/intel/slot_1/Kconfig +++ b/src/cpu/intel/slot_1/Kconfig @@ -25,6 +25,7 @@ config SLOT_SPECIFIC_OPTIONS # dummy select CPU_INTEL_MODEL_68X select CPU_INTEL_MODEL_6BX select CPU_INTEL_MODEL_6XX + select NO_SMM config DCACHE_RAM_BASE hex diff --git a/src/cpu/x86/Kconfig b/src/cpu/x86/Kconfig index d230a57e3f14..8cc493ed55d8 100644 --- a/src/cpu/x86/Kconfig +++ b/src/cpu/x86/Kconfig @@ -93,18 +93,25 @@ config HAVE_SMI_HANDLER default n depends on (SMM_ASEG || SMM_TSEG) +config NO_SMM + bool + default n + config SMM_ASEG bool default n + depends on !NO_SMM config SMM_TSEG bool - default n + default y + depends on !(NO_SMM || SMM_ASEG) + +if SMM_TSEG config SMM_MODULE_HEAP_SIZE hex default 0x4000 - depends on SMM_TSEG help This option determines the size of the heap within the SMM handler modules. @@ -112,7 +119,6 @@ config SMM_MODULE_HEAP_SIZE config SMM_MODULE_STACK_SIZE hex default 0x400 - depends on SMM_TSEG help This option determines the size of the stack within the SMM handler modules. @@ -120,11 +126,12 @@ config SMM_MODULE_STACK_SIZE config SMM_STUB_STACK_SIZE hex default 0x400 - depends on SMM_TSEG help This option determines the size of the stack within the SMM handler modules. +endif + config SMM_LAPIC_REMAP_MITIGATION bool default y if NORTHBRIDGE_INTEL_I945 |