correct patch for renesas arm timer
PATCH v2 1/1 correct patch for renesas arm timer
Sorry, previous one had not had the review comments fixed. This one has.
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 | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-)
arch/arm/mach-shmobile/setup-rcar-gen2.c +16 -5
@@ -78,12 +78,23 @@ 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 +* 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 ); + 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
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]>
Thanks, I will queue this up.
Quoted 45 lines
--- arch/arm/mach-shmobile/setup-rcar-gen2.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-)arch/arm/mach-shmobile/setup-rcar-gen2.c +16
-5@@ -78,12 +78,23 @@ 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 +* 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 ); + 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 · 6 lines
1.8.5.1 -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo at vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html