- Ignore writes to CNTP_CTL_EL0 on HVF ARM (Alexander)
- Add '-d invalid_mem' logging option (Zoltan)
- Create QOM containers explicitly (Peter)
- Rename sysemu/ -> system/ (Philippe)
- Re-orderning of include/exec/ headers (Philippe)
Move a lot of declarations from these legacy mixed bag headers:
. "exec/cpu-all.h"
. "exec/cpu-common.h"
. "exec/cpu-defs.h"
. "exec/exec-all.h"
. "exec/translate-all"
to these more specific ones:
. "exec/page-protection.h"
. "exec/translation-block.h"
. "user/cpu_loop.h"
. "user/guest-host.h"
. "user/page-protection.h"
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEE+qvnXhKRciHc/Wuy4+MsLN6twN4FAmdlnyAACgkQ4+MsLN6t
wN6mBw//QFWi7CrU+bb8KMM53kOU9C507tjn99LLGFb5or73/umDsw6eo/b8DHBt
KIwGLgATel42oojKfNKavtAzLK5rOrywpboPDpa3SNeF1onW+99NGJ52LQUqIX6K
A6bS0fPdGG9ZzEuPpbjDXlp++0yhDcdSgZsS42fEsT7Dyj5gzJYlqpqhiXGqpsn8
4Y0UMxSL21K3HEexlzw2hsoOBFA3tUm2ujNDhNkt8QASr85yQVLCypABJnuoe///
5Ojl5wTBeDwhANET0rhwHK8eIYaNboiM9fHopJYhvyw1bz6yAu9jQwzF/MrL3s/r
xa4OBHBy5mq2hQV9Shcl3UfCQdk/vDaYaWpgzJGX8stgMGYfnfej1SIl8haJIfcl
VMX8/jEFdYbjhO4AeGRYcBzWjEJymkDJZoiSWp2NuEDi6jqIW+7yW1q0Rnlg9lay
ShAqLK5Pv4zUw3t0Jy3qv9KSW8sbs6PQxtzXjk8p97rTf76BJ2pF8sv1tVzmsidP
9L92Hv5O34IqzBu2oATOUZYJk89YGmTIUSLkpT7asJZpBLwNM2qLp5jO00WVU0Sd
+kAn324guYPkko/TVnjC/AY7CMu55EOtD9NU35k3mUAnxXT9oDUeL4NlYtfgrJx6
x1Nzr2FkS68+wlPAFKNSSU5lTjsjNaFM0bIJ4LCNtenJVP+SnRo=
=cjz8
-----END PGP SIGNATURE-----
Merge tag 'exec-20241220' of https://github.com/philmd/qemu into staging
Accel & Exec patch queue
- Ignore writes to CNTP_CTL_EL0 on HVF ARM (Alexander)
- Add '-d invalid_mem' logging option (Zoltan)
- Create QOM containers explicitly (Peter)
- Rename sysemu/ -> system/ (Philippe)
- Re-orderning of include/exec/ headers (Philippe)
Move a lot of declarations from these legacy mixed bag headers:
. "exec/cpu-all.h"
. "exec/cpu-common.h"
. "exec/cpu-defs.h"
. "exec/exec-all.h"
. "exec/translate-all"
to these more specific ones:
. "exec/page-protection.h"
. "exec/translation-block.h"
. "user/cpu_loop.h"
. "user/guest-host.h"
. "user/page-protection.h"
# -----BEGIN PGP SIGNATURE-----
#
# iQIzBAABCAAdFiEE+qvnXhKRciHc/Wuy4+MsLN6twN4FAmdlnyAACgkQ4+MsLN6t
# wN6mBw//QFWi7CrU+bb8KMM53kOU9C507tjn99LLGFb5or73/umDsw6eo/b8DHBt
# KIwGLgATel42oojKfNKavtAzLK5rOrywpboPDpa3SNeF1onW+99NGJ52LQUqIX6K
# A6bS0fPdGG9ZzEuPpbjDXlp++0yhDcdSgZsS42fEsT7Dyj5gzJYlqpqhiXGqpsn8
# 4Y0UMxSL21K3HEexlzw2hsoOBFA3tUm2ujNDhNkt8QASr85yQVLCypABJnuoe///
# 5Ojl5wTBeDwhANET0rhwHK8eIYaNboiM9fHopJYhvyw1bz6yAu9jQwzF/MrL3s/r
# xa4OBHBy5mq2hQV9Shcl3UfCQdk/vDaYaWpgzJGX8stgMGYfnfej1SIl8haJIfcl
# VMX8/jEFdYbjhO4AeGRYcBzWjEJymkDJZoiSWp2NuEDi6jqIW+7yW1q0Rnlg9lay
# ShAqLK5Pv4zUw3t0Jy3qv9KSW8sbs6PQxtzXjk8p97rTf76BJ2pF8sv1tVzmsidP
# 9L92Hv5O34IqzBu2oATOUZYJk89YGmTIUSLkpT7asJZpBLwNM2qLp5jO00WVU0Sd
# +kAn324guYPkko/TVnjC/AY7CMu55EOtD9NU35k3mUAnxXT9oDUeL4NlYtfgrJx6
# x1Nzr2FkS68+wlPAFKNSSU5lTjsjNaFM0bIJ4LCNtenJVP+SnRo=
# =cjz8
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri 20 Dec 2024 11:45:20 EST
# gpg: using RSA key FAABE75E12917221DCFD6BB2E3E32C2CDEADC0DE
# gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: FAAB E75E 1291 7221 DCFD 6BB2 E3E3 2C2C DEAD C0DE
* tag 'exec-20241220' of https://github.com/philmd/qemu: (59 commits)
util/qemu-timer: fix indentation
meson: Do not define CONFIG_DEVICES on user emulation
system/accel-ops: Remove unnecessary 'exec/cpu-common.h' header
system/numa: Remove unnecessary 'exec/cpu-common.h' header
hw/xen: Remove unnecessary 'exec/cpu-common.h' header
target/mips: Drop left-over comment about Jazz machine
target/mips: Remove tswap() calls in semihosting uhi_fstat_cb()
target/xtensa: Remove tswap() calls in semihosting simcall() helper
accel/tcg: Un-inline translator_is_same_page()
accel/tcg: Include missing 'exec/translation-block.h' header
accel/tcg: Move tcg_cflags_has/set() to 'exec/translation-block.h'
accel/tcg: Restrict curr_cflags() declaration to 'internal-common.h'
qemu/coroutine: Include missing 'qemu/atomic.h' header
exec/translation-block: Include missing 'qemu/atomic.h' header
accel/tcg: Declare cpu_loop_exit_requested() in 'exec/cpu-common.h'
exec/cpu-all: Include 'cpu.h' earlier so MMU_USER_IDX is always defined
target/sparc: Move sparc_restore_state_to_opc() to cpu.c
target/sparc: Uninline cpu_get_tb_cpu_state()
target/loongarch: Declare loongarch_cpu_dump_state() locally
user: Move various declarations out of 'exec/exec-all.h'
...
Conflicts:
hw/char/riscv_htif.c
hw/intc/riscv_aplic.c
target/s390x/cpu.c
Apply sysemu header path changes to not in the pull request.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
274 lines
6.6 KiB
C
274 lines
6.6 KiB
C
/*
|
|
* *AT24C* series I2C EEPROM
|
|
*
|
|
* Copyright (c) 2015 Michael Davidsaver
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2. See
|
|
* the LICENSE file in the top-level directory.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
|
|
#include "qapi/error.h"
|
|
#include "qemu/module.h"
|
|
#include "hw/i2c/i2c.h"
|
|
#include "hw/nvram/eeprom_at24c.h"
|
|
#include "hw/qdev-properties.h"
|
|
#include "hw/qdev-properties-system.h"
|
|
#include "system/block-backend.h"
|
|
#include "qom/object.h"
|
|
|
|
/* #define DEBUG_AT24C */
|
|
|
|
#ifdef DEBUG_AT24C
|
|
#define DPRINTK(FMT, ...) printf(TYPE_AT24C_EE " : " FMT, ## __VA_ARGS__)
|
|
#else
|
|
#define DPRINTK(FMT, ...) do {} while (0)
|
|
#endif
|
|
|
|
#define ERR(FMT, ...) fprintf(stderr, TYPE_AT24C_EE " : " FMT, \
|
|
## __VA_ARGS__)
|
|
|
|
#define TYPE_AT24C_EE "at24c-eeprom"
|
|
typedef struct EEPROMState EEPROMState;
|
|
DECLARE_INSTANCE_CHECKER(EEPROMState, AT24C_EE,
|
|
TYPE_AT24C_EE)
|
|
|
|
struct EEPROMState {
|
|
I2CSlave parent_obj;
|
|
|
|
/* address counter */
|
|
uint16_t cur;
|
|
/* total size in bytes */
|
|
uint32_t rsize;
|
|
/*
|
|
* address byte number
|
|
* for 24c01, 24c02 size <= 256 byte, use only 1 byte
|
|
* otherwise size > 256, use 2 byte
|
|
*/
|
|
uint8_t asize;
|
|
|
|
bool writable;
|
|
/* cells changed since last START? */
|
|
bool changed;
|
|
/* during WRITE, # of address bytes transferred */
|
|
uint8_t haveaddr;
|
|
|
|
uint8_t *mem;
|
|
|
|
BlockBackend *blk;
|
|
|
|
const uint8_t *init_rom;
|
|
uint32_t init_rom_size;
|
|
};
|
|
|
|
static
|
|
int at24c_eeprom_event(I2CSlave *s, enum i2c_event event)
|
|
{
|
|
EEPROMState *ee = AT24C_EE(s);
|
|
|
|
switch (event) {
|
|
case I2C_START_SEND:
|
|
case I2C_FINISH:
|
|
ee->haveaddr = 0;
|
|
/* fallthrough */
|
|
case I2C_START_RECV:
|
|
DPRINTK("clear\n");
|
|
if (ee->blk && ee->changed) {
|
|
int ret = blk_pwrite(ee->blk, 0, ee->rsize, ee->mem, 0);
|
|
if (ret < 0) {
|
|
ERR(TYPE_AT24C_EE
|
|
" : failed to write backing file\n");
|
|
}
|
|
DPRINTK("Wrote to backing file\n");
|
|
}
|
|
ee->changed = false;
|
|
break;
|
|
case I2C_NACK:
|
|
break;
|
|
default:
|
|
return -1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static
|
|
uint8_t at24c_eeprom_recv(I2CSlave *s)
|
|
{
|
|
EEPROMState *ee = AT24C_EE(s);
|
|
uint8_t ret;
|
|
|
|
/*
|
|
* If got the byte address but not completely with address size
|
|
* will return the invalid value
|
|
*/
|
|
if (ee->haveaddr > 0 && ee->haveaddr < ee->asize) {
|
|
return 0xff;
|
|
}
|
|
|
|
ret = ee->mem[ee->cur];
|
|
|
|
ee->cur = (ee->cur + 1u) % ee->rsize;
|
|
DPRINTK("Recv %02x %c\n", ret, ret);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static
|
|
int at24c_eeprom_send(I2CSlave *s, uint8_t data)
|
|
{
|
|
EEPROMState *ee = AT24C_EE(s);
|
|
|
|
if (ee->haveaddr < ee->asize) {
|
|
ee->cur <<= 8;
|
|
ee->cur |= data;
|
|
ee->haveaddr++;
|
|
if (ee->haveaddr == ee->asize) {
|
|
ee->cur %= ee->rsize;
|
|
DPRINTK("Set pointer %04x\n", ee->cur);
|
|
}
|
|
|
|
} else {
|
|
if (ee->writable) {
|
|
DPRINTK("Send %02x\n", data);
|
|
ee->mem[ee->cur] = data;
|
|
ee->changed = true;
|
|
} else {
|
|
DPRINTK("Send error %02x read-only\n", data);
|
|
}
|
|
ee->cur = (ee->cur + 1u) % ee->rsize;
|
|
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
I2CSlave *at24c_eeprom_init(I2CBus *bus, uint8_t address, uint32_t rom_size)
|
|
{
|
|
return at24c_eeprom_init_rom(bus, address, rom_size, NULL, 0);
|
|
}
|
|
|
|
I2CSlave *at24c_eeprom_init_rom(I2CBus *bus, uint8_t address, uint32_t rom_size,
|
|
const uint8_t *init_rom, uint32_t init_rom_size)
|
|
{
|
|
EEPROMState *s;
|
|
|
|
s = AT24C_EE(i2c_slave_new(TYPE_AT24C_EE, address));
|
|
|
|
qdev_prop_set_uint32(DEVICE(s), "rom-size", rom_size);
|
|
|
|
/* TODO: Model init_rom with QOM properties. */
|
|
s->init_rom = init_rom;
|
|
s->init_rom_size = init_rom_size;
|
|
|
|
i2c_slave_realize_and_unref(I2C_SLAVE(s), bus, &error_abort);
|
|
|
|
return I2C_SLAVE(s);
|
|
}
|
|
|
|
static void at24c_eeprom_realize(DeviceState *dev, Error **errp)
|
|
{
|
|
EEPROMState *ee = AT24C_EE(dev);
|
|
|
|
if (ee->init_rom_size > ee->rsize) {
|
|
error_setg(errp, "%s: init rom is larger than rom: %u > %u",
|
|
TYPE_AT24C_EE, ee->init_rom_size, ee->rsize);
|
|
return;
|
|
}
|
|
|
|
if (ee->blk) {
|
|
int64_t len = blk_getlength(ee->blk);
|
|
|
|
if (len != ee->rsize) {
|
|
error_setg(errp, "%s: Backing file size %" PRId64 " != %u",
|
|
TYPE_AT24C_EE, len, ee->rsize);
|
|
return;
|
|
}
|
|
|
|
if (blk_set_perm(ee->blk, BLK_PERM_CONSISTENT_READ | BLK_PERM_WRITE,
|
|
BLK_PERM_ALL, &error_fatal) < 0)
|
|
{
|
|
error_setg(errp, "%s: Backing file incorrect permission",
|
|
TYPE_AT24C_EE);
|
|
return;
|
|
}
|
|
}
|
|
|
|
ee->mem = g_malloc0(ee->rsize);
|
|
memset(ee->mem, 0, ee->rsize);
|
|
|
|
if (ee->init_rom) {
|
|
memcpy(ee->mem, ee->init_rom, MIN(ee->init_rom_size, ee->rsize));
|
|
}
|
|
|
|
if (ee->blk) {
|
|
int ret = blk_pread(ee->blk, 0, ee->rsize, ee->mem, 0);
|
|
|
|
if (ret < 0) {
|
|
ERR(TYPE_AT24C_EE
|
|
" : Failed initial sync with backing file\n");
|
|
}
|
|
DPRINTK("Reset read backing file\n");
|
|
}
|
|
|
|
/*
|
|
* If address size didn't define with property set
|
|
* value is 0 as default, setting it by Rom size detecting.
|
|
*/
|
|
if (ee->asize == 0) {
|
|
if (ee->rsize <= 256) {
|
|
ee->asize = 1;
|
|
} else {
|
|
ee->asize = 2;
|
|
}
|
|
}
|
|
}
|
|
|
|
static
|
|
void at24c_eeprom_reset(DeviceState *state)
|
|
{
|
|
EEPROMState *ee = AT24C_EE(state);
|
|
|
|
ee->changed = false;
|
|
ee->cur = 0;
|
|
ee->haveaddr = 0;
|
|
}
|
|
|
|
static const Property at24c_eeprom_props[] = {
|
|
DEFINE_PROP_UINT32("rom-size", EEPROMState, rsize, 0),
|
|
DEFINE_PROP_UINT8("address-size", EEPROMState, asize, 0),
|
|
DEFINE_PROP_BOOL("writable", EEPROMState, writable, true),
|
|
DEFINE_PROP_DRIVE("drive", EEPROMState, blk),
|
|
};
|
|
|
|
static
|
|
void at24c_eeprom_class_init(ObjectClass *klass, void *data)
|
|
{
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
I2CSlaveClass *k = I2C_SLAVE_CLASS(klass);
|
|
|
|
dc->realize = &at24c_eeprom_realize;
|
|
k->event = &at24c_eeprom_event;
|
|
k->recv = &at24c_eeprom_recv;
|
|
k->send = &at24c_eeprom_send;
|
|
|
|
device_class_set_props(dc, at24c_eeprom_props);
|
|
device_class_set_legacy_reset(dc, at24c_eeprom_reset);
|
|
}
|
|
|
|
static
|
|
const TypeInfo at24c_eeprom_type = {
|
|
.name = TYPE_AT24C_EE,
|
|
.parent = TYPE_I2C_SLAVE,
|
|
.instance_size = sizeof(EEPROMState),
|
|
.class_size = sizeof(I2CSlaveClass),
|
|
.class_init = at24c_eeprom_class_init,
|
|
};
|
|
|
|
static void at24c_eeprom_register(void)
|
|
{
|
|
type_register_static(&at24c_eeprom_type);
|
|
}
|
|
|
|
type_init(at24c_eeprom_register)
|