ARM: rmobile: gen2: Enable ACTLR[0] (Enable invalidates of BTB) to facilitate CVE_201...

Enable CVE_2017_5715 mitigation on CPU0 on R-Car H2, M2W, M2N, V2H,
which all contain Cortex-A15 cores. R-Car E2 contains only Cortex-A7
cores and is not affected. Without this enabled, Linux kernel reports:

  CPU0: Spectre v2: firmware did not set auxiliary control register IBE bit, system vulnerable

With this enabled, Linux kernel reports:

  CPU0: Spectre v2: using ICIALLU workaround

NOTE: This by itself does not enable the workaround for other CPUs
      than CPU0 and may require additional kernel patches for the
      other CPUs in SMP configurations.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nishanth Menon <nm@ti.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>

diff --git a/arch/arm/mach-rmobile/Kconfig.32 b/arch/arm/mach-rmobile/Kconfig.32
index c0b5b2457cb1c61052550f48f3bd2ac04153932d..6c492ff40933a8a2fbc8f179eb3db98d5560104f 100644 (file)
--- a/arch/arm/mach-rmobile/Kconfig.32
+++ b/arch/arm/mach-rmobile/Kconfig.32
@@ -13,18 +13,22 @@ config R8A7740
 config R8A7790
        bool "Renesas SoC R8A7790"
        select RCAR_GEN2
+       select ARM_CORTEX_A15_CVE_2017_5715
 
 config R8A7791
        bool "Renesas SoC R8A7791"
        select RCAR_GEN2
+       select ARM_CORTEX_A15_CVE_2017_5715
 
 config R8A7792
        bool "Renesas SoC R8A7792"
        select RCAR_GEN2
+       select ARM_CORTEX_A15_CVE_2017_5715
 
 config R8A7793
        bool "Renesas SoC R8A7793"
        select RCAR_GEN2
+       select ARM_CORTEX_A15_CVE_2017_5715
 
 config R8A7794
        bool "Renesas SoC R8A7794"