On Wed, Aug 21, 2019 at 02:46:01PM +0200, Geert Uytterhoeven wrote: > ARM Erratum 754322 affects Cortex-A9 revisions r2p* and r3p*. > > Enable support code to mitigate the erratum when compiling a kernel for > any of the affected Renesas SoCs: > - RZ/A1: r3p0, > - R-Mobile A1: r2p4, > - R-Car M1A: r2p2-00rel0, > - R-Car H1: r3p0, > - SH-Mobile AG5: r2p2, > and drop the corresponding config symbol from shmobile_defconfig. > > EMMA Mobile EV2 (r1p3) and RZ/A2 (r4p1) are not affected. Reviewed-by: Simon Horman <horms+renesas@xxxxxxxxxxxx> > > Signed-off-by: Geert Uytterhoeven <geert+renesas@xxxxxxxxx> > --- > Looks like my R-Mobile A1 is actually r2p3, and the R-Car M1A in Magnus' > farm is r2p4? > > arch/arm/configs/shmobile_defconfig | 1 - > drivers/soc/renesas/Kconfig | 5 +++++ > 2 files changed, 5 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig > index c6c70355141c38fa..123821e63873dafa 100644 > --- a/arch/arm/configs/shmobile_defconfig > +++ b/arch/arm/configs/shmobile_defconfig > @@ -9,7 +9,6 @@ CONFIG_PERF_EVENTS=y > CONFIG_SLAB=y > CONFIG_ARCH_RENESAS=y > CONFIG_PL310_ERRATA_588369=y > -CONFIG_ARM_ERRATA_754322=y > CONFIG_SMP=y > CONFIG_SCHED_MC=y > CONFIG_NR_CPUS=8 > diff --git a/drivers/soc/renesas/Kconfig b/drivers/soc/renesas/Kconfig > index a72d014ea37cc788..3c5e017bacbaca11 100644 > --- a/drivers/soc/renesas/Kconfig > +++ b/drivers/soc/renesas/Kconfig > @@ -55,6 +55,7 @@ config ARCH_EMEV2 > > config ARCH_R7S72100 > bool "RZ/A1H (R7S72100)" > + select ARM_ERRATA_754322 > select PM > select PM_GENERIC_DOMAINS > select RENESAS_OSTM > @@ -79,6 +80,7 @@ config ARCH_R8A73A4 > config ARCH_R8A7740 > bool "R-Mobile A1 (R8A77400)" > select ARCH_RMOBILE > + select ARM_ERRATA_754322 > select RENESAS_INTC_IRQPIN > > config ARCH_R8A7743 > @@ -108,10 +110,12 @@ config ARCH_R8A77470 > config ARCH_R8A7778 > bool "R-Car M1A (R8A77781)" > select ARCH_RCAR_GEN1 > + select ARM_ERRATA_754322 > > config ARCH_R8A7779 > bool "R-Car H1 (R8A77790)" > select ARCH_RCAR_GEN1 > + select ARM_ERRATA_754322 > select HAVE_ARM_SCU if SMP > select HAVE_ARM_TWD if SMP > select SYSC_R8A7779 > @@ -158,6 +162,7 @@ config ARCH_R9A06G032 > config ARCH_SH73A0 > bool "SH-Mobile AG5 (R8A73A00)" > select ARCH_RMOBILE > + select ARM_ERRATA_754322 > select HAVE_ARM_SCU if SMP > select HAVE_ARM_TWD if SMP > select RENESAS_INTC_IRQPIN > -- > 2.17.1 >
