[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 3/7] target-arm: Rename and move gt_cnt_reset
From: |
Edgar E. Iglesias |
Subject: |
[Qemu-devel] [PATCH v6 3/7] target-arm: Rename and move gt_cnt_reset |
Date: |
Mon, 13 Jul 2015 22:51:00 +1000 |
Rename gt_cnt_reset to gt_timer_reset as the function really
resets the timers and not the counters. Move the registration
from counter regs to timer regs.
Signed-off-by: Edgar E. Iglesias <address@hidden>
---
target-arm/helper.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/target-arm/helper.c b/target-arm/helper.c
index de9b246..27b1833 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -1261,7 +1261,7 @@ static void gt_recalc_timer(ARMCPU *cpu, int timeridx)
}
}
-static void gt_cnt_reset(CPUARMState *env, const ARMCPRegInfo *ri)
+static void gt_timer_reset(CPUARMState *env, const ARMCPRegInfo *ri)
{
ARMCPU *cpu = arm_env_get_cpu(env);
int timeridx = ri->opc1 & 1;
@@ -1414,7 +1414,7 @@ static const ARMCPRegInfo generic_timer_cp_reginfo[] = {
{ .name = "CNTP_TVAL_EL0", .state = ARM_CP_STATE_AA64,
.opc0 = 3, .opc1 = 3, .crn = 14, .crm = 2, .opc2 = 0,
.type = ARM_CP_NO_RAW | ARM_CP_IO, .access = PL1_RW | PL0_R,
- .accessfn = gt_ptimer_access,
+ .accessfn = gt_ptimer_access, .resetfn = gt_timer_reset,
.readfn = gt_tval_read, .writefn = gt_tval_write,
},
{ .name = "CNTV_TVAL", .cp = 15, .crn = 14, .crm = 3, .opc1 = 0, .opc2 = 0,
@@ -1425,7 +1425,7 @@ static const ARMCPRegInfo generic_timer_cp_reginfo[] = {
{ .name = "CNTV_TVAL_EL0", .state = ARM_CP_STATE_AA64,
.opc0 = 3, .opc1 = 3, .crn = 14, .crm = 3, .opc2 = 0,
.type = ARM_CP_NO_RAW | ARM_CP_IO, .access = PL1_RW | PL0_R,
- .accessfn = gt_vtimer_access,
+ .accessfn = gt_vtimer_access, .resetfn = gt_timer_reset,
.readfn = gt_tval_read, .writefn = gt_tval_write,
},
/* The counter itself */
@@ -1437,8 +1437,7 @@ static const ARMCPRegInfo generic_timer_cp_reginfo[] = {
{ .name = "CNTPCT_EL0", .state = ARM_CP_STATE_AA64,
.opc0 = 3, .opc1 = 3, .crn = 14, .crm = 0, .opc2 = 1,
.access = PL0_R, .type = ARM_CP_NO_RAW | ARM_CP_IO,
- .accessfn = gt_pct_access,
- .readfn = gt_cnt_read, .resetfn = gt_cnt_reset,
+ .accessfn = gt_pct_access, .readfn = gt_cnt_read,
},
{ .name = "CNTVCT", .cp = 15, .crm = 14, .opc1 = 1,
.access = PL0_R, .type = ARM_CP_64BIT | ARM_CP_NO_RAW | ARM_CP_IO,
@@ -1448,8 +1447,7 @@ static const ARMCPRegInfo generic_timer_cp_reginfo[] = {
{ .name = "CNTVCT_EL0", .state = ARM_CP_STATE_AA64,
.opc0 = 3, .opc1 = 3, .crn = 14, .crm = 0, .opc2 = 2,
.access = PL0_R, .type = ARM_CP_NO_RAW | ARM_CP_IO,
- .accessfn = gt_vct_access,
- .readfn = gt_virt_cnt_read, .resetfn = gt_cnt_reset,
+ .accessfn = gt_vct_access, .readfn = gt_virt_cnt_read,
},
/* Comparison value, indicating when the timer goes off */
{ .name = "CNTP_CVAL", .cp = 15, .crm = 14, .opc1 = 2,
--
1.9.1
- [Qemu-devel] [PATCH v6 0/7] arm: Steps towards EL2 support round 3, Edgar E. Iglesias, 2015/07/13
- [Qemu-devel] [PATCH v6 1/7] target-arm: Add CNTVOFF_EL2, Edgar E. Iglesias, 2015/07/13
- [Qemu-devel] [PATCH v6 2/7] target-arm: Add CNTHCTL_EL2, Edgar E. Iglesias, 2015/07/13
- [Qemu-devel] [PATCH v6 3/7] target-arm: Rename and move gt_cnt_reset,
Edgar E. Iglesias <=
- [Qemu-devel] [PATCH v6 4/7] target-arm: Pass timeridx as argument to various timer functions, Edgar E. Iglesias, 2015/07/13
- [Qemu-devel] [PATCH v6 5/7] target-arm: Add the Hypervisor timer, Edgar E. Iglesias, 2015/07/13
- [Qemu-devel] [PATCH v6 6/7] hw/arm/virt: Replace magic IRQ constants with macros, Edgar E. Iglesias, 2015/07/13
- [Qemu-devel] [PATCH v6 7/7] hw/arm/virt: Connect the Hypervisor timer, Edgar E. Iglesias, 2015/07/13
- Re: [Qemu-devel] [PATCH v6 0/7] arm: Steps towards EL2 support round 3, Peter Maydell, 2015/07/13