diff options
| author | Zenghui Yu <yuzenghui@huawei.com> | 2020-02-11 16:39:01 +0800 |
|---|---|---|
| committer | Andrew Jones <drjones@redhat.com> | 2020-04-03 09:40:34 +0200 |
| commit | 450c579c669756588fb2edfcaad7d2e467eb8275 (patch) | |
| tree | d026d130e99978193bdf171856401c05563708f4 | |
| parent | 401c09ea953372584c593fc76eaa39c6b06c0f4a (diff) | |
| download | kvm-unit-tests-450c579c669756588fb2edfcaad7d2e467eb8275.tar.gz | |
arm64: timer: Use existing helpers to access counter/timers
We already have some good helpers to access the counter and timer
registers. Use them to avoid open coding the accessors again.
Signed-off-by: Zenghui Yu <yuzenghui@huawei.com>
Signed-off-by: Andrew Jones <drjones@redhat.com>
| -rw-r--r-- | arm/timer.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arm/timer.c b/arm/timer.c index 10a88f3..f5cf775 100644 --- a/arm/timer.c +++ b/arm/timer.c @@ -331,7 +331,7 @@ static void test_init(void) vtimer_info.irq_flags = fdt32_to_cpu(data[8]); install_exception_handler(EL1H_SYNC, ESR_EL1_EC_UNKNOWN, ptimer_unsupported_handler); - read_sysreg(cntp_ctl_el0); + ptimer_info.read_ctl(); install_exception_handler(EL1H_SYNC, ESR_EL1_EC_UNKNOWN, NULL); if (ptimer_unsupported && !ERRATA(7b6b46311a85)) { @@ -366,15 +366,15 @@ static void print_timer_info(void) { printf("CNTFRQ_EL0 : 0x%016lx\n", read_sysreg(cntfrq_el0)); - if (!ptimer_unsupported){ - printf("CNTPCT_EL0 : 0x%016lx\n", read_sysreg(cntpct_el0)); - printf("CNTP_CTL_EL0 : 0x%016lx\n", read_sysreg(cntp_ctl_el0)); - printf("CNTP_CVAL_EL0: 0x%016lx\n", read_sysreg(cntp_cval_el0)); + if (!ptimer_unsupported) { + printf("CNTPCT_EL0 : 0x%016lx\n", ptimer_info.read_counter()); + printf("CNTP_CTL_EL0 : 0x%016lx\n", ptimer_info.read_ctl()); + printf("CNTP_CVAL_EL0: 0x%016lx\n", ptimer_info.read_cval()); } - printf("CNTVCT_EL0 : 0x%016lx\n", read_sysreg(cntvct_el0)); - printf("CNTV_CTL_EL0 : 0x%016lx\n", read_sysreg(cntv_ctl_el0)); - printf("CNTV_CVAL_EL0: 0x%016lx\n", read_sysreg(cntv_cval_el0)); + printf("CNTVCT_EL0 : 0x%016lx\n", vtimer_info.read_counter()); + printf("CNTV_CTL_EL0 : 0x%016lx\n", vtimer_info.read_ctl()); + printf("CNTV_CVAL_EL0: 0x%016lx\n", vtimer_info.read_cval()); } int main(int argc, char **argv) |