michaelh/zephyr
1
0
Fork 0
Code Releases Activity

x86: remove CONFIG_DISABLE_SSBD and CONFIG_ENABLE_EXTENDED_IBRS

Browse source 
These two kconfigs have been deprecated since v3.7. So remove
them now.

Signed-off-by: Daniel Leung <daniel.leung@intel.com>
This commit is contained in:
Daniel Leung 2024-11-18 11:25:32 -08:00 • committed by Benjamin Cabé
commit af02730a29
2 changed files with 6 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

18
arch/x86/Kconfig
View file

@ -417,15 +417,6 @@ config X86_DISABLE_SSBD
Even if enabled, will have no effect on CPUs that do not Even if enabled, will have no effect on CPUs that do not
require this feature. require this feature.
config DISABLE_SSBD
bool "Disable Speculative Store Bypass [DEPRECATED]"
depends on USERSPACE
default y if !X86_NO_SPECTRE_V4
select X86_DISABLE_SSBD
select DEPRECATED
help
Deprecated. Use CONFIG_X86_DISABLE_SSBD instead.
config X86_ENABLE_EXTENDED_IBRS config X86_ENABLE_EXTENDED_IBRS
bool "Extended IBRS" bool "Extended IBRS"
depends on USERSPACE depends on USERSPACE
@ -435,15 +426,6 @@ config X86_ENABLE_EXTENDED_IBRS
Speculation 'always on' feature. This mitigates Indirect Branch Speculation 'always on' feature. This mitigates Indirect Branch
Control vulnerabilities (aka Spectre V2). Control vulnerabilities (aka Spectre V2).
config ENABLE_EXTENDED_IBRS
bool "Extended IBRS [DEPRECATED]"
depends on USERSPACE
default y if !X86_NO_SPECTRE_V2
select X86_ENABLE_EXTENDED_IBRS
select DEPRECATED
help
Deprecated. Use CONFIG_X86_ENABLE_EXTENDED_IBRS instead.
config X86_BOUNDS_CHECK_BYPASS_MITIGATION config X86_BOUNDS_CHECK_BYPASS_MITIGATION
bool bool
depends on USERSPACE depends on USERSPACE

6
doc/releases/migration-guide-4.1.rst
View file

@ -278,3 +278,9 @@ Architectures
* For the native_sim target :kconfig:option:`CONFIG_NATIVE_SIM_NATIVE_POSIX_COMPAT` has been * For the native_sim target :kconfig:option:`CONFIG_NATIVE_SIM_NATIVE_POSIX_COMPAT` has been
switched to ``n`` by default, and this option has been deprecated. Ensure your code does not switched to ``n`` by default, and this option has been deprecated. Ensure your code does not
use the :kconfig:option:`CONFIG_BOARD_NATIVE_POSIX` option anymore (:github:`81232`). use the :kconfig:option:`CONFIG_BOARD_NATIVE_POSIX` option anymore (:github:`81232`).
* x86
* Kconfigs ``CONFIG_DISABLE_SSBD`` and ``CONFIG_ENABLE_EXTENDED_IBRS`` have been deprecated
since v3.7. These were removed. Use :kconfig:option:`CONFIG_X86_DISABLE_SSBD` and
:kconfig:option:`CONFIG_X86_ENABLE_EXTENDED_IBRS` instead.