* [PATCH] hw/timer/etraxfs_timer: Add vmstate for ETRAX timers
@ 2021-11-06 10:56 Philippe Mathieu-Daudé
2021-12-17 23:37 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 5+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-11-06 10:56 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-trivial, Peter Maydell, Philippe Mathieu-Daudé,
Edgar E. Iglesias
Add the vmstate for the ETRAX timers.
This is in theory a migration compatibility break
for the 'AXIS devboard 88' CRIS machine.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/timer/etraxfs_timer.c | 34 +++++++++++++++++++++++++++++++++-
1 file changed, 33 insertions(+), 1 deletion(-)
diff --git a/hw/timer/etraxfs_timer.c b/hw/timer/etraxfs_timer.c
index 4ba662190de..139e5b86a44 100644
--- a/hw/timer/etraxfs_timer.c
+++ b/hw/timer/etraxfs_timer.c
@@ -26,6 +26,7 @@
#include "hw/sysbus.h"
#include "sysemu/reset.h"
#include "sysemu/runstate.h"
+#include "migration/vmstate.h"
#include "qemu/module.h"
#include "qemu/timer.h"
#include "hw/irq.h"
@@ -64,7 +65,7 @@ struct ETRAXTimerState {
ptimer_state *ptimer_t1;
ptimer_state *ptimer_wd;
- int wd_hits;
+ uint32_t wd_hits;
/* Control registers. */
uint32_t rw_tmr0_div;
@@ -83,6 +84,36 @@ struct ETRAXTimerState {
uint32_t r_masked_intr;
};
+static const VMStateDescription vmstate_etraxfs = {
+ .name = "etraxfs",
+ .version_id = 0,
+ .minimum_version_id = 0,
+ .fields = (VMStateField[]) {
+ VMSTATE_PTIMER(ptimer_t0, ETRAXTimerState),
+ VMSTATE_PTIMER(ptimer_t1, ETRAXTimerState),
+ VMSTATE_PTIMER(ptimer_wd, ETRAXTimerState),
+
+ VMSTATE_UINT32(wd_hits, ETRAXTimerState),
+
+ VMSTATE_UINT32(rw_tmr0_div, ETRAXTimerState),
+ VMSTATE_UINT32(r_tmr0_data, ETRAXTimerState),
+ VMSTATE_UINT32(rw_tmr0_ctrl, ETRAXTimerState),
+
+ VMSTATE_UINT32(rw_tmr1_div, ETRAXTimerState),
+ VMSTATE_UINT32(r_tmr1_data, ETRAXTimerState),
+ VMSTATE_UINT32(rw_tmr1_ctrl, ETRAXTimerState),
+
+ VMSTATE_UINT32(rw_wd_ctrl, ETRAXTimerState),
+
+ VMSTATE_UINT32(rw_intr_mask, ETRAXTimerState),
+ VMSTATE_UINT32(rw_ack_intr, ETRAXTimerState),
+ VMSTATE_UINT32(r_intr, ETRAXTimerState),
+ VMSTATE_UINT32(r_masked_intr, ETRAXTimerState),
+
+ VMSTATE_END_OF_LIST()
+ }
+};
+
static uint64_t
timer_read(void *opaque, hwaddr addr, unsigned int size)
{
@@ -357,6 +388,7 @@ static void etraxfs_timer_class_init(ObjectClass *klass, void *data)
ResettableClass *rc = RESETTABLE_CLASS(klass);
dc->realize = etraxfs_timer_realize;
+ dc->vmsd = &vmstate_etraxfs;
rc->phases.enter = etraxfs_timer_reset_enter;
rc->phases.hold = etraxfs_timer_reset_hold;
}
--
2.31.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] hw/timer/etraxfs_timer: Add vmstate for ETRAX timers
2021-11-06 10:56 [PATCH] hw/timer/etraxfs_timer: Add vmstate for ETRAX timers Philippe Mathieu-Daudé
@ 2021-12-17 23:37 ` Philippe Mathieu-Daudé
2021-12-18 2:28 ` Richard Henderson
0 siblings, 1 reply; 5+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-12-17 23:37 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Peter Maydell, Edgar E. Iglesias
ping?
On 11/6/21 11:56, Philippe Mathieu-Daudé wrote:
> Add the vmstate for the ETRAX timers.
> This is in theory a migration compatibility break
> for the 'AXIS devboard 88' CRIS machine.
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> hw/timer/etraxfs_timer.c | 34 +++++++++++++++++++++++++++++++++-
> 1 file changed, 33 insertions(+), 1 deletion(-)
>
> diff --git a/hw/timer/etraxfs_timer.c b/hw/timer/etraxfs_timer.c
> index 4ba662190de..139e5b86a44 100644
> --- a/hw/timer/etraxfs_timer.c
> +++ b/hw/timer/etraxfs_timer.c
> @@ -26,6 +26,7 @@
> #include "hw/sysbus.h"
> #include "sysemu/reset.h"
> #include "sysemu/runstate.h"
> +#include "migration/vmstate.h"
> #include "qemu/module.h"
> #include "qemu/timer.h"
> #include "hw/irq.h"
> @@ -64,7 +65,7 @@ struct ETRAXTimerState {
> ptimer_state *ptimer_t1;
> ptimer_state *ptimer_wd;
>
> - int wd_hits;
> + uint32_t wd_hits;
>
> /* Control registers. */
> uint32_t rw_tmr0_div;
> @@ -83,6 +84,36 @@ struct ETRAXTimerState {
> uint32_t r_masked_intr;
> };
>
> +static const VMStateDescription vmstate_etraxfs = {
> + .name = "etraxfs",
> + .version_id = 0,
> + .minimum_version_id = 0,
> + .fields = (VMStateField[]) {
> + VMSTATE_PTIMER(ptimer_t0, ETRAXTimerState),
> + VMSTATE_PTIMER(ptimer_t1, ETRAXTimerState),
> + VMSTATE_PTIMER(ptimer_wd, ETRAXTimerState),
> +
> + VMSTATE_UINT32(wd_hits, ETRAXTimerState),
> +
> + VMSTATE_UINT32(rw_tmr0_div, ETRAXTimerState),
> + VMSTATE_UINT32(r_tmr0_data, ETRAXTimerState),
> + VMSTATE_UINT32(rw_tmr0_ctrl, ETRAXTimerState),
> +
> + VMSTATE_UINT32(rw_tmr1_div, ETRAXTimerState),
> + VMSTATE_UINT32(r_tmr1_data, ETRAXTimerState),
> + VMSTATE_UINT32(rw_tmr1_ctrl, ETRAXTimerState),
> +
> + VMSTATE_UINT32(rw_wd_ctrl, ETRAXTimerState),
> +
> + VMSTATE_UINT32(rw_intr_mask, ETRAXTimerState),
> + VMSTATE_UINT32(rw_ack_intr, ETRAXTimerState),
> + VMSTATE_UINT32(r_intr, ETRAXTimerState),
> + VMSTATE_UINT32(r_masked_intr, ETRAXTimerState),
> +
> + VMSTATE_END_OF_LIST()
> + }
> +};
> +
> static uint64_t
> timer_read(void *opaque, hwaddr addr, unsigned int size)
> {
> @@ -357,6 +388,7 @@ static void etraxfs_timer_class_init(ObjectClass *klass, void *data)
> ResettableClass *rc = RESETTABLE_CLASS(klass);
>
> dc->realize = etraxfs_timer_realize;
> + dc->vmsd = &vmstate_etraxfs;
> rc->phases.enter = etraxfs_timer_reset_enter;
> rc->phases.hold = etraxfs_timer_reset_hold;
> }
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] hw/timer/etraxfs_timer: Add vmstate for ETRAX timers
2021-12-17 23:37 ` Philippe Mathieu-Daudé
@ 2021-12-18 2:28 ` Richard Henderson
2022-01-12 14:29 ` Laurent Vivier
2022-01-12 16:02 ` Peter Maydell
0 siblings, 2 replies; 5+ messages in thread
From: Richard Henderson @ 2021-12-18 2:28 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: qemu-trivial, Peter Maydell, Edgar E. Iglesias
On 12/17/21 3:37 PM, Philippe Mathieu-Daudé wrote:
> ping?
>
> On 11/6/21 11:56, Philippe Mathieu-Daudé wrote:
>> Add the vmstate for the ETRAX timers.
>> This is in theory a migration compatibility break
>> for the 'AXIS devboard 88' CRIS machine.
>>
>> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>> ---
>> hw/timer/etraxfs_timer.c | 34 +++++++++++++++++++++++++++++++++-
>> 1 file changed, 33 insertions(+), 1 deletion(-)
In that it matches another similar timer device:
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
>> +static const VMStateDescription vmstate_etraxfs = {
>> + .name = "etraxfs",
>> + .version_id = 0,
>> + .minimum_version_id = 0,
>> + .fields = (VMStateField[]) {
>> + VMSTATE_PTIMER(ptimer_t0, ETRAXTimerState),
>> + VMSTATE_PTIMER(ptimer_t1, ETRAXTimerState),
>> + VMSTATE_PTIMER(ptimer_wd, ETRAXTimerState),
>> +
>> + VMSTATE_UINT32(wd_hits, ETRAXTimerState),
>> +
>> + VMSTATE_UINT32(rw_tmr0_div, ETRAXTimerState),
>> + VMSTATE_UINT32(r_tmr0_data, ETRAXTimerState),
>> + VMSTATE_UINT32(rw_tmr0_ctrl, ETRAXTimerState),
>> +
>> + VMSTATE_UINT32(rw_tmr1_div, ETRAXTimerState),
>> + VMSTATE_UINT32(r_tmr1_data, ETRAXTimerState),
>> + VMSTATE_UINT32(rw_tmr1_ctrl, ETRAXTimerState),
>> +
>> + VMSTATE_UINT32(rw_wd_ctrl, ETRAXTimerState),
>> +
>> + VMSTATE_UINT32(rw_intr_mask, ETRAXTimerState),
>> + VMSTATE_UINT32(rw_ack_intr, ETRAXTimerState),
>> + VMSTATE_UINT32(r_intr, ETRAXTimerState),
>> + VMSTATE_UINT32(r_masked_intr, ETRAXTimerState),
>> +
>> + VMSTATE_END_OF_LIST()
>> + }
>> +};
What I don't understand is how these controls get applied to qemu_irq after vmload, here
or in any other device. It seems like we should have some post_load hook that calls
timer_update_irq, etc.
r~
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] hw/timer/etraxfs_timer: Add vmstate for ETRAX timers
2021-12-18 2:28 ` Richard Henderson
@ 2022-01-12 14:29 ` Laurent Vivier
2022-01-12 16:02 ` Peter Maydell
1 sibling, 0 replies; 5+ messages in thread
From: Laurent Vivier @ 2022-01-12 14:29 UTC (permalink / raw)
To: Richard Henderson, Philippe Mathieu-Daudé, qemu-devel
Cc: qemu-trivial, Peter Maydell, Edgar E. Iglesias
Le 18/12/2021 à 03:28, Richard Henderson a écrit :
> On 12/17/21 3:37 PM, Philippe Mathieu-Daudé wrote:
>> ping?
>>
>> On 11/6/21 11:56, Philippe Mathieu-Daudé wrote:
>>> Add the vmstate for the ETRAX timers.
>>> This is in theory a migration compatibility break
>>> for the 'AXIS devboard 88' CRIS machine.
>>>
>>> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>>> ---
>>> hw/timer/etraxfs_timer.c | 34 +++++++++++++++++++++++++++++++++-
>>> 1 file changed, 33 insertions(+), 1 deletion(-)
>
>
> In that it matches another similar timer device:
> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
>
>
>>> +static const VMStateDescription vmstate_etraxfs = {
>>> + .name = "etraxfs",
>>> + .version_id = 0,
>>> + .minimum_version_id = 0,
>>> + .fields = (VMStateField[]) {
>>> + VMSTATE_PTIMER(ptimer_t0, ETRAXTimerState),
>>> + VMSTATE_PTIMER(ptimer_t1, ETRAXTimerState),
>>> + VMSTATE_PTIMER(ptimer_wd, ETRAXTimerState),
>>> +
>>> + VMSTATE_UINT32(wd_hits, ETRAXTimerState),
>>> +
>>> + VMSTATE_UINT32(rw_tmr0_div, ETRAXTimerState),
>>> + VMSTATE_UINT32(r_tmr0_data, ETRAXTimerState),
>>> + VMSTATE_UINT32(rw_tmr0_ctrl, ETRAXTimerState),
>>> +
>>> + VMSTATE_UINT32(rw_tmr1_div, ETRAXTimerState),
>>> + VMSTATE_UINT32(r_tmr1_data, ETRAXTimerState),
>>> + VMSTATE_UINT32(rw_tmr1_ctrl, ETRAXTimerState),
>>> +
>>> + VMSTATE_UINT32(rw_wd_ctrl, ETRAXTimerState),
>>> +
>>> + VMSTATE_UINT32(rw_intr_mask, ETRAXTimerState),
>>> + VMSTATE_UINT32(rw_ack_intr, ETRAXTimerState),
>>> + VMSTATE_UINT32(r_intr, ETRAXTimerState),
>>> + VMSTATE_UINT32(r_masked_intr, ETRAXTimerState),
>>> +
>>> + VMSTATE_END_OF_LIST()
>>> + }
>>> +};
>
> What I don't understand is how these controls get applied to qemu_irq after vmload, here or in any
> other device. It seems like we should have some post_load hook that calls timer_update_irq, etc.
>
FWIW, in VMSTATE_PTIMER(), we use a vmstate_ptimer struct that registers a vmstate_info_timer with
VMSTATE_TIMER_PTR(). vmstate_info_timer uses timer_get() to update or delete the timer when it is
loaded.
Applied to my trivial-patches branch.
Thanks,
Laurent
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] hw/timer/etraxfs_timer: Add vmstate for ETRAX timers
2021-12-18 2:28 ` Richard Henderson
2022-01-12 14:29 ` Laurent Vivier
@ 2022-01-12 16:02 ` Peter Maydell
1 sibling, 0 replies; 5+ messages in thread
From: Peter Maydell @ 2022-01-12 16:02 UTC (permalink / raw)
To: Richard Henderson
Cc: qemu-trivial, Edgar E. Iglesias, Philippe Mathieu-Daudé, qemu-devel
On Sat, 18 Dec 2021 at 02:28, Richard Henderson
<richard.henderson@linaro.org> wrote:
> What I don't understand is how these controls get applied to qemu_irq after vmload, here
> or in any other device. It seems like we should have some post_load hook that calls
> timer_update_irq, etc.
Very late answer, but: we don't need to call qemu_set_irq() on
qemu_irqs outbound from a device after a vmload, because IRQ
lines themselves have no state. The device on the other end of
the irq line also loads its own state, and typically that includes
its internal variables which it uses to track whether its input
lines are 0 or 1.
-- PMM
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-01-12 16:23 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-06 10:56 [PATCH] hw/timer/etraxfs_timer: Add vmstate for ETRAX timers Philippe Mathieu-Daudé
2021-12-17 23:37 ` Philippe Mathieu-Daudé
2021-12-18 2:28 ` Richard Henderson
2022-01-12 14:29 ` Laurent Vivier
2022-01-12 16:02 ` Peter Maydell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).