mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/watchdog/cmsdk-apb-watchdog: Add Clock input

Browse Source 
As the first step in converting the CMSDK_APB_TIMER device to the
Clock framework, add a Clock input.  For the moment we do nothing
with this clock; we will change the behaviour from using the
wdogclk-frq property to using the Clock once all the users of this
device have been converted to wire up the Clock.

This is a migration compatibility break for machines mps2-an385,
mps2-an386, mps2-an500, mps2-an511, mps2-an505, mps2-an521, musca-a,
musca-b1, lm3s811evb, lm3s6965evb.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Luc Michel <luc@lmichel.fr>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20210128114145.20536-10-peter.maydell@linaro.org
Message-id: 20210121190622.22000-10-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2021-01-28 11:41:29 +00:00
parent 55fd0f84a2
commit eeae0b2bf4
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/watchdog/cmsdk-apb-watchdog.c
View File

@ -30,6 +30,7 @@
#include "hw/irq.h" #include "hw/irq.h"
#include "hw/qdev-properties.h" #include "hw/qdev-properties.h"
#include "hw/registerfields.h" #include "hw/registerfields.h"
#include "hw/qdev-clock.h"
#include "hw/watchdog/cmsdk-apb-watchdog.h" #include "hw/watchdog/cmsdk-apb-watchdog.h"
#include "migration/vmstate.h" #include "migration/vmstate.h"
@ -318,6 +319,7 @@ static void cmsdk_apb_watchdog_init(Object *obj)
s, "cmsdk-apb-watchdog", 0x1000); s, "cmsdk-apb-watchdog", 0x1000);
sysbus_init_mmio(sbd, &s->iomem); sysbus_init_mmio(sbd, &s->iomem);
sysbus_init_irq(sbd, &s->wdogint); sysbus_init_irq(sbd, &s->wdogint);
s->wdogclk = qdev_init_clock_in(DEVICE(s), "WDOGCLK", NULL, NULL);
s->is_luminary = false; s->is_luminary = false;
s->id = cmsdk_apb_watchdog_id; s->id = cmsdk_apb_watchdog_id;
@ -346,9 +348,10 @@ static void cmsdk_apb_watchdog_realize(DeviceState *dev, Error **errp)
static const VMStateDescription cmsdk_apb_watchdog_vmstate = { static const VMStateDescription cmsdk_apb_watchdog_vmstate = {
.name = "cmsdk-apb-watchdog", .name = "cmsdk-apb-watchdog",
.version_id = 1, .version_id = 2,
.minimum_version_id = 1, .minimum_version_id = 2,
.fields = (VMStateField[]) { .fields = (VMStateField[]) {
VMSTATE_CLOCK(wdogclk, CMSDKAPBWatchdog),
VMSTATE_PTIMER(timer, CMSDKAPBWatchdog), VMSTATE_PTIMER(timer, CMSDKAPBWatchdog),
VMSTATE_UINT32(control, CMSDKAPBWatchdog), VMSTATE_UINT32(control, CMSDKAPBWatchdog),
VMSTATE_UINT32(intstatus, CMSDKAPBWatchdog), VMSTATE_UINT32(intstatus, CMSDKAPBWatchdog),

3
include/hw/watchdog/cmsdk-apb-watchdog.h
View File

@ -17,6 +17,7 @@
* *
* QEMU interface: * QEMU interface:
* + QOM property "wdogclk-frq": frequency at which the watchdog is clocked * + QOM property "wdogclk-frq": frequency at which the watchdog is clocked
* + Clock input "WDOGCLK": clock for the watchdog's timer
* + sysbus MMIO region 0: the register bank * + sysbus MMIO region 0: the register bank
* + sysbus IRQ 0: watchdog interrupt * + sysbus IRQ 0: watchdog interrupt
* *
@ -33,6 +34,7 @@
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "hw/ptimer.h" #include "hw/ptimer.h"
#include "hw/clock.h"
#include "qom/object.h" #include "qom/object.h"
#define TYPE_CMSDK_APB_WATCHDOG "cmsdk-apb-watchdog" #define TYPE_CMSDK_APB_WATCHDOG "cmsdk-apb-watchdog"
@ -54,6 +56,7 @@ struct CMSDKAPBWatchdog {
uint32_t wdogclk_frq; uint32_t wdogclk_frq;
bool is_luminary; bool is_luminary;
struct ptimer_state *timer; struct ptimer_state *timer;
Clock *wdogclk;
uint32_t control; uint32_t control;
uint32_t intstatus; uint32_t intstatus;