From 9a1907cc463f6834e2e4ea1c70c091816fd11214 Mon Sep 17 00:00:00 2001
From: Marc Zyngier <marc.zyngier@arm.com>
Date: Wed, 1 Aug 2012 14:46:41 +0100
Subject: [PATCH] --- yaml --- r: 333736 b: refs/heads/master c:
 8ec58be9f3ff2ad4a4d7bde8f48b4a4c406768e7 h: refs/heads/master v: v3

---
 [refs]                           |  2 +-
 trunk/arch/arm/kernel/hyp-stub.S | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 875a31db286b..7aa4b2d0d3ab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b6728d4189d14c19f384d5ec6087276e7c196d8
+refs/heads/master: 8ec58be9f3ff2ad4a4d7bde8f48b4a4c406768e7
diff --git a/trunk/arch/arm/kernel/hyp-stub.S b/trunk/arch/arm/kernel/hyp-stub.S
index 70609417deaf..65b2417aebce 100644
--- a/trunk/arch/arm/kernel/hyp-stub.S
+++ b/trunk/arch/arm/kernel/hyp-stub.S
@@ -142,6 +142,19 @@ THUMB(	orr	r7, #(1 << 30)	)	@ HSCTLR.TE
 	and	r7, #0x1f		@ Preserve HPMN
 	mcr	p15, 4, r7, c1, c1, 1	@ HDCR
 
+#if !defined(ZIMAGE) && defined(CONFIG_ARM_ARCH_TIMER)
+	@ make CNTP_* and CNTPCT accessible from PL1
+	mrc	p15, 0, r7, c0, c1, 1	@ ID_PFR1
+	lsr	r7, #16
+	and	r7, #0xf
+	cmp	r7, #1
+	bne	1f
+	mrc	p15, 4, r7, c14, c1, 0	@ CNTHCTL
+	orr	r7, r7, #3		@ PL1PCEN | PL1PCTEN
+	mcr	p15, 4, r7, c14, c1, 0	@ CNTHCTL
+1:
+#endif
+
 	bic	r7, r4, #MODE_MASK
 	orr	r7, r7, #SVC_MODE
 THUMB(	orr	r7, r7, #PSR_T_BIT	)