This patchset converts the CMSDK timer, watchdog and dualtimer devices
to use the Clock framework instead of an integer property specifying
a frequency in Hz. The series is quito a lot of patches but they
should be mostly small and I hope easy to review.
The motivation here is the upcoming Arm SSE-300 model: this has a
new kind of timer device, which I wanted to write in the modern style
with a Clock input. That meant the ARMSSE container object needed
to know about Clocks, so converting the existing devices it used
to Clocks seemed like a good first step.
The series as a whole is a migration compat break for the machines
involved: mps2-an385, mps2-an386, mps2-an500, mps2-an511, mps2-an505,
mps2-an521, musca-a, musca-b1, lm3s811evb, lm3s6965evb.
v1->v2 changes (all very minor so I have left r-by tags in place):
* in test cases, remove set-but-never-used QTestState* variables; gcc
warns about these (I did my development with clang, which does not...)
(patches 3, 4, 5)
* in test cases, consistently phrase clock_step() arguments as calculations
based on tick counts and the ns-per-tick value rather than just the final
numbers (eg '500 * 40 + 1' instead of '20001') (patches 3, 5)
* correct the forward-step amount when looking for periodic timer reload
of the dualtimer (patch 5)
* actually wire up the ARMSSE MAINCLK callback function (patch 22)
The only patch still unreviewed is 5 ("tests: Add a simple test of the
CMSDK APB dual timer").
thanks
-- PMM
Peter Maydell (25):
ptimer: Add new ptimer_set_period_from_clock() function
clock: Add new clock_has_source() function
tests: Add a simple test of the CMSDK APB timer
tests: Add a simple test of the CMSDK APB watchdog
tests: Add a simple test of the CMSDK APB dual timer
hw/timer/cmsdk-apb-timer: Rename CMSDKAPBTIMER struct to CMSDKAPBTimer
hw/timer/cmsdk-apb-timer: Add Clock input
hw/timer/cmsdk-apb-dualtimer: Add Clock input
hw/watchdog/cmsdk-apb-watchdog: Add Clock input
hw/arm/armsse: Rename "MAINCLK" property to "MAINCLK_FRQ"
hw/arm/armsse: Wire up clocks
hw/arm/mps2: Inline CMSDK_APB_TIMER creation
hw/arm/mps2: Create and connect SYSCLK Clock
hw/arm/mps2-tz: Create and connect ARMSSE Clocks
hw/arm/musca: Create and connect ARMSSE Clocks
hw/arm/stellaris: Convert SSYS to QOM device
hw/arm/stellaris: Create Clock input for watchdog
hw/timer/cmsdk-apb-timer: Convert to use Clock input
hw/timer/cmsdk-apb-dualtimer: Convert to use Clock input
hw/watchdog/cmsdk-apb-watchdog: Convert to use Clock input
tests/qtest/cmsdk-apb-watchdog-test: Test clock changes
hw/arm/armsse: Use Clock to set system_clock_scale
arm: Don't set freq properties on CMSDK timer, dualtimer, watchdog,
ARMSSE
arm: Remove frq properties on CMSDK timer, dualtimer, watchdog, ARMSSE
hw/arm/stellaris: Remove board-creation reset of STELLARIS_SYS
docs/devel/clocks.rst | 16 +++
include/hw/arm/armsse.h | 14 +-
include/hw/clock.h | 15 ++
include/hw/ptimer.h | 22 +++
include/hw/timer/cmsdk-apb-dualtimer.h | 5 +-
include/hw/timer/cmsdk-apb-timer.h | 34 ++---
include/hw/watchdog/cmsdk-apb-watchdog.h | 5 +-
include/qemu/typedefs.h | 1 +
hw/arm/armsse.c | 48 +++++--
hw/arm/mps2-tz.c | 14 +-
hw/arm/mps2.c | 28 +++-
hw/arm/musca.c | 13 +-
hw/arm/stellaris.c | 170 +++++++++++++++++------
hw/core/ptimer.c | 34 +++++
hw/timer/cmsdk-apb-dualtimer.c | 53 +++++--
hw/timer/cmsdk-apb-timer.c | 55 ++++----
hw/watchdog/cmsdk-apb-watchdog.c | 29 ++--
tests/qtest/cmsdk-apb-dualtimer-test.c | 130 +++++++++++++++++
tests/qtest/cmsdk-apb-timer-test.c | 75 ++++++++++
tests/qtest/cmsdk-apb-watchdog-test.c | 131 +++++++++++++++++
MAINTAINERS | 3 +
tests/qtest/meson.build | 3 +
22 files changed, 756 insertions(+), 142 deletions(-)
create mode 100644 tests/qtest/cmsdk-apb-dualtimer-test.c
create mode 100644 tests/qtest/cmsdk-apb-timer-test.c
create mode 100644 tests/qtest/cmsdk-apb-watchdog-test.c
--
2.20.1
