ARM: rcar-gen2: Do not setup timer in non-secure mode
PATCH 1/1 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.
--- arch/arm/mach-shmobile/setup-rcar-gen2.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
arch/arm/mach-shmobile/setup-rcar-gen2.c +13 -5
@@ -78,12 +78,20 @@ void __init rcar_gen2_timer_init(void)/* Remap "armgcnt address map" space */ base =ioremap (0xe6080000 ,PAGE_SIZE ); -/* Update registers with correct frequency */ -iowrite32 (freq, base +CNTFID0 ); - asmvolatile ("mcr p15, 0, %0, c14, c0, 0" : :"r" (freq)); +/* 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 +* started 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 ); + asmvolatile ("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 ); + } -/* make sure arch timer is started by setting bit 0 of CNTCR */ -iowrite32 (1 , base +CNTCR );iounmap (base);#endif /* CONFIG_ARM_ARCH_TIMER */
Signature · 1 line
1.8.5.1
PATCH 1/1 ARM: rcar-gen2: Do not setup timer in non-secure mode
Hello.
Quoted 16 lines · Ben Dooks
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 Ben Dooks <[email protected]>Reviewed-by Ian Molton <[email protected]>--- arch/arm/mach-shmobile/setup-rcar-gen2.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)arch/arm/mach-shmobile/setup-rcar-gen2.c +0
-0
arch/arm/mach-shmobile/setup-rcar-gen2.c void __init rcar_gen2_timer_init(void) · line 84
Quoted 10 lines
arch/arm/mach-shmobile/setup-rcar-gen2.c +4
-3@@ -78,12 +78,20 @@ void __init rcar_gen2_timer_init(void)/* Remap "armgcnt address map" space */ base =ioremap (0xe6080000 ,PAGE_SIZE ); -/* Update registers with correct frequency */ -iowrite32 (freq, base +CNTFID0 ); - asmvolatile ("mcr p15, 0, %0, c14, c0, 0" : :"r" (freq)); +/* 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 +* started the kernel in non-secure mode. */
The preferred style of the multi-line comments is this:
/*
* bla
* bla
*/
WBR, Sergei
PATCH 1/1 ARM: rcar-gen2: Do not setup timer in non-secure mode
Quoted 13 lines · Sergei Shtylyov
Hello.
Quoted 7 lines · Ben Dooks
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 Ben Dooks <[email protected]>Reviewed-by Ian Molton <[email protected]>
Quoted 5 lines
* bla
* bla
*/WBR, Sergei
Thanks, fixed.
Signature · 2 lines
Ben Dooks http://www.codethink.co.uk/ Senior Engineer Codethink - Providing Genius
PATCH 1/1 ARM: rcar-gen2: Do not setup timer in non-secure mode
In reply to Ben DooksQuoted 7 lines · Ben Dooks
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 Ben Dooks <[email protected]>Reviewed-by Ian Molton <[email protected]>
Magnus, could you please review this?
Quoted 43 lines
--- arch/arm/mach-shmobile/setup-rcar-gen2.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)arch/arm/mach-shmobile/setup-rcar-gen2.c +13
-5@@ -78,12 +78,20 @@ void __init rcar_gen2_timer_init(void)/* Remap "armgcnt address map" space */ base =ioremap (0xe6080000 ,PAGE_SIZE ); -/* Update registers with correct frequency */ -iowrite32 (freq, base +CNTFID0 ); - asmvolatile ("mcr p15, 0, %0, c14, c0, 0" : :"r" (freq)); +/* 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 +* started 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 ); + asmvolatile ("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 ); + } -/* make sure arch timer is started by setting bit 0 of CNTCR */ -iowrite32 (1 , base +CNTCR );iounmap (base);#endif /* CONFIG_ARM_ARCH_TIMER */ Signature · 7 lines
1.8.5.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel at lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel