Hello, Currently, QEMU ARM MPTimer device model provides only a certain subset of the emulation behavior. This patch series is supposed to add missing parts by converting the MPTimer to use generic ptimer helper. It fixes some important ptimer bugs and provides new features that are required for the ARM MPTimer.
Changelog: V16: Suppressed ptimer warning messages under qtest. Added a comment for the default policy in the "include/hw/ptimer.h" Patches "Change ptimer_get_count to return "1" for the expired timer" and "Fix counter - 1 returned by ptimer_get_count for the active timer" are merged and converted into a "no counter round down" ptimer policy. Added "hw/timer/arm_mptimer.c" into the "make check" GCOV. V15: As per Peter's Maydell request: split ptimer policy patches, so that first "policy" patch only sets default policy to all of the timers without introducing new behaviour policies. The "deferred trigger" ptimer policy from V14 is converted to "continuous trigger" as it is more intuitive. New ptimer policies added. New ptimer patch "Actually stop timer in case of error". Fixed ARM MPTimer periodic/oneshot "on the fly" mode switch for the case when load = 0 and new mode has prescaler = 0. Added QTests for each of the ptimer policies. Added QTests for the ARM MPTimer. V14: Set the ptimer policy in the ptimer_init() instead of adding ptimer_set_policy(), keeping ptimer VMState unchanged and dropped hw_error() hardening asserts as per Peter's Maydell V13 review comments, addressed the rest of the review comments. V13-V2: https://lists.gnu.org/archive/html/qemu-arm/2016-05/msg00269.html Dmitry Osipenko (16): hw/ptimer: Actually stop the timer in case of error hw/ptimer: Introduce timer policy feature tests: Add ptimer tests hw/ptimer: Suppress error messages under qtest hw/ptimer: Add "wraparound after one period" policy tests: ptimer: Add tests for "wraparound after one period" policy hw/ptimer: Add "continuous trigger" policy tests: ptimer: Add tests for "continuous trigger" policy hw/ptimer: Add "no immediate trigger" policy tests: ptimer: Add tests for "no immediate trigger" policy hw/ptimer: Add "no immediate reload" policy tests: ptimer: Add tests for "no immediate reload" policy hw/ptimer: Add "no counter round down" policy tests: ptimer: Add tests for "no counter round down" policy arm_mptimer: Convert to use ptimer tests: Add tests for the ARM MPTimer hw/arm/musicpal.c | 2 +- hw/core/ptimer.c | 93 +++- hw/dma/xilinx_axidma.c | 2 +- hw/m68k/mcf5206.c | 2 +- hw/m68k/mcf5208.c | 2 +- hw/net/fsl_etsec/etsec.c | 2 +- hw/net/lan9118.c | 2 +- hw/timer/allwinner-a10-pit.c | 2 +- hw/timer/arm_mptimer.c | 149 +++--- hw/timer/arm_timer.c | 2 +- hw/timer/digic-timer.c | 2 +- hw/timer/etraxfs_timer.c | 6 +- hw/timer/exynos4210_mct.c | 7 +- hw/timer/exynos4210_pwm.c | 2 +- hw/timer/exynos4210_rtc.c | 4 +- hw/timer/grlib_gptimer.c | 2 +- hw/timer/imx_epit.c | 4 +- hw/timer/imx_gpt.c | 2 +- hw/timer/lm32_timer.c | 2 +- hw/timer/milkymist-sysctl.c | 4 +- hw/timer/puv3_ost.c | 2 +- hw/timer/sh_timer.c | 2 +- hw/timer/slavio_timer.c | 2 +- hw/timer/xilinx_timer.c | 2 +- include/hw/ptimer.h | 43 +- include/hw/timer/arm_mptimer.h | 5 +- stubs/vmstate.c | 5 + tests/Makefile.include | 5 + tests/ptimer-test-stubs.c | 107 ++++ tests/ptimer-test.c | 717 ++++++++++++++++++++++++++ tests/ptimer-test.h | 22 + tests/test-arm-mptimer.c | 1105 ++++++++++++++++++++++++++++++++++++++++ 32 files changed, 2188 insertions(+), 122 deletions(-) create mode 100644 tests/ptimer-test-stubs.c create mode 100644 tests/ptimer-test.c create mode 100644 tests/ptimer-test.h create mode 100644 tests/test-arm-mptimer.c -- 2.9.3