From: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
To: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
Laurent Vivier <laurent@vivier.eu>,
qemu-devel@nongnu.org, Peter Maydell <peter.maydell@linaro.org>
Subject: Re: [PATCH v3 1/2] hw/timer/etraxfs_timer: Convert to 3-phase reset (Resettable interface)
Date: Mon, 3 May 2021 18:51:50 +0200 [thread overview]
Message-ID: <20210503165150.GD477672@toto> (raw)
In-Reply-To: <20210502163931.552675-2-f4bug@amsat.org>
On Sun, May 02, 2021 at 06:39:30PM +0200, Philippe Mathieu-Daudé wrote:
> TYPE_ETRAX_FS_TIMER is a sysbus device, so its DeviceClass::reset()
> handler is called automatically when its qbus parent is reset
> (we don't need to register it manually).
>
> Convert the generic reset to a enter/hold resettable ones, and
> remove the qemu_register_reset() call.
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> hw/timer/etraxfs_timer.c | 14 +++++++++++---
> 1 file changed, 11 insertions(+), 3 deletions(-)
>
> diff --git a/hw/timer/etraxfs_timer.c b/hw/timer/etraxfs_timer.c
> index 5379006086f..4ba662190de 100644
> --- a/hw/timer/etraxfs_timer.c
> +++ b/hw/timer/etraxfs_timer.c
> @@ -309,9 +309,9 @@ static const MemoryRegionOps timer_ops = {
> }
> };
>
> -static void etraxfs_timer_reset(void *opaque)
> +static void etraxfs_timer_reset_enter(Object *obj, ResetType type)
> {
> - ETRAXTimerState *t = opaque;
> + ETRAXTimerState *t = ETRAX_TIMER(obj);
>
> ptimer_transaction_begin(t->ptimer_t0);
> ptimer_stop(t->ptimer_t0);
> @@ -325,6 +325,12 @@ static void etraxfs_timer_reset(void *opaque)
> t->rw_wd_ctrl = 0;
> t->r_intr = 0;
> t->rw_intr_mask = 0;
> +}
> +
> +static void etraxfs_timer_reset_hold(Object *obj)
> +{
> + ETRAXTimerState *t = ETRAX_TIMER(obj);
> +
> qemu_irq_lower(t->irq);
> }
>
> @@ -343,14 +349,16 @@ static void etraxfs_timer_realize(DeviceState *dev, Error **errp)
> memory_region_init_io(&t->mmio, OBJECT(t), &timer_ops, t,
> "etraxfs-timer", 0x5c);
> sysbus_init_mmio(sbd, &t->mmio);
> - qemu_register_reset(etraxfs_timer_reset, t);
> }
>
> static void etraxfs_timer_class_init(ObjectClass *klass, void *data)
> {
> DeviceClass *dc = DEVICE_CLASS(klass);
> + ResettableClass *rc = RESETTABLE_CLASS(klass);
>
> dc->realize = etraxfs_timer_realize;
> + rc->phases.enter = etraxfs_timer_reset_enter;
> + rc->phases.hold = etraxfs_timer_reset_hold;
> }
>
> static const TypeInfo etraxfs_timer_info = {
> --
> 2.26.3
>
next prev parent reply other threads:[~2021-05-03 16:53 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-02 16:39 [PATCH v3 0/2] hw: Convert mc146818rtc & etraxfs_timer to 3-phase reset interface Philippe Mathieu-Daudé
2021-05-02 16:39 ` [PATCH v3 1/2] hw/timer/etraxfs_timer: Convert to 3-phase reset (Resettable interface) Philippe Mathieu-Daudé
2021-05-03 16:51 ` Edgar E. Iglesias [this message]
2021-05-02 16:39 ` [PATCH v3 2/2] hw/rtc/mc146818rtc: " Philippe Mathieu-Daudé
2021-05-03 16:52 ` Edgar E. Iglesias
2021-05-11 3:29 ` [PATCH v3 0/2] hw: Convert mc146818rtc & etraxfs_timer to 3-phase reset interface Philippe Mathieu-Daudé
2021-05-13 16:03 ` Laurent Vivier
2021-05-13 16:42 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210503165150.GD477672@toto \
--to=edgar.iglesias@gmail.com \
--cc=f4bug@amsat.org \
--cc=laurent@vivier.eu \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).