Skip to content

Commit

Permalink
arm64: Use arch_timer_get_rate when trapping CNTFRQ_EL0
Browse files Browse the repository at this point in the history
In an ideal world, CNTFRQ_EL0 always contains the timer frequency
for the kernel to use. Sadly, we get quite a few broken systems
where the firmware authors cannot be bothered to program that
register on all CPUs, and rely on DT to provide that frequency.

So when trapping CNTFRQ_EL0, make sure to return the actual rate
(as known by the kernel), and not CNTFRQ_EL0.

Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
  • Loading branch information
Marc Zyngier authored and wildea01 committed Aug 1, 2017
1 parent 16f73eb commit c6f97ad
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/arm64/kernel/traps.c
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,7 @@ static void cntfrq_read_handler(unsigned int esr, struct pt_regs *regs)
{
int rt = (esr & ESR_ELx_SYS64_ISS_RT_MASK) >> ESR_ELx_SYS64_ISS_RT_SHIFT;

pt_regs_write_reg(regs, rt, read_sysreg(cntfrq_el0));
pt_regs_write_reg(regs, rt, arch_timer_get_rate());
regs->pc += 4;
}

Expand Down

0 comments on commit c6f97ad

Please sign in to comment.