Skip to content

Commit f175f2f

Browse files
ShadowCursekalyazin
authored andcommitted
fix(aarch64): disable CONFIG_ARM64_ERRATUM_3194386 option
Disable CONFIG_ARM64_ERRATUM_3194386 option in the guest kernels for aarch64. It is enabled by default and makes `ssbs` feature to not be user space visible. This breaks out integration tests. This option is only indented for `Cortex-X4` and `Neoverse-V3` cpus which we are not using, so disabling it is safe. Signed-off-by: Egor Lazarchuk <yegorlz@amazon.co.uk>
1 parent 71e478d commit f175f2f

File tree

1 file changed

+24
-0
lines changed

1 file changed

+24
-0
lines changed
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
diff --git a/resources/guest_configs/microvm-kernel-ci-aarch64-5.10.config b/resources/guest_configs/microvm-kernel-ci-aarch64-5.10.config
2+
index ac44904c1..9f912a70b 100644
3+
--- a/resources/guest_configs/microvm-kernel-ci-aarch64-5.10.config
4+
+++ b/resources/guest_configs/microvm-kernel-ci-aarch64-5.10.config
5+
@@ -341,6 +341,7 @@ CONFIG_ARM64_ERRATUM_1463225=y
6+
CONFIG_ARM64_ERRATUM_1542419=y
7+
CONFIG_ARM64_ERRATUM_1508412=y
8+
CONFIG_ARM64_ERRATUM_2457168=y
9+
+# CONFIG_ARM64_ERRATUM_3194386 is not set
10+
CONFIG_CAVIUM_ERRATUM_22375=y
11+
CONFIG_CAVIUM_ERRATUM_23144=y
12+
CONFIG_CAVIUM_ERRATUM_23154=y
13+
diff --git a/resources/guest_configs/microvm-kernel-ci-aarch64-6.1.config b/resources/guest_configs/microvm-kernel-ci-aarch64-6.1.config
14+
index 26b87a658..29fe130f2 100644
15+
--- a/resources/guest_configs/microvm-kernel-ci-aarch64-6.1.config
16+
+++ b/resources/guest_configs/microvm-kernel-ci-aarch64-6.1.config
17+
@@ -362,6 +362,7 @@ CONFIG_ARM64_ERRATUM_2441009=y
18+
CONFIG_ARM64_ERRATUM_2457168=y
19+
CONFIG_ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD=y
20+
CONFIG_ARM64_ERRATUM_2966298=y
21+
+# CONFIG_ARM64_ERRATUM_3194386 is not set
22+
CONFIG_CAVIUM_ERRATUM_22375=y
23+
CONFIG_CAVIUM_ERRATUM_23144=y
24+
CONFIG_CAVIUM_ERRATUM_23154=y

0 commit comments

Comments
 (0)