Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-15 08:31:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

ARM: arch_timers: switch to physical timers if HYP mode is available

Browse Source 
If we're booted in HYP mode, it is possible that we'll run some
kind of virtualized environment. In this case, it is a better to
switch to the physical timers, and leave the virtual timers to
guests.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
This commit is contained in:
Marc Zyngier 2013-01-10 11:13:07 +00:00 committed by Mark Rutland
parent c2b01e06a9
commit 8266891e25
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/clocksource/arm_arch_timer.c
View File

@ -19,6 +19,7 @@
#include <linux/io.h> #include <linux/io.h>
#include <asm/arch_timer.h> #include <asm/arch_timer.h>
#include <asm/virt.h>
#include <clocksource/arm_arch_timer.h> #include <clocksource/arm_arch_timer.h>
@ -364,10 +365,14 @@ int __init arch_timer_init(void)
of_node_put(np); of_node_put(np);
/* /*
* If HYP mode is available, we know that the physical timer
* has been configured to be accessible from PL1. Use it, so
* that a guest can use the virtual timer instead.
*
* If no interrupt provided for virtual timer, we'll have to * If no interrupt provided for virtual timer, we'll have to
* stick to the physical timer. It'd better be accessible... * stick to the physical timer. It'd better be accessible...
*/ */
if (!arch_timer_ppi[VIRT_PPI]) { if (is_hyp_mode_available() || !arch_timer_ppi[VIRT_PPI]) {
arch_timer_use_virtual = false; arch_timer_use_virtual = false;
if (!arch_timer_ppi[PHYS_SECURE_PPI] || if (!arch_timer_ppi[PHYS_SECURE_PPI] ||