Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0fe35077 authored by Ben Dooks's avatar Ben Dooks Committed by Simon Horman
Browse files

ARM: rcar-gen2: Do not setup timer in non-secure mode 



If the system has been started in non-secure mode, then the ARM generic
timer is not configurable during the kernel initialisation. Currently
the only thing we can check for is if the timer has been correctly
configured during the boot process.

Signed-off-by: default avatarBen Dooks <ben.dooks@codethink.co.uk>
Reviewed-by: default avatarIan Molton <ian.molton@codethink.co.uk>
Acked-by: default avatarMagnus Damm <damm@opensource.se>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 893c3f0b

arch/arm/mach-shmobile/setup-rcar-gen2.c

+16 −5
Original line number Diff line number Diff line
@@ -78,12 +78,23 @@ void __init rcar_gen2_timer_init(void) 
	/* Remap "armgcnt address map" space */

	base = ioremap(0xe6080000, PAGE_SIZE);



	/*

	 * Update the timer if it is either not running, or is not at the

	 * right frequency. The timer is only configurable in secure mode

	 * so this avoids an abort if the loader started the timer and

	 * entered the kernel in non-secure mode.

	 */



	if ((ioread32(base + CNTCR) & 1) == 0 ||

	    ioread32(base + CNTFID0) != freq) {

		/* Update registers with correct frequency */

		iowrite32(freq, base + CNTFID0);

		asm volatile("mcr p15, 0, %0, c14, c0, 0" : : "r" (freq));



		/* make sure arch timer is started by setting bit 0 of CNTCR */

		iowrite32(1, base + CNTCR);

	}



	iounmap(base);

#endif /* CONFIG_ARM_ARCH_TIMER */