[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH qom-next v2 13/33] target-arm: Convert generic timer
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH qom-next v2 13/33] target-arm: Convert generic timer cp15 regs |
Date: |
Mon, 14 May 2012 20:03:12 +0100 |
Convert the (dummy) generic timer cp15 implementation.
Signed-off-by: Peter Maydell <address@hidden>
---
target-arm/helper.c | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/target-arm/helper.c b/target-arm/helper.c
index 88f7ca7..a92bbc7 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -322,6 +322,14 @@ static const ARMCPRegInfo v6k_cp_reginfo[] = {
REGINFO_SENTINEL
};
+static const ARMCPRegInfo generic_timer_cp_reginfo[] = {
+ /* Dummy implementation: RAZ/WI the whole crn=14 space */
+ { .name = "GENERIC_TIMER", .cp = 15, .crn = 14,
+ .crm = CP_ANY, .opc1 = CP_ANY, .opc2 = CP_ANY,
+ .access = PL1_RW, .type = ARM_CP_CONST, .resetvalue = 0 },
+ REGINFO_SENTINEL
+};
+
void register_cp_regs_for_features(ARMCPU *cpu)
{
/* Register all the coprocessor registers based on feature bits */
@@ -358,6 +366,9 @@ void register_cp_regs_for_features(ARMCPU *cpu)
if (arm_feature(env, ARM_FEATURE_THUMB2EE)) {
define_arm_cp_regs(cpu, t2ee_cp_reginfo);
}
+ if (arm_feature(env, ARM_FEATURE_GENERIC_TIMER)) {
+ define_arm_cp_regs(cpu, generic_timer_cp_reginfo);
+ }
}
ARMCPU *cpu_arm_init(const char *cpu_model)
@@ -1725,12 +1736,6 @@ void HELPER(set_cp15)(CPUARMState *env, uint32_t insn,
uint32_t val)
goto bad_reg;
}
break;
- case 14: /* Generic timer */
- if (arm_feature(env, ARM_FEATURE_GENERIC_TIMER)) {
- /* Dummy implementation: RAZ/WI for all */
- break;
- }
- goto bad_reg;
case 15: /* Implementation specific. */
if (arm_feature(env, ARM_FEATURE_XSCALE)) {
if (op2 == 0 && crm == 1) {
@@ -2070,12 +2075,6 @@ uint32_t HELPER(get_cp15)(CPUARMState *env, uint32_t
insn)
default:
goto bad_reg;
}
- case 14: /* Generic timer */
- if (arm_feature(env, ARM_FEATURE_GENERIC_TIMER)) {
- /* Dummy implementation: RAZ/WI for all */
- return 0;
- }
- goto bad_reg;
case 15: /* Implementation specific. */
if (arm_feature(env, ARM_FEATURE_XSCALE)) {
if (op2 == 0 && crm == 1)
--
1.7.1
- [Qemu-devel] [PATCH qom-next v2 27/33] target-arm: Convert cp15 cache ID registers, (continued)
- [Qemu-devel] [PATCH qom-next v2 27/33] target-arm: Convert cp15 cache ID registers, Peter Maydell, 2012/05/14
- [Qemu-devel] [PATCH qom-next v2 23/33] target-arm: Convert cp15 crn=6 registers, Peter Maydell, 2012/05/14
- [Qemu-devel] [PATCH qom-next v2 21/33] target-arm: Convert cp15 VA-PA translation registers, Peter Maydell, 2012/05/14
- [Qemu-devel] [PATCH qom-next v2 24/33] target-arm: Convert cp15 crn=9 registers, Peter Maydell, 2012/05/14
- [Qemu-devel] [PATCH qom-next v2 20/33] target-arm: Convert cp15 MMU TLB control, Peter Maydell, 2012/05/14
- [Qemu-devel] [PATCH qom-next v2 22/33] target-arm: convert cp15 crn=7 registers, Peter Maydell, 2012/05/14
- [Qemu-devel] [PATCH qom-next v2 08/33] target-arm: Convert debug registers to cp_reginfo, Peter Maydell, 2012/05/14
- [Qemu-devel] [PATCH qom-next v2 12/33] target-arm: Convert performance monitor registers, Peter Maydell, 2012/05/14
- [Qemu-devel] [PATCH qom-next v2 14/33] target-arm: Convert cp15 c3 register, Peter Maydell, 2012/05/14
- [Qemu-devel] [PATCH qom-next v2 15/33] target-arm: Convert MMU fault status cp15 registers, Peter Maydell, 2012/05/14
- [Qemu-devel] [PATCH qom-next v2 13/33] target-arm: Convert generic timer cp15 regs,
Peter Maydell <=
- [Qemu-devel] [PATCH qom-next v2 18/33] target-arm: Convert cp15 crn=10 registers, Peter Maydell, 2012/05/14
- [Qemu-devel] [PATCH qom-next v2 06/33] target-arm: Remove old cpu_arm_set_cp_io infrastructure, Peter Maydell, 2012/05/14
- [Qemu-devel] [PATCH qom-next v2 05/33] hw/pxa2xx_pic: Convert coprocessor registers to new scheme, Peter Maydell, 2012/05/14
- [Qemu-devel] [PATCH qom-next v2 01/33] target-arm: Fix 11MPCore cache type register value, Peter Maydell, 2012/05/14
- [Qemu-devel] [PATCH qom-next v2 03/33] hw/pxa2xx: Convert cp14 perf registers to new scheme, Peter Maydell, 2012/05/14
- [Qemu-devel] [PATCH qom-next v2 02/33] target-arm: initial coprocessor register framework, Peter Maydell, 2012/05/14
- [Qemu-devel] [PATCH qom-next v2 10/33] target-arm: Convert WFI/barriers special cases to cp_reginfo, Peter Maydell, 2012/05/14
- [Qemu-devel] [PATCH qom-next v2 07/33] target-arm: Add register_cp_regs_for_features(), Peter Maydell, 2012/05/14
- [Qemu-devel] [PATCH qom-next v2 16/33] target-arm: Convert cp15 crn=2 registers, Peter Maydell, 2012/05/14