3fd45a136f
On Cortex-A7, the arch timer CNTVOFF register is uninitialized.
Ideally it should be initialized by the boot loader, but it isn't.
For the boot CPU, CNTVOFF is initialized by Linux since commit
9ce3fa6816c2fb59 ("ARM: shmobile: rcar-gen2: Add CA7 arch_timer
initialization for r8a7794").
For secondary CPU cores, no such initialization is done.
Hence when enabling SMP on r8a7794, the kernel log is spammed with:
WARNING: Underflow in clocksource 'arch_sys_counter' observed, time update ignored.
Please report this, consider using a different clocksource, if possible.
Your kernel is probably still fine.
As Marc Zyngier pointed out that Cortex-A15 and Cortex-A7 are similar with
respect to CNTVOFF, we have been very lucky this just worked on R-Car
Gen2 SoCs with Cortex-A15 cores.
To fix this:
- Move the existing inline asm code to initialize CNTVOFF to an
assembler source file (adding comments and replacing hardcoded
constants by definitions in the process), so it can be reused,
- Perform the initialization of CNTVOFF on the boot CPU (Cortex-A15 or
Cortex-A7) on all R-Car Gen2 and RZ/G1 parts,
- Wrap the standard secondary_startup() routine inside a routine which
initializes CNTVOFF.
Based on patches by Hisashi Nakamura in the BSP.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Tested-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
37 lines
1.2 KiB
C
37 lines
1.2 KiB
C
#ifndef __ARCH_MACH_COMMON_H
|
|
#define __ARCH_MACH_COMMON_H
|
|
|
|
extern void shmobile_init_cntvoff(void);
|
|
extern void shmobile_init_delay(void);
|
|
extern void shmobile_boot_vector(void);
|
|
extern unsigned long shmobile_boot_fn;
|
|
extern unsigned long shmobile_boot_size;
|
|
extern void shmobile_smp_boot(void);
|
|
extern void shmobile_smp_sleep(void);
|
|
extern void shmobile_smp_hook(unsigned int cpu, unsigned long fn,
|
|
unsigned long arg);
|
|
extern bool shmobile_smp_cpu_can_disable(unsigned int cpu);
|
|
extern bool shmobile_smp_init_fallback_ops(void);
|
|
extern void shmobile_boot_apmu(void);
|
|
extern void shmobile_boot_scu(void);
|
|
extern void shmobile_smp_scu_prepare_cpus(phys_addr_t scu_base_phys,
|
|
unsigned int max_cpus);
|
|
extern void shmobile_smp_scu_cpu_die(unsigned int cpu);
|
|
extern int shmobile_smp_scu_cpu_kill(unsigned int cpu);
|
|
extern struct platform_suspend_ops shmobile_suspend_ops;
|
|
|
|
#ifdef CONFIG_SUSPEND
|
|
int shmobile_suspend_init(void);
|
|
void shmobile_smp_apmu_suspend_init(void);
|
|
#else
|
|
static inline int shmobile_suspend_init(void) { return 0; }
|
|
static inline void shmobile_smp_apmu_suspend_init(void) { }
|
|
#endif
|
|
|
|
static inline void __init shmobile_init_late(void)
|
|
{
|
|
shmobile_suspend_init();
|
|
}
|
|
|
|
#endif /* __ARCH_MACH_COMMON_H */
|