[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2 11/12] i2c: Add vmstate handling to the smbus
From: |
Dr. David Alan Gilbert |
Subject: |
Re: [Qemu-devel] [PATCH v2 11/12] i2c: Add vmstate handling to the smbus eeprom |
Date: |
Mon, 26 Nov 2018 17:30:31 +0000 |
User-agent: |
Mutt/1.10.1 (2018-07-13) |
* address@hidden (address@hidden) wrote:
> From: Corey Minyard <address@hidden>
>
> Transfer the state of the EEPROM on a migration. This way the
> data remains consistent on migration.
>
> This required moving the actual data to a separate array and
> using the data provided in the init function as a separate
> initialization array, since a pointer property has to be a
> void * and the array needs to be uint8_t[].
>
> Signed-off-by: Corey Minyard <address@hidden>
> Cc: Paolo Bonzini <address@hidden>
> Cc: Michael S. Tsirkin <address@hidden>
> Cc: Dr. David Alan Gilbert <address@hidden>
> Cc: Peter Maydell <address@hidden>
> ---
> hw/i2c/smbus_eeprom.c | 34 ++++++++++++++++++++++++++++++++--
> 1 file changed, 32 insertions(+), 2 deletions(-)
>
> diff --git a/hw/i2c/smbus_eeprom.c b/hw/i2c/smbus_eeprom.c
> index 8e9b734c09..942057dc10 100644
> --- a/hw/i2c/smbus_eeprom.c
> +++ b/hw/i2c/smbus_eeprom.c
> @@ -24,6 +24,7 @@
>
> #include "qemu/osdep.h"
> #include "hw/hw.h"
> +#include "hw/boards.h"
> #include "hw/i2c/i2c.h"
> #include "hw/i2c/smbus_slave.h"
> #include "hw/i2c/smbus_eeprom.h"
> @@ -39,8 +40,10 @@
>
> typedef struct SMBusEEPROMDevice {
> SMBusDevice smbusdev;
> - void *data;
> + uint8_t data[SMBUS_EEPROM_SIZE];
> + void *init_data;
> uint8_t offset;
> + bool accessed;
> } SMBusEEPROMDevice;
>
> static uint8_t eeprom_receive_byte(SMBusDevice *dev)
> @@ -49,6 +52,7 @@ static uint8_t eeprom_receive_byte(SMBusDevice *dev)
> uint8_t *data = eeprom->data;
> uint8_t val = data[eeprom->offset++];
>
> + eeprom->accessed = true;
> #ifdef DEBUG
> printf("eeprom_receive_byte: addr=0x%02x val=0x%02x\n",
> dev->i2c.address, val);
> @@ -61,6 +65,7 @@ static int eeprom_write_data(SMBusDevice *dev, uint8_t
> *buf, uint8_t len)
> SMBusEEPROMDevice *eeprom = SMBUS_EEPROM(dev);
> uint8_t *data = eeprom->data;
>
> + eeprom->accessed = true;
> #ifdef DEBUG
> printf("eeprom_write_byte: addr=0x%02x cmd=0x%02x val=0x%02x\n",
> dev->i2c.address, cmd, buf[0]);
> @@ -78,15 +83,39 @@ static int eeprom_write_data(SMBusDevice *dev, uint8_t
> *buf, uint8_t len)
> return 0;
> }
>
> +static bool smbus_eeprom_vmstate_needed(void *opaque)
> +{
> + MachineClass *mc = MACHINE_GET_CLASS(qdev_get_machine());
> + SMBusEEPROMDevice *eeprom = opaque;
> +
> + return (eeprom->accessed || smbus_vmstate_needed(&eeprom->smbusdev)) &&
> + !mc->smbus_no_migration_support;
> +}
> +
> +static const VMStateDescription vmstate_smbus_eeprom = {
> + .name = "smbus-eeprom",
> + .version_id = 1,
> + .minimum_version_id = 1,
> + .needed = smbus_eeprom_vmstate_needed,
> + .fields = (VMStateField[]) {
> + VMSTATE_SMBUS_DEVICE(smbusdev, SMBusEEPROMDevice),
> + VMSTATE_UINT8_ARRAY(data, SMBusEEPROMDevice, SMBUS_EEPROM_SIZE),
> + VMSTATE_UINT8(offset, SMBusEEPROMDevice),
> + VMSTATE_BOOL(accessed, SMBusEEPROMDevice),
> + VMSTATE_END_OF_LIST()
I think this is OK from the vmstate side of things.
Dave
> + }
> +};
> +
> static void smbus_eeprom_realize(DeviceState *dev, Error **errp)
> {
> SMBusEEPROMDevice *eeprom = SMBUS_EEPROM(dev);
>
> + memcpy(eeprom->data, eeprom->init_data, SMBUS_EEPROM_SIZE);
> eeprom->offset = 0;
> }
>
> static Property smbus_eeprom_properties[] = {
> - DEFINE_PROP_PTR("data", SMBusEEPROMDevice, data),
> + DEFINE_PROP_PTR("data", SMBusEEPROMDevice, init_data),
> DEFINE_PROP_END_OF_LIST(),
> };
>
> @@ -99,6 +128,7 @@ static void smbus_eeprom_class_initfn(ObjectClass *klass,
> void *data)
> sc->receive_byte = eeprom_receive_byte;
> sc->write_data = eeprom_write_data;
> dc->props = smbus_eeprom_properties;
> + dc->vmsd = &vmstate_smbus_eeprom;
> /* Reason: pointer property "data" */
> dc->user_creatable = false;
> }
> --
> 2.17.1
>
--
Dr. David Alan Gilbert / address@hidden / Manchester, UK
- [Qemu-devel] [PATCH v2 08/12] i2c: Add an SMBus vmstate structure, (continued)
- [Qemu-devel] [PATCH v2 08/12] i2c: Add an SMBus vmstate structure, minyard, 2018/11/15
- [Qemu-devel] [PATCH v2 07/12] i2c:pm_smbus: Fix state transfer, minyard, 2018/11/15
- [Qemu-devel] [PATCH v2 06/12] boards.h: Ignore migration for SMBus devices on older machines, minyard, 2018/11/15
- [Qemu-devel] [PATCH v2 10/12] i2c: Add a size constant for the smbus_eeprom size, minyard, 2018/11/15
- [Qemu-devel] [PATCH v2 09/12] i2c: Add normal type name and cast to smbus_eeprom.c, minyard, 2018/11/15
- [Qemu-devel] [PATCH v2 11/12] i2c: Add vmstate handling to the smbus eeprom, minyard, 2018/11/15
- Re: [Qemu-devel] [PATCH v2 11/12] i2c: Add vmstate handling to the smbus eeprom,
Dr. David Alan Gilbert <=
- [Qemu-devel] [PATCH v2 12/12] i2c: Add a reset function to smbus_eeprom, minyard, 2018/11/15
- Re: [Qemu-devel] [PATCH v2 00/12] RFC: Fix/add vmstate handling in some I2C code, Philippe Mathieu-Daudé, 2018/11/15