From: minyard@acm.org
To: Peter Maydell <peter.maydell@linaro.org>
Cc: QEMU Developers <qemu-devel@nongnu.org>,
minyard@acm.org, Corey Minyard <cminyard@mvista.com>
Subject: [Qemu-devel] [PULL 18/19] i2c:smbus_eeprom: Add a reset function to smbus_eeprom
Date: Thu, 28 Feb 2019 12:17:09 -0600 [thread overview]
Message-ID: <20190228181710.2477-19-minyard@acm.org> (raw)
In-Reply-To: <20190228181710.2477-1-minyard@acm.org>
From: Corey Minyard <cminyard@mvista.com>
Reset the contents to init data and reset the offset on a machine
reset.
Signed-off-by: Corey Minyard <cminyard@mvista.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/i2c/smbus_eeprom.c | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/hw/i2c/smbus_eeprom.c b/hw/i2c/smbus_eeprom.c
index 5b10c31ae7..0ba5763fc2 100644
--- a/hw/i2c/smbus_eeprom.c
+++ b/hw/i2c/smbus_eeprom.c
@@ -108,7 +108,17 @@ static const VMStateDescription vmstate_smbus_eeprom = {
}
};
-static void smbus_eeprom_realize(DeviceState *dev, Error **errp)
+/*
+ * Reset the EEPROM contents to the initial state on a reset. This
+ * isn't really how an EEPROM works, of course, but the general
+ * principle of QEMU is to restore function on reset to what it would
+ * be if QEMU was stopped and started.
+ *
+ * The proper thing to do would be to have a backing blockdev to hold
+ * the contents and restore that on startup, and not do this on reset.
+ * But until that time, act as if we had been stopped and restarted.
+ */
+static void smbus_eeprom_reset(DeviceState *dev)
{
SMBusEEPROMDevice *eeprom = SMBUS_EEPROM(dev);
@@ -116,6 +126,11 @@ static void smbus_eeprom_realize(DeviceState *dev, Error **errp)
eeprom->offset = 0;
}
+static void smbus_eeprom_realize(DeviceState *dev, Error **errp)
+{
+ smbus_eeprom_reset(dev);
+}
+
static Property smbus_eeprom_properties[] = {
DEFINE_PROP_PTR("data", SMBusEEPROMDevice, init_data),
DEFINE_PROP_END_OF_LIST(),
@@ -127,6 +142,7 @@ static void smbus_eeprom_class_initfn(ObjectClass *klass, void *data)
SMBusDeviceClass *sc = SMBUS_DEVICE_CLASS(klass);
dc->realize = smbus_eeprom_realize;
+ dc->reset = smbus_eeprom_reset;
sc->receive_byte = eeprom_receive_byte;
sc->write_data = eeprom_write_data;
dc->props = smbus_eeprom_properties;
--
2.17.1
next prev parent reply other threads:[~2019-02-28 18:18 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-28 18:16 [Qemu-devel] [PULL 00/19] Fix/add vmstate handling in some I2C code minyard
2019-02-28 18:16 ` [Qemu-devel] [PULL 01/19] i2c: Split smbus into parts minyard
2019-02-28 18:16 ` [Qemu-devel] [PULL 02/19] i2c: have I2C receive operation return uint8_t minyard
2019-02-28 18:16 ` [Qemu-devel] [PULL 03/19] arm:i2c: Don't mask return from i2c_recv() minyard
2019-02-28 18:16 ` [Qemu-devel] [PULL 04/19] i2c: Don't check return value " minyard
2019-02-28 18:16 ` [Qemu-devel] [PULL 05/19] i2c:smbus: Correct the working of quick commands minyard
2019-02-28 18:16 ` [Qemu-devel] [PULL 06/19] i2c:smbus: Simplify write operation minyard
2019-02-28 18:16 ` [Qemu-devel] [PULL 07/19] i2c:smbus: Simplify read handling minyard
2019-02-28 18:16 ` [Qemu-devel] [PULL 08/19] i2c:smbus_eeprom: Get rid of the quick command minyard
2019-02-28 18:17 ` [Qemu-devel] [PULL 09/19] i2c:smbus: Make white space in switch statements consistent minyard
2019-02-28 18:17 ` [Qemu-devel] [PULL 10/19] boards.h: Ignore migration for SMBus devices on older machines minyard
2019-02-28 18:17 ` [Qemu-devel] [PULL 11/19] i2c:pm_smbus: Fix pm_smbus handling of I2C block read minyard
2019-02-28 18:17 ` [Qemu-devel] [PULL 12/19] migration: Add a VMSTATE_BOOL_TEST() macro minyard
2019-02-28 18:17 ` [Qemu-devel] [PULL 13/19] i2c:pm_smbus: Fix state transfer minyard
2019-02-28 18:17 ` [Qemu-devel] [PULL 14/19] i2c:smbus_slave: Add an SMBus vmstate structure minyard
2019-02-28 18:17 ` [Qemu-devel] [PULL 15/19] i2c:smbus_eeprom: Add normal type name and cast to smbus_eeprom.c minyard
2019-02-28 18:17 ` [Qemu-devel] [PULL 16/19] i2c:smbus_eeprom: Add a size constant for the smbus_eeprom size minyard
2019-02-28 18:17 ` [Qemu-devel] [PULL 17/19] i2c:smbus_eeprom: Add vmstate handling to the smbus eeprom minyard
2019-02-28 18:17 ` minyard [this message]
2019-02-28 18:17 ` [Qemu-devel] [PULL 19/19] i2c: Verify that the count passed in to smbus_eeprom_init() is valid minyard
2019-03-01 14:23 ` [Qemu-devel] [PULL 00/19] Fix/add vmstate handling in some I2C code Peter Maydell
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=20190228181710.2477-19-minyard@acm.org \
--to=minyard@acm.org \
--cc=cminyard@mvista.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).