| From 5a09905f34d68e75c275401bdeb4c91484ba07b9 Mon Sep 17 00:00:00 2001 |
| From: Geert Uytterhoeven <geert+renesas@glider.be> |
| Date: Wed, 6 Jun 2018 11:25:16 +0200 |
| Subject: [PATCH 1347/1795] ARM: Always build secure_cntvoff.S on ARM V7 to fix |
| shmobile !SMP build |
| |
| If CONFIG_SMP=n, building a kernel for R-Car Gen2 fails with: |
| |
| arch/arm/mach-shmobile/setup-rcar-gen2.o: In function `rcar_gen2_timer_init': |
| setup-rcar-gen2.c:(.init.text+0x30): undefined reference to `secure_cntvoff_init' |
| |
| Indeed, on R-Car Gen2 SoCs, secure_cntvoff_init() is not only needed for |
| secondary CPUs, but also for the boot CPU. This is most visible on SoCs |
| with Cortex A7 cores (e.g. R-Car E2, cfr. commit 9ce3fa6816c2fb59 ("ARM: |
| shmobile: rcar-gen2: Add CA7 arch_timer initialization for r8a7794")), |
| but Cortex A15 is affected, too. |
| |
| Fix this by always providing secure_cntvoff_init() when building for ARM |
| V7. |
| |
| Reported-by: Arnd Bergmann <arnd@arndb.de> |
| Fixes: 7c607944bc657616 ("ARM: smp: Add initialization of CNTVOFF") |
| Fixes: cad160ed0a94927e ("ARM: shmobile: Convert file to use cntvoff") |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| Reviewed-by: Maxime Ripard <maxime.ripard@bootlin.com> |
| Reviewed-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Olof Johansson <olof@lixom.net> |
| (cherry picked from commit 0fff9001840c314fa4473dee256976b1e4535e73) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| --- |
| arch/arm/common/Makefile | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/arch/arm/common/Makefile b/arch/arm/common/Makefile |
| index 1e9f7af8f70f..3157be413297 100644 |
| --- a/arch/arm/common/Makefile |
| +++ b/arch/arm/common/Makefile |
| @@ -10,7 +10,7 @@ obj-$(CONFIG_DMABOUNCE) += dmabounce.o |
| obj-$(CONFIG_SHARP_LOCOMO) += locomo.o |
| obj-$(CONFIG_SHARP_PARAM) += sharpsl_param.o |
| obj-$(CONFIG_SHARP_SCOOP) += scoop.o |
| -obj-$(CONFIG_SMP) += secure_cntvoff.o |
| +obj-$(CONFIG_CPU_V7) += secure_cntvoff.o |
| obj-$(CONFIG_PCI_HOST_ITE8152) += it8152.o |
| obj-$(CONFIG_MCPM) += mcpm_head.o mcpm_entry.o mcpm_platsmp.o vlock.o |
| CFLAGS_REMOVE_mcpm_entry.o = -pg |
| -- |
| 2.19.0 |
| |
