[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 13/13] tpm_tis: extend TPM TIS with state migrati
From: |
Stefan Berger |
Subject: |
[Qemu-devel] [PATCH v3 13/13] tpm_tis: extend TPM TIS with state migration support |
Date: |
Fri, 10 Nov 2017 09:11:52 -0500 |
Extend the TPM TIS interface with state migration support.
We need to synchronize with the backend thread to make sure that a command
being processed by the external TPM emulator has completed and its
response been received. In case the bottom half did not run, we run the
function it is supposed to run.
Since only 1 locality can be active at any time we only need
to store the command buffer of that active locality.
Signed-off-by: Stefan Berger <address@hidden>
---
hw/tpm/tpm_tis.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 file changed, 68 insertions(+), 6 deletions(-)
diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c
index 86e9a92..c0a0204 100644
--- a/hw/tpm/tpm_tis.c
+++ b/hw/tpm/tpm_tis.c
@@ -393,12 +393,8 @@ static void tpm_tis_prep_abort(TPMState *s, uint8_t locty,
uint8_t newlocty)
tpm_tis_abort(s, locty);
}
-/*
- * Callback from the TPM to indicate that the response was received.
- */
-static void tpm_tis_request_completed(TPMIf *ti)
+static void _tpm_tis_request_completed(TPMState *s)
{
- TPMState *s = TPM(ti);
uint8_t locty = s->cmd.locty;
uint8_t l;
@@ -431,6 +427,14 @@ static void tpm_tis_request_completed(TPMIf *ti)
}
/*
+ * Callback from the TPM to indicate that the response was received.
+ */
+static void tpm_tis_request_completed(TPMIf *ti)
+{
+ _tpm_tis_request_completed(TPM(ti));
+}
+
+/*
* Read a byte of response data
*/
static uint32_t tpm_tis_data_read(TPMState *s, uint8_t locty)
@@ -1012,9 +1016,67 @@ static void tpm_tis_reset(DeviceState *dev)
tpm_tis_do_startup_tpm(s, s->be_buffer_size);
}
+/* persistent state handling */
+
+static int tpm_tis_pre_save(void *opaque)
+{
+ TPMState *s = opaque;
+ uint8_t locty = s->active_locty;
+
+ DPRINTF("tpm_tis: suspend: locty = %d : rw_offset = %u\n",
+ locty, s->rw_offset);
+#ifdef DEBUG_TIS
+ tpm_tis_dump_state(opaque, 0);
+#endif
+
+ /*
+ * Synchronize with backend completion.
+ */
+ tpm_backend_wait_cmd_completed(s->be_driver);
+
+ if (TPM_TIS_IS_VALID_LOCTY(locty) &&
+ s->loc[locty].state == TPM_TIS_STATE_EXECUTION) {
+ /* bottom half did not run - run its function */
+ _tpm_tis_request_completed(s);
+ }
+
+ return 0;
+}
+
+static const VMStateDescription vmstate_locty = {
+ .name = "loc",
+ .version_id = 1,
+ .minimum_version_id = 0,
+ .minimum_version_id_old = 0,
+ .fields = (VMStateField[]) {
+ VMSTATE_UINT32(state, TPMLocality),
+ VMSTATE_UINT32(inte, TPMLocality),
+ VMSTATE_UINT32(ints, TPMLocality),
+ VMSTATE_UINT8(access, TPMLocality),
+ VMSTATE_UINT32(sts, TPMLocality),
+ VMSTATE_UINT32(iface_id, TPMLocality),
+ VMSTATE_END_OF_LIST(),
+ }
+};
+
static const VMStateDescription vmstate_tpm_tis = {
.name = "tpm",
- .unmigratable = 1,
+ .version_id = 1,
+ .minimum_version_id = 0,
+ .minimum_version_id_old = 0,
+ .pre_save = tpm_tis_pre_save,
+ .fields = (VMStateField[]) {
+ VMSTATE_BUFFER(buffer, TPMState),
+ VMSTATE_UINT16(rw_offset, TPMState),
+ VMSTATE_UINT8(active_locty, TPMState),
+ VMSTATE_UINT8(aborting_locty, TPMState),
+ VMSTATE_UINT8(next_locty, TPMState),
+
+ VMSTATE_STRUCT_ARRAY(loc, TPMState, TPM_TIS_NUM_LOCALITIES, 1,
+ vmstate_locty, TPMLocality),
+
+ VMSTATE_END_OF_LIST()
+ }
};
static Property tpm_tis_properties[] = {
--
2.5.5
- [Qemu-devel] [PATCH v3 04/13] tpm_tis: move buffers from localities into common location, (continued)
- [Qemu-devel] [PATCH v3 04/13] tpm_tis: move buffers from localities into common location, Stefan Berger, 2017/11/10
- [Qemu-devel] [PATCH v3 07/13] tpm_tis: merge r/w_offset into rw_offset, Stefan Berger, 2017/11/10
- [Qemu-devel] [PATCH v3 06/13] tpm_tis: move r/w_offsets to TPMState, Stefan Berger, 2017/11/10
- [Qemu-devel] [PATCH v3 09/13] tpm: Introduce condition to notify waiters of completed command, Stefan Berger, 2017/11/10
- [Qemu-devel] [PATCH v3 05/13] tpm_tis: merge read and write buffer into single buffer, Stefan Berger, 2017/11/10
- [Qemu-devel] [PATCH v3 08/13] tpm: Implement tpm_sized_buffer_reset, Stefan Berger, 2017/11/10
- [Qemu-devel] [PATCH v3 12/13] tpm: extend TPM emulator with state migration support, Stefan Berger, 2017/11/10
- [Qemu-devel] [PATCH v3 03/13] tpm_tis: remove TPMSizeBuffer usage, Stefan Berger, 2017/11/10
- [Qemu-devel] [PATCH v3 10/13] tpm: Introduce condition in TPM backend for notification, Stefan Berger, 2017/11/10
- [Qemu-devel] [PATCH v3 11/13] tpm: implement tpm_backend_wait_cmd_completed, Stefan Berger, 2017/11/10
- [Qemu-devel] [PATCH v3 13/13] tpm_tis: extend TPM TIS with state migration support,
Stefan Berger <=