Allwinner SoCs provide different eFuse capacities: older SoCs have 16 to 256 bytes, while newer 64-bit SoCs (e.g. H618) provide up to 512 bytes of eFuse storage.
Add a "size" property (defaulting to 16 bytes for backward compatibility) and an internal storage buffer up to 512 bytes (AW_SID_SIZE_MAX). Signed-off-by: Khai Do <[email protected]> --- hw/misc/allwinner-sid.c | 8 +++++++- include/hw/misc/allwinner-sid.h | 8 ++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/hw/misc/allwinner-sid.c b/hw/misc/allwinner-sid.c index b5f827d4bd..0068b07eee 100644 --- a/hw/misc/allwinner-sid.c +++ b/hw/misc/allwinner-sid.c @@ -83,6 +83,9 @@ static void allwinner_sid_write(void *opaque, hwaddr offset, if (id <= sizeof(QemuUUID) - sizeof(s->rdkey)) { s->rdkey = ldl_be_p(&s->identifier.data[id]); + } else if (s->size >= sizeof(s->rdkey) && + id <= s->size - sizeof(s->rdkey)) { + s->rdkey = ldl_be_p(&s->storage[id]); } } s->control &= ~REG_PRCTL_WRITE; @@ -129,16 +132,19 @@ static void allwinner_sid_init(Object *obj) static const Property allwinner_sid_properties[] = { DEFINE_PROP_UUID_NODEFAULT("identifier", AwSidState, identifier), + DEFINE_PROP_UINT32("size", AwSidState, size, sizeof(QemuUUID)), }; static const VMStateDescription allwinner_sid_vmstate = { .name = "allwinner-sid", - .version_id = 1, + .version_id = 2, .minimum_version_id = 1, .fields = (const VMStateField[]) { VMSTATE_UINT32(control, AwSidState), VMSTATE_UINT32(rdkey, AwSidState), VMSTATE_UINT8_ARRAY_V(identifier.data, AwSidState, sizeof(QemuUUID), 1), + VMSTATE_UINT32_V(size, AwSidState, 2), + VMSTATE_UINT8_ARRAY_V(storage, AwSidState, AW_SID_SIZE_MAX, 2), VMSTATE_END_OF_LIST() } }; diff --git a/include/hw/misc/allwinner-sid.h b/include/hw/misc/allwinner-sid.h index cfa22a4d7f..da8c235c5d 100644 --- a/include/hw/misc/allwinner-sid.h +++ b/include/hw/misc/allwinner-sid.h @@ -24,6 +24,9 @@ #include "hw/core/sysbus.h" #include "qemu/uuid.h" +/** Maximum eFuse storage size supported */ +#define AW_SID_SIZE_MAX (512) + /** * Object model * @{ @@ -54,6 +57,11 @@ struct AwSidState { /** Stores the emulated device identifier */ QemuUUID identifier; + /** Size of eFuse storage */ + uint32_t size; + + /** eFuse storage buffer */ + uint8_t storage[AW_SID_SIZE_MAX]; }; #endif /* HW_MISC_ALLWINNER_SID_H */ -- 2.43.0
