QOM-ify TPM
PATCH 1/1 QOM-ify TPM
With much code borrowed from the rng QOM implementation.
Signed-off-by Stefan Berger <[email protected]>
--- backends/Makefile.objs | 2 backends/tpm.c | 154 ++++++++++++++++++++++++++++++++++++++++++++ include/qemu/tpm.h | 170 +++++++++++++++++++++++++++++++++++++++++++++++++ include/tpm/tpm.h | 4 + tpm/tpm.c | 13 +++ tpm/tpm_int.h | 16 ---- tpm/tpm_passthrough.c | 94 +++++++++++++++++---------- tpm/tpm_tis.c | 21 +++--- 8 files changed, 414 insertions(+), 60 deletions(-)
backends/Makefile.objs +2 -0
@@ -4,3 +4,5 @@ common-obj-$(CONFIG_POSIX) += rng-random common-obj-y += msmouse.o common-obj-$(CONFIG_BRLAPI) += baum.o $(obj)/baum.o: QEMU_CFLAGS += $(SDL_CFLAGS) + +common-obj-$(CONFIG_TPM) += tpm.o
backends/tpm.c new file +154 -0
154 lines not on this page · raw message
include/qemu/tpm.h new file +170 -0
170 lines not on this page · raw message
tpm/tpm_passthrough.c +62 -32
240 lines not on this page · raw message
tpm/tpm_tis.c +11 -10
@@ -19,6 +19,7 @@* specification. */ +#include "qemu/tpm.h" #include "tpm_int.h" #include "block/block.h" #include "exec/address-spaces.h"
@@ -160,7 +161,7 @@ static void tpm_tis_tpm_send(TPMState *s*/ tis->loc[locty].state =TPM_TIS_STATE_EXECUTION ; - s->be_driver->ops->deliver_request (s->be_driver); +tpm_backend_deliver_request (s->be_driver); }/* raise an interrupt if allowed */
@@ -284,7 +285,7 @@ static void tpm_tis_prep_abort(TPMState* request the backend to cancel. Some backends may not * support it */ - s->be_driver->ops->cancel_cmd (s->be_driver); +tpm_backend_cancel_cmd (s->be_driver);return ; } }
@@ -426,7 +427,7 @@ static uint64_t tpm_tis_mmio_read(void *uint8_t locty =tpm_tis_locality_from_addr (addr);uint32_t avail; -if (s->be_driver->ops->had_startup_error (s->be_driver)) { +if (tpm_backend_had_startup_error (s->be_driver)) {return val; }
@@ -438,7 +439,7 @@ static uint64_t tpm_tis_mmio_read(void *if (tpm_tis_check_request_use_except (s, locty)) { val |=TPM_TIS_ACCESS_PENDING_REQUEST ; } - val |= !s->be_driver->ops->get_tpm_established_flag (s->be_driver); + val |= !tpm_backend_get_tpm_established_flag (s->be_driver);break ;case TPM_TIS_REG_INT_ENABLE : val = tis->loc[locty].inte;
@@ -529,7 +530,7 @@ static void tpm_tis_mmio_write_intern(voreturn ; } -if (s->be_driver->ops->had_startup_error (s->be_driver)) { +if (tpm_backend_had_startup_error (s->be_driver)) {return ; }
@@ -804,7 +805,7 @@ static const MemoryRegionOps tpm_tis_memstatic int tpm_tis_do_startup_tpm (TPMState *s) { -return s->be_driver->ops->startup_tpm (s->be_driver); +return tpm_backend_startup_tpm (s->be_driver); }/*
@@ -817,7 +818,7 @@ static void tpm_tis_reset(DeviceState *dTPMTISEmuState *tis = &s->s.tis;int c; - s->be_driver->ops->reset (s->be_driver); +tpm_backend_reset (s->be_driver); tis->active_locty =TPM_TIS_NO_LOCALITY ; tis->next_locty =TPM_TIS_NO_LOCALITY ;
@@ -831,9 +832,9 @@ static void tpm_tis_reset(DeviceState *d tis->loc[c].state =TPM_TIS_STATE_IDLE ; tis->loc[c].w_offset =0 ; - s->be_driver->ops->realloc_buffer (&tis->loc[c].w_buffer); +tpm_backend_realloc_buffer (s->be_driver, &tis->loc[c].w_buffer); tis->loc[c].r_offset =0 ; - s->be_driver->ops->realloc_buffer (&tis->loc[c].r_buffer); +tpm_backend_realloc_buffer (s->be_driver, &tis->loc[c].r_buffer); }tpm_tis_do_startup_tpm (s);
@@ -865,7 +866,7 @@ static void tpm_tis_realizefn(DeviceStat s->be_driver->fe_model =TPM_MODEL_TPM_TIS ; -if (s->be_driver->ops->init (s->be_driver, s, tpm_tis_receive_cb)) { +if (tpm_backend_init (s->be_driver, s, tpm_tis_receive_cb)) {error_setg (errp,"tpm_tis: backend driver with id %s could not be " "initialized" , s->backend);return ;
tpm/tpm_int.h +0 -16
@@ -18,22 +18,6 @@struct TPMDriverOps ;typedef struct TPMDriverOps TPMDriverOps ; -typedef struct TPMPassthruState TPMPassthruState ; - -typedef struct TPMBackend { -char *id; -enum TpmModel fe_model; -char *path; -char *cancel_path; -const TPMDriverOps *ops; - -union { -TPMPassthruState *tpm_pt; - } s; - -QLIST_ENTRY (TPMBackend) list; -}TPMBackend ; -/* overall state of the TPM interface */ typedef struct TPMState { ISADevice busdev;
tpm/tpm.c +11 -2
@@ -15,6 +15,7 @@#include "monitor/monitor.h" #include "qapi/qmp/qerror.h" +#include "qemu/tpm.h" #include "tpm_int.h" #include "tpm/tpm.h" #include "qemu/config-file.h"
@@ -145,6 +146,7 @@ static int configure_tpm(QemuOpts *opts)const char *id;const TPMDriverOps *be;TPMBackend *drv; +Error *local_err =NULL ;if (!QLIST_EMPTY (&tpm_backends)) {error_report ("Only one TPM is allowed.\n" );
@@ -177,6 +179,13 @@ static int configure_tpm(QemuOpts *opts)return 1 ; } +tpm_backend_open (drv, &local_err); +if (local_err) { +qerror_report_err (local_err); +error_free (local_err); +return 1 ; + } +QLIST_INSERT_HEAD (&tpm_backends, drv, list);return 0 ;
@@ -197,7 +206,7 @@ void tpm_cleanup(void) QLIST_FOREACH_SAFE(drv, &tpm_backends, list, next) {QLIST_REMOVE (drv, list); - drv->ops->destroy (drv); +tpm_backend_destroy (drv); } }
@@ -257,7 +266,7 @@ static TPMInfo *qmp_query_tpm_inst(TPMBa res->id =g_strdup (drv->id); res->model = drv->fe_model; - res->type = drv->ops->type; + res->type =tpm_backend_get_type (drv); res->tpm_options =g_new0 (TpmTypeOptions,1 );switch (res->type) {
include/tpm/tpm.h +4 -0
@@ -14,6 +14,10 @@#include "qemu/option.h" +typedef struct TPMState TPMState ; +typedef struct TPMSizedBuffer TPMSizedBuffer ; +typedef void (TPMRecvDataCB )(TPMState *,uint8_t locty); +int tpm_config_parse (QemuOptsList *opts_list,const char *optarg);int tpm_init (void );void tpm_cleanup (void );