From: Stefan Berger <stefanb@linux.ibm.com>
Extend the TIS buffer size to 8192 bytes and store the first 4096 bytes
using VMSTATE_PARTIAL_BUFFER and the rest using VMSTATE_BUFFER_START_MIDDLE
when necessary. It is necessary to store the buffer beyond original 4096
bytes when:
- the user has written more than 4096 bytes to the buffer
- the TPM 2 response is larger than 4096 bytes
Use the .needed function of the VMStateDescription interface to check
whether the bytes in the buffer beyond 4096 bytes needed to be saved.
The .pre_save function is called before the .needed function so that we
can be sure to have received any response packet from the TPM.
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
[ Arun Menon - Removed WIP tag and TODO for submission ]
Signed-off-by: Arun Menon <armenon@redhat.com>
---
hw/tpm/tpm_tis.h | 2 ++
hw/tpm/tpm_tis_common.c | 23 +++++++++++++++++++++++
hw/tpm/tpm_tis_i2c.c | 24 +++++++++++++++++++++++-
hw/tpm/tpm_tis_isa.c | 24 +++++++++++++++++++++++-
hw/tpm/tpm_tis_sysbus.c | 24 +++++++++++++++++++++++-
5 files changed, 94 insertions(+), 3 deletions(-)
diff --git a/hw/tpm/tpm_tis.h b/hw/tpm/tpm_tis.h
index 184632ff66..d35c332287 100644
--- a/hw/tpm/tpm_tis.h
+++ b/hw/tpm/tpm_tis.h
@@ -90,4 +90,6 @@ uint32_t tpm_tis_read_data(TPMState *s, hwaddr addr, unsigned size);
void tpm_tis_write_data(TPMState *s, hwaddr addr, uint64_t val, uint32_t size);
uint16_t tpm_tis_get_checksum(TPMState *s);
+bool tpm_tis_ext_buffer_migration_needed(struct TPMState *s);
+
#endif /* TPM_TPM_TIS_H */
diff --git a/hw/tpm/tpm_tis_common.c b/hw/tpm/tpm_tis_common.c
index f594b15b8a..dffb0a411e 100644
--- a/hw/tpm/tpm_tis_common.c
+++ b/hw/tpm/tpm_tis_common.c
@@ -890,3 +890,26 @@ const VMStateDescription vmstate_locty = {
}
};
+bool tpm_tis_ext_buffer_migration_needed(struct TPMState *s)
+{
+ if (!TPM_TIS_IS_VALID_LOCTY(s->active_locty)) {
+ return false;
+ }
+
+ switch (s->loc[s->active_locty].state) {
+ case TPM_TIS_STATE_IDLE:
+ case TPM_TIS_STATE_READY:
+ return false;
+ case TPM_TIS_STATE_RECEPTION:
+ return s->rw_offset >= 4096;
+ case TPM_TIS_STATE_EXECUTION:
+ /*
+ * TPM is executing: we cannot know the size of TPM response.
+ * .pre_save must have been called before (should never get here).
+ */
+ return false;
+ case TPM_TIS_STATE_COMPLETION:
+ return (tpm_cmd_get_size(&s->buffer) >= 4096);
+ }
+ return false;
+}
diff --git a/hw/tpm/tpm_tis_i2c.c b/hw/tpm/tpm_tis_i2c.c
index 9f13e0ec12..a01df7e5a0 100644
--- a/hw/tpm/tpm_tis_i2c.c
+++ b/hw/tpm/tpm_tis_i2c.c
@@ -110,13 +110,31 @@ static int tpm_tis_i2c_post_load(void *opaque, int version_id)
return 0;
}
+static bool tpm_tis_ext_buffer_migration_needed_i2c(void *opaque)
+{
+ TPMStateI2C *i2cst = opaque;
+
+ return tpm_tis_ext_buffer_migration_needed(&i2cst->state);
+}
+
+static const VMStateDescription vmstate_tpm_tis_ext_buffer_i2c = {
+ .name = "tpm-tis/ext_buffer",
+ .version_id = 0,
+ .needed = tpm_tis_ext_buffer_migration_needed_i2c,
+ .pre_save = tpm_tis_i2c_pre_save,
+ .fields = (const VMStateField[]) {
+ VMSTATE_BUFFER_START_MIDDLE(state.buffer, TPMStateI2C, 4096),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
static const VMStateDescription vmstate_tpm_tis_i2c = {
.name = "tpm-tis-i2c",
.version_id = 0,
.pre_save = tpm_tis_i2c_pre_save,
.post_load = tpm_tis_i2c_post_load,
.fields = (const VMStateField[]) {
- VMSTATE_BUFFER(state.buffer, TPMStateI2C),
+ VMSTATE_PARTIAL_BUFFER(state.buffer, TPMStateI2C, 4096),
VMSTATE_UINT16(state.rw_offset, TPMStateI2C),
VMSTATE_UINT8(state.active_locty, TPMStateI2C),
VMSTATE_UINT8(state.aborting_locty, TPMStateI2C),
@@ -133,6 +151,10 @@ static const VMStateDescription vmstate_tpm_tis_i2c = {
VMSTATE_UINT8(csum_enable, TPMStateI2C),
VMSTATE_END_OF_LIST()
+ },
+ .subsections = (const VMStateDescription *const[]) {
+ &vmstate_tpm_tis_ext_buffer_i2c,
+ NULL,
}
};
diff --git a/hw/tpm/tpm_tis_isa.c b/hw/tpm/tpm_tis_isa.c
index 61e95434f5..73038f1a10 100644
--- a/hw/tpm/tpm_tis_isa.c
+++ b/hw/tpm/tpm_tis_isa.c
@@ -49,12 +49,30 @@ static int tpm_tis_pre_save_isa(void *opaque)
return tpm_tis_pre_save(&isadev->state);
}
+static bool tpm_tis_ext_buffer_migration_needed_isa(void *opaque)
+{
+ TPMStateISA *isadev = opaque;
+
+ return tpm_tis_ext_buffer_migration_needed(&isadev->state);
+}
+
+static const VMStateDescription vmstate_tpm_tis_ext_buffer_isa = {
+ .name = "tpm-tis/ext_buffer",
+ .version_id = 0,
+ .needed = tpm_tis_ext_buffer_migration_needed_isa,
+ .pre_save = tpm_tis_pre_save_isa,
+ .fields = (const VMStateField[]) {
+ VMSTATE_BUFFER_START_MIDDLE(state.buffer, TPMStateISA, 4096),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
static const VMStateDescription vmstate_tpm_tis_isa = {
.name = "tpm-tis",
.version_id = 0,
.pre_save = tpm_tis_pre_save_isa,
.fields = (const VMStateField[]) {
- VMSTATE_BUFFER(state.buffer, TPMStateISA),
+ VMSTATE_PARTIAL_BUFFER(state.buffer, TPMStateISA, 4096),
VMSTATE_UINT16(state.rw_offset, TPMStateISA),
VMSTATE_UINT8(state.active_locty, TPMStateISA),
VMSTATE_UINT8(state.aborting_locty, TPMStateISA),
@@ -64,6 +82,10 @@ static const VMStateDescription vmstate_tpm_tis_isa = {
vmstate_locty, TPMLocality),
VMSTATE_END_OF_LIST()
+ },
+ .subsections = (const VMStateDescription *const[]) {
+ &vmstate_tpm_tis_ext_buffer_isa,
+ NULL,
}
};
diff --git a/hw/tpm/tpm_tis_sysbus.c b/hw/tpm/tpm_tis_sysbus.c
index e9372e7316..86fc5a592c 100644
--- a/hw/tpm/tpm_tis_sysbus.c
+++ b/hw/tpm/tpm_tis_sysbus.c
@@ -48,12 +48,30 @@ static int tpm_tis_pre_save_sysbus(void *opaque)
return tpm_tis_pre_save(&sbdev->state);
}
+static bool tpm_tis_ext_buffer_migration_needed_sysbus(void *opaque)
+{
+ TPMStateSysBus *sbdev = opaque;
+
+ return tpm_tis_ext_buffer_migration_needed(&sbdev->state);
+}
+
+static const VMStateDescription vmstate_tpm_tis_ext_buffer_sysbus = {
+ .name = "tpm-tis/ext_buffer",
+ .version_id = 0,
+ .needed = tpm_tis_ext_buffer_migration_needed_sysbus,
+ .pre_save = tpm_tis_pre_save_sysbus,
+ .fields = (const VMStateField[]) {
+ VMSTATE_BUFFER_START_MIDDLE(state.buffer, TPMStateSysBus, 4096),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
static const VMStateDescription vmstate_tpm_tis_sysbus = {
.name = "tpm-tis",
.version_id = 0,
.pre_save = tpm_tis_pre_save_sysbus,
.fields = (const VMStateField[]) {
- VMSTATE_BUFFER(state.buffer, TPMStateSysBus),
+ VMSTATE_PARTIAL_BUFFER(state.buffer, TPMStateSysBus, 4096),
VMSTATE_UINT16(state.rw_offset, TPMStateSysBus),
VMSTATE_UINT8(state.active_locty, TPMStateSysBus),
VMSTATE_UINT8(state.aborting_locty, TPMStateSysBus),
@@ -63,6 +81,10 @@ static const VMStateDescription vmstate_tpm_tis_sysbus = {
0, vmstate_locty, TPMLocality),
VMSTATE_END_OF_LIST()
+ },
+ .subsections = (const VMStateDescription *const[]) {
+ &vmstate_tpm_tis_ext_buffer_sysbus,
+ NULL,
}
};
--
2.53.0