From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:52755) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rlo7K-00063W-Fz for qemu-devel@nongnu.org; Fri, 13 Jan 2012 15:52:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rlo7J-0005TE-8t for qemu-devel@nongnu.org; Fri, 13 Jan 2012 15:52:54 -0500 Received: from mnementh.archaic.org.uk ([81.2.115.146]:37067) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rlo7I-0005Sq-V1 for qemu-devel@nongnu.org; Fri, 13 Jan 2012 15:52:53 -0500 From: Peter Maydell Date: Fri, 13 Jan 2012 20:52:46 +0000 Message-Id: <1326487969-12462-10-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1326487969-12462-1-git-send-email-peter.maydell@linaro.org> References: <1326487969-12462-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH 09/12] Add dummy implementation of generic timer cp15 registers List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: android-virt@lists.cs.columbia.edu, patches@linaro.org Add a dummy implementation of the cp15 registers for the generic timer (found in the Cortex-A15), just sufficient for Linux to decide that it can't use it. This requires at least CNTP_CTL and CNTFRQ to be implemented as RAZ/WI; we RAZ/WI all of c14. Signed-off-by: Peter Maydell --- target-arm/cpu.h | 1 + target-arm/helper.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/target-arm/cpu.h b/target-arm/cpu.h index 26b4981..d5403ea 100644 --- a/target-arm/cpu.h +++ b/target-arm/cpu.h @@ -381,6 +381,7 @@ enum arm_features { ARM_FEATURE_VAPA, /* cp15 VA to PA lookups */ ARM_FEATURE_ARM_DIV, /* divide supported in ARM encoding */ ARM_FEATURE_VFP4, /* VFPv4 (implies that NEON is v2) */ + ARM_FEATURE_GENERICTIMER, }; static inline int arm_feature(CPUARMState *env, int feature) diff --git a/target-arm/helper.c b/target-arm/helper.c index fa42c64..de4a50f 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -1757,7 +1757,11 @@ void HELPER(set_cp15)(CPUState *env, uint32_t insn, uint32_t val) goto bad_reg; } break; - case 14: /* Reserved. */ + case 14: /* Generic timer */ + if (arm_feature(env, ARM_FEATURE_GENERICTIMER)) { + /* Dummy implementation: RAZ/WI for all */ + break; + } goto bad_reg; case 15: /* Implementation specific. */ if (arm_feature(env, ARM_FEATURE_XSCALE)) { @@ -2123,7 +2127,11 @@ uint32_t HELPER(get_cp15)(CPUState *env, uint32_t insn) default: goto bad_reg; } - case 14: /* Reserved. */ + case 14: /* Generic timer */ + if (arm_feature(env, ARM_FEATURE_GENERICTIMER)) { + /* Dummy implementation: RAZ/WI for all */ + return 0; + } goto bad_reg; case 15: /* Implementation specific. */ if (arm_feature(env, ARM_FEATURE_XSCALE)) { -- 1.7.1