]> git.baikalelectronics.ru Git - kernel.git/commit
ARM: 8955/1: virt: Relax arch timer version check during early boot
authorVladimir Murzin <vladimir.murzin@arm.com>
Mon, 20 Jan 2020 14:07:46 +0000 (15:07 +0100)
committerRussell King <rmk+kernel@armlinux.org.uk>
Wed, 22 Jan 2020 19:12:07 +0000 (19:12 +0000)
commitf4b83b270f7471967631a970ae05301e40c6d3f9
treea682a1f5a979d10821e298f7297bb8219ec447f8
parenta8b531ad82bdccd5cf43e343aeb1e6274fd15b62
ARM: 8955/1: virt: Relax arch timer version check during early boot

Updates to the Generic Timer architecture allow ID_PFR1.GenTimer to
have values other than 0 or 1 while still preserving backward
compatibility. At the moment, Linux is quite strict in the way it
handles this field at early boot and will not configure arch timer if
it doesn't find the value 1.

Since here use ubfx for arch timer version extraction (hyb-stub build
with -march=armv7-a, so it is safe)

To help backports (even though the code was correct at the time of writing)

Fixes: b9a08a3f8d72 ("ARM: virt: arch_timers: enable access to physical timers")
Acked-by: Marc Zyngier <maz@kernel.org>
Signed-off-by: Vladimir Murzin <vladimir.murzin@arm.com>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
arch/arm/kernel/hyp-stub.S