From: Damien Hedde <damien.hedde@greensocs.com>
To: qemu-devel@nongnu.org
Cc: Damien Hedde <damien.hedde@greensocs.com>,
peter.maydell@linaro.org, edgar.iglesias@xilinx.com,
berrange@redhat.com, ehabkost@redhat.com,
mark.burton@greensocs.com, pbonzini@redhat.com,
philmd@redhat.com, david@gibson.dropbear.id.au
Subject: [Qemu-devel] [PATCH v4 08/10] hw/core/resettable: add support for warm reset
Date: Wed, 21 Aug 2019 18:33:39 +0200 [thread overview]
Message-ID: <20190821163341.16309-9-damien.hedde@greensocs.com> (raw)
In-Reply-To: <20190821163341.16309-1-damien.hedde@greensocs.com>
Add the RESET_TYPE_WARM reset type.
Expand the actual implementation to support several types.
I used values which can be or'ed together. This way we can what reset
has been triggered.
Documentation is added in a following patch.
Signed-off-by: Damien Hedde <damien.hedde@greensocs.com>
---
hw/core/resettable.c | 25 +++++++++++++++++++------
include/hw/resettable.h | 22 +++++++++++++++++-----
2 files changed, 36 insertions(+), 11 deletions(-)
diff --git a/hw/core/resettable.c b/hw/core/resettable.c
index b534c2c7a4..80674292b3 100644
--- a/hw/core/resettable.c
+++ b/hw/core/resettable.c
@@ -34,12 +34,17 @@ static void resettable_init_reset(Object *obj, ResetType type)
ResetState *s = rc->get_state(obj);
bool action_needed = false;
- /* Only take action if we really enter reset for the 1st time. */
+ /* ensure type is empty if no reset is in progress */
+ if (s->count == 0) {
+ s->type = 0;
+ }
+
/*
- * TODO: if adding more ResetType support, some additional checks
- * are probably needed here.
+ * Only take action if:
+ * + we are not already in cold reset,
+ * + and we enter a new type of reset.
*/
- if (s->count == 0) {
+ if ((s->type & RESET_TYPE_COLD) == 0 && (s->type & type) == 0) {
action_needed = true;
}
s->count += 1;
@@ -62,6 +67,7 @@ static void resettable_init_reset(Object *obj, ResetType type)
/* exec init phase */
if (action_needed) {
+ s->type |= type;
s->hold_phase_needed = true;
if (rc->phases.init) {
rc->phases.init(obj, type);
@@ -133,8 +139,7 @@ static void resettable_exit_reset(Object *obj)
void resettable_reset(Object *obj, ResetType type)
{
- /* TODO: change that when adding support for other reset types */
- assert(type == RESET_TYPE_COLD);
+ assert(type == RESET_TYPE_COLD || type == RESET_TYPE_WARM);
trace_resettable_reset(obj, type);
resettable_init_reset(obj, type);
resettable_hold_reset(obj);
@@ -154,6 +159,14 @@ bool resettable_is_resetting(Object *obj)
return (s->count > 0);
}
+ResetType resettable_get_type(Object *obj)
+{
+ ResettableClass *rc = RESETTABLE_GET_CLASS(obj);
+ ResetState *s = rc->get_state(obj);
+
+ return s->type;
+}
+
void resettable_class_set_parent_phases(ResettableClass *rc,
ResettableInitPhase init,
ResettableHoldPhase hold,
diff --git a/include/hw/resettable.h b/include/hw/resettable.h
index 5808c3c187..1e77cbd75b 100644
--- a/include/hw/resettable.h
+++ b/include/hw/resettable.h
@@ -12,15 +12,14 @@ typedef struct ResetState ResetState;
/**
* ResetType:
- * Types of reset.
+ * Types of reset, values can be OR'ed together.
*
* + Cold: reset resulting from a power cycle of the object.
- *
- * TODO: Support has to be added to handle more types. In particular,
- * ResetState structure needs to be expanded.
+ * + Warm: reset without power cycling.
*/
typedef enum ResetType {
- RESET_TYPE_COLD,
+ RESET_TYPE_COLD = 0x1,
+ RESET_TYPE_WARM = 0x2,
} ResetType;
/*
@@ -107,11 +106,13 @@ typedef struct ResettablePhases ResettablePhases;
*
* @count: Number of reset level the object is into. It is incremented when
* the reset operation starts and decremented when it finishes.
+ * @type: Type of the in-progress reset. Valid only when count is non-zero.
* @hold_phase_needed: flag which indicates that we need to invoke the 'hold'
* phase handler for this object.
*/
struct ResetState {
uint32_t count;
+ ResetType type;
bool hold_phase_needed;
};
@@ -123,6 +124,17 @@ struct ResetState {
*/
bool resettable_is_resetting(Object *obj);
+/**
+ * resettable_get_type:
+ * Return the current type of reset @obj is under.
+ *
+ * @obj must implement Resettable interface. Result is only valid if
+ * @resettable_is_resetting is true.
+ *
+ * Note: this return an OR'ed value of type if several reset were triggered
+ */
+ResetType resettable_get_type(Object *obj);
+
/**
* resettable_reset:
* Trigger a reset on a object @obj of type @type. @obj must implement
--
2.22.0
next prev parent reply other threads:[~2019-08-21 16:52 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-21 16:33 [Qemu-devel] [PATCH v4 00/10] Multi-phase reset mechanism Damien Hedde
2019-08-21 16:33 ` [Qemu-devel] [PATCH v4 01/10] add device_legacy_reset function to prepare for reset api change Damien Hedde
2019-08-24 9:50 ` David Gibson
2019-08-21 16:33 ` [Qemu-devel] [PATCH v4 02/10] hw/core: create Resettable QOM interface Damien Hedde
2019-09-11 8:06 ` David Gibson
2019-09-11 14:56 ` Damien Hedde
2019-09-18 9:11 ` David Gibson
2019-09-24 11:21 ` Damien Hedde
2019-09-27 13:07 ` Peter Maydell
2019-10-10 9:18 ` Damien Hedde
2024-04-11 13:43 ` Peter Maydell
2024-04-11 17:23 ` Philippe Mathieu-Daudé
2024-04-12 13:05 ` Peter Maydell
2024-04-12 13:38 ` Edgar E. Iglesias
2024-04-12 16:12 ` Peter Maydell
2019-08-21 16:33 ` [Qemu-devel] [PATCH v4 03/10] hw/core: add Resettable interface in Bus and Device classes Damien Hedde
2019-08-21 16:33 ` [Qemu-devel] [PATCH v4 04/10] docs/devel/reset.txt: create doc about Resettable interface Damien Hedde
2019-08-21 16:33 ` [Qemu-devel] [PATCH v4 05/10] vl.c: replace deprecated qbus_reset_all registration Damien Hedde
2019-08-21 16:33 ` [Qemu-devel] [PATCH v4 06/10] hw/s390x/ipl.c: " Damien Hedde
2019-08-21 16:33 ` [Qemu-devel] [PATCH v4 07/10] hw/core/qdev: replace deprecated device_legacy_reset when hotplugging device Damien Hedde
2019-08-21 16:33 ` Damien Hedde [this message]
2020-05-10 20:17 ` [PATCH v4 08/10] hw/core/resettable: add support for warm reset Philippe Mathieu-Daudé
2020-05-11 9:37 ` Damien Hedde
2019-08-21 16:33 ` [Qemu-devel] [PATCH v4 09/10] hw/core/: add warm reset helpers for devices and buses Damien Hedde
2019-08-21 16:33 ` [Qemu-devel] [PATCH v4 10/10] docs/devel/reset.txt: add documentation about warm reset Damien Hedde
2019-08-21 17:09 ` [Qemu-devel] [PATCH v4 00/10] Multi-phase reset mechanism no-reply
2019-09-10 10:33 ` Damien Hedde
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=20190821163341.16309-9-damien.hedde@greensocs.com \
--to=damien.hedde@greensocs.com \
--cc=berrange@redhat.com \
--cc=david@gibson.dropbear.id.au \
--cc=edgar.iglesias@xilinx.com \
--cc=ehabkost@redhat.com \
--cc=mark.burton@greensocs.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--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).