mirror of https://github.com/xqemu/xqemu.git
i2c:smbus_eeprom: Add vmstate handling to the smbus eeprom
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 <cminyard@mvista.com> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Michael S. Tsirkin <mst@redhat.com> Cc: Dr. David Alan Gilbert <dgilbert@redhat.com> Cc: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
parent
0cf487e5bd
commit
fd9df33f08
|
@ -26,6 +26,7 @@
|
||||||
#include "qemu/units.h"
|
#include "qemu/units.h"
|
||||||
#include "qapi/error.h"
|
#include "qapi/error.h"
|
||||||
#include "hw/hw.h"
|
#include "hw/hw.h"
|
||||||
|
#include "hw/boards.h"
|
||||||
#include "hw/i2c/i2c.h"
|
#include "hw/i2c/i2c.h"
|
||||||
#include "hw/i2c/smbus_slave.h"
|
#include "hw/i2c/smbus_slave.h"
|
||||||
#include "hw/i2c/smbus_eeprom.h"
|
#include "hw/i2c/smbus_eeprom.h"
|
||||||
|
@ -41,8 +42,10 @@
|
||||||
|
|
||||||
typedef struct SMBusEEPROMDevice {
|
typedef struct SMBusEEPROMDevice {
|
||||||
SMBusDevice smbusdev;
|
SMBusDevice smbusdev;
|
||||||
void *data;
|
uint8_t data[SMBUS_EEPROM_SIZE];
|
||||||
|
void *init_data;
|
||||||
uint8_t offset;
|
uint8_t offset;
|
||||||
|
bool accessed;
|
||||||
} SMBusEEPROMDevice;
|
} SMBusEEPROMDevice;
|
||||||
|
|
||||||
static uint8_t eeprom_receive_byte(SMBusDevice *dev)
|
static uint8_t eeprom_receive_byte(SMBusDevice *dev)
|
||||||
|
@ -51,6 +54,7 @@ static uint8_t eeprom_receive_byte(SMBusDevice *dev)
|
||||||
uint8_t *data = eeprom->data;
|
uint8_t *data = eeprom->data;
|
||||||
uint8_t val = data[eeprom->offset++];
|
uint8_t val = data[eeprom->offset++];
|
||||||
|
|
||||||
|
eeprom->accessed = true;
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
printf("eeprom_receive_byte: addr=0x%02x val=0x%02x\n",
|
printf("eeprom_receive_byte: addr=0x%02x val=0x%02x\n",
|
||||||
dev->i2c.address, val);
|
dev->i2c.address, val);
|
||||||
|
@ -63,6 +67,7 @@ static int eeprom_write_data(SMBusDevice *dev, uint8_t *buf, uint8_t len)
|
||||||
SMBusEEPROMDevice *eeprom = SMBUS_EEPROM(dev);
|
SMBusEEPROMDevice *eeprom = SMBUS_EEPROM(dev);
|
||||||
uint8_t *data = eeprom->data;
|
uint8_t *data = eeprom->data;
|
||||||
|
|
||||||
|
eeprom->accessed = true;
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
printf("eeprom_write_byte: addr=0x%02x cmd=0x%02x val=0x%02x\n",
|
printf("eeprom_write_byte: addr=0x%02x cmd=0x%02x val=0x%02x\n",
|
||||||
dev->i2c.address, buf[0], buf[1]);
|
dev->i2c.address, buf[0], buf[1]);
|
||||||
|
@ -80,15 +85,39 @@ static int eeprom_write_data(SMBusDevice *dev, uint8_t *buf, uint8_t len)
|
||||||
return 0;
|
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()
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
static void smbus_eeprom_realize(DeviceState *dev, Error **errp)
|
static void smbus_eeprom_realize(DeviceState *dev, Error **errp)
|
||||||
{
|
{
|
||||||
SMBusEEPROMDevice *eeprom = SMBUS_EEPROM(dev);
|
SMBusEEPROMDevice *eeprom = SMBUS_EEPROM(dev);
|
||||||
|
|
||||||
|
memcpy(eeprom->data, eeprom->init_data, SMBUS_EEPROM_SIZE);
|
||||||
eeprom->offset = 0;
|
eeprom->offset = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static Property smbus_eeprom_properties[] = {
|
static Property smbus_eeprom_properties[] = {
|
||||||
DEFINE_PROP_PTR("data", SMBusEEPROMDevice, data),
|
DEFINE_PROP_PTR("data", SMBusEEPROMDevice, init_data),
|
||||||
DEFINE_PROP_END_OF_LIST(),
|
DEFINE_PROP_END_OF_LIST(),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -101,6 +130,7 @@ static void smbus_eeprom_class_initfn(ObjectClass *klass, void *data)
|
||||||
sc->receive_byte = eeprom_receive_byte;
|
sc->receive_byte = eeprom_receive_byte;
|
||||||
sc->write_data = eeprom_write_data;
|
sc->write_data = eeprom_write_data;
|
||||||
dc->props = smbus_eeprom_properties;
|
dc->props = smbus_eeprom_properties;
|
||||||
|
dc->vmsd = &vmstate_smbus_eeprom;
|
||||||
/* Reason: pointer property "data" */
|
/* Reason: pointer property "data" */
|
||||||
dc->user_creatable = false;
|
dc->user_creatable = false;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue