tpm: Extend sts register to 32 bit
PATCH 1/5 tpm: Extend sts register to 32 bit
More recent TIS specs extend the STS register to 32 bit. While we don't store the TIS interface state, yet, we can extend it without sideeffects.
--- hw/tpm/tpm_tis.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/tpm/tpm_tis.h +1 -1
@@ -41,7 +41,7 @@ typedef enum { typedef struct TPMLocality { TPMTISState state; uint8_t access; - uint8_t sts; + uint32_t sts; uint32_t inte; uint32_t ints;
Signature · 1 line
1.9.3
PATCH 2/5 tpm: Allow 32 & 16 bit accesses to the registers
Improve the access to the registers with 32 and 16 bit reads and writes. Also enable access to a non-base register address, such as reads of the 2nd byte of a register. Map the FIFO byte access to any byte within its 4 byte register (following specs).
--- hw/tpm/tpm_tis.c | 60 ++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 47 insertions(+), 13 deletions(-)
hw/tpm/tpm_tis.c +47 -13
@@ -427,6 +427,7 @@ static uint64_t tpm_tis_mmio_read(void *opaque, hwaddr addr,uint32_t val =0xffffffff ;uint8_t locty =tpm_tis_locality_from_addr (addr);uint32_t avail; +uint8_t v;if (tpm_backend_had_startup_error (s->be_driver)) {return val;
@@ -476,14 +477,26 @@ static uint64_t tpm_tis_mmio_read(void *opaque, hwaddr addr,break ;case TPM_TIS_REG_DATA_FIFO :if (tis->active_locty == locty) { -switch (tis->loc[locty].state) { -case TPM_TIS_STATE_COMPLETION : - val =tpm_tis_data_read (s, locty); -break ; -default : - val =TPM_TIS_NO_DATA_BYTE ; -break ; +if (size >4 - (addr &0x3 )) { +/* prevent access beyond FIFO */ + size =4 - (addr &0x3 ); + } + val =0 ; + shift =0 ; +while (size >0 ) { +switch (tis->loc[locty].state) { +case TPM_TIS_STATE_COMPLETION : + v =tpm_tis_data_read (s, locty); +break ; +default : + v =TPM_TIS_NO_DATA_BYTE ; +break ; + } + val |= (v << shift); + shift +=8 ; + size--; } + shift =0 ;/* no more adjustments */ }break ;case TPM_TIS_REG_DID_VID :
@@ -518,11 +531,13 @@ static void tpm_tis_mmio_write_intern(void *opaque, hwaddr addr, {TPMState *s = opaque;TPMTISEmuState *tis = &s->s.tis; -uint16_t off = addr &0xfff ; +uint16_t off = addr &0xffc ; +uint8_t shift = (addr &0x3 ) *8 ;uint8_t locty =tpm_tis_locality_from_addr (addr);uint8_t active_locty, l;int c, set_new_locty =1 ;uint16_t len; +uint32_t mask = (size ==1 ) ?0xff : ((size ==2 ) ?0xffff : ~0 );DPRINTF ("tpm_tis: write.%u(%08x) = %08x\n" , size, (int )addr, (uint32_t )val);
@@ -535,6 +550,15 @@ static void tpm_tis_mmio_write_intern(void *opaque, hwaddr addr,return ; } + val &= mask; + +if (shift) { + val <<= shift; + mask <<= shift; + } + + mask ^=0xffffffff ; +switch (off) {case TPM_TIS_REG_ACCESS :
@@ -646,9 +670,10 @@ static void tpm_tis_mmio_write_intern(void *opaque, hwaddr addr,break ; } - tis->loc[locty].inte = (val & (TPM_TIS_INT_ENABLED | -TPM_TIS_INT_POLARITY_MASK | -TPM_TIS_INTERRUPTS_SUPPORTED )); + tis->loc[locty].inte &= mask; + tis->loc[locty].inte |= (val & (TPM_TIS_INT_ENABLED | +TPM_TIS_INT_POLARITY_MASK | +TPM_TIS_INTERRUPTS_SUPPORTED ));break ;case TPM_TIS_REG_INT_VECTOR :/* hard wired -- ignore */
@@ -747,16 +772,25 @@ static void tpm_tis_mmio_write_intern(void *opaque, hwaddr addr, tis->loc[locty].state == TPM_TIS_STATE_COMPLETION) { /* drop the byte */ } else { -DPRINTF ("tpm_tis: Byte to send to TPM: %02x\n" , (uint8_t )val); +DPRINTF ("tpm_tis: Data to send to TPM: %08x (size=%d)\n" , + val, size);if (tis->loc[locty].state ==TPM_TIS_STATE_READY ) { tis->loc[locty].state =TPM_TIS_STATE_RECEPTION ; tis->loc[locty].sts =TPM_TIS_STS_EXPECT |TPM_TIS_STS_VALID ; } -if ((tis->loc[locty].sts &TPM_TIS_STS_EXPECT )) { + val >>= shift; +if (size >4 - (addr &0x3 )) { +/* prevent access beyond FIFO */ + size =4 - (addr &0x3 ); + } + +while ((tis->loc[locty].sts &TPM_TIS_STS_EXPECT ) && size >0 ) {if (tis->loc[locty].w_offset < tis->loc[locty].w_buffer.size) { tis->loc[locty].w_buffer. buffer[tis->loc[locty].w_offset++] = (uint8_t )val; + val >>=8 ; + size--; }else { tis->loc[locty].sts =TPM_TIS_STS_VALID ; }
Signature · 1 line
1.9.3
PATCH 3/5 tpm: Support for XFIFO register
In reply to Stefan BergerSupport for the XFIFO register (range) of the TIS 1.3 specification. We support a range of 64 bytes.
--- hw/tpm/tpm_tis.c | 4 ++++ 1 file changed, 4 insertions(+)
hw/tpm/tpm_tis.c +4 -0
@@ -51,6 +51,8 @@#define TPM_TIS_REG_INTF_CAPABILITY 0x14#define TPM_TIS_REG_STS 0x18#define TPM_TIS_REG_DATA_FIFO 0x24 +#define TPM_TIS_REG_DATA_XFIFO 0x80 +#define TPM_TIS_REG_DATA_XFIFO_END 0xbc#define TPM_TIS_REG_DID_VID 0xf00#define TPM_TIS_REG_RID 0xf04
@@ -476,6 +478,7 @@ static uint64_t tpm_tis_mmio_read(void *opaque, hwaddr addr, }break ;case TPM_TIS_REG_DATA_FIFO : + case TPM_TIS_REG_DATA_XFIFO ... TPM_TIS_REG_DATA_XFIFO_END:if (tis->active_locty == locty) {if (size >4 - (addr &0x3 )) {/* prevent access beyond FIFO */
@@ -762,6 +765,7 @@ static void tpm_tis_mmio_write_intern(void *opaque, hwaddr addr, }break ;case TPM_TIS_REG_DATA_FIFO : + case TPM_TIS_REG_DATA_XFIFO ... TPM_TIS_REG_DATA_XFIFO_END:/* data fifo */ if (tis->active_locty != locty) {break ;
Signature · 1 line
1.9.3
PATCH 4/5 tpm: Support for TIS selftest done flag
In reply to Stefan BergerExtend the backend to check whether the TPM_ContinueSelfTest finished successfully and provide a flag to the TIS front-end if it successfully finished. The TIS then sets a flag in all localities in the STS register and keeps it until the next reset.
--- hw/tpm/tpm_int.h | 1 + hw/tpm/tpm_passthrough.c | 37 ++++++++++++++++++++++++---- hw/tpm/tpm_tis.c | 58 ++++++++++++++++++++++++++++++++++---------- include/sysemu/tpm_backend.h | 2 +- 4 files changed, 79 insertions(+), 19 deletions(-)
hw/tpm/tpm_int.h +1 -0
@@ -62,6 +62,7 @@ struct tpm_resp_hdr {#define TPM_FAIL 9 +#define TPM_ORD_ContinueSelfTest 0x53#define TPM_ORD_GetTicks 0xf1#endif /* TPM_TPM_INT_H */
hw/tpm/tpm_passthrough.c +32 -5
@@ -112,14 +112,31 @@ static void tpm_write_fatal_error_response(uint8_t *out, uint32_t out_len) } } +static bool tpm_passthrough_is_selftest (const uint8_t *in,uint32_t in_len) +{ +struct tpm_req_hdr *hdr = (struct tpm_req_hdr *)in; + +if (in_len >=sizeof (*hdr)) { +return (be32_to_cpu (hdr->ordinal) == TPM_ORD_ContinueSelfTest); + } + +return false; +} +static int tpm_passthrough_unix_tx_bufs (TPMPassthruState *tpm_pt,const uint8_t *in,uint32_t in_len, -uint8_t *out,uint32_t out_len) +uint8_t *out,uint32_t out_len, +bool *selftest_done) {int ret; +bool is_selftest; +const struct tpm_resp_hdr *hdr; tpm_pt->tpm_op_canceled = false; tpm_pt->tpm_executing = true; + *selftest_done = false; + + is_selftest =tpm_passthrough_is_selftest (in, in_len); ret =tpm_passthrough_unix_write (tpm_pt->tpm_fd, in, in_len);if (ret != in_len) {
@@ -149,6 +166,11 @@ static int tpm_passthrough_unix_tx_bufs(TPMPassthruState *tpm_pt, "packet from TPM\n"); } +if (is_selftest && (ret >=sizeof (struct tpm_resp_hdr ))) { + hdr = (struct tpm_resp_hdr *)out; + *selftest_done = (be32_to_cpu (hdr->errcode) ==0 ); + } + err_exit:if (ret <0 ) {tpm_write_fatal_error_response (out, out_len);
@@ -160,13 +182,15 @@ err_exit: }static int tpm_passthrough_unix_transfer (TPMPassthruState *tpm_pt, -const TPMLocality *locty_data) +const TPMLocality *locty_data, +bool *selftest_done) {return tpm_passthrough_unix_tx_bufs (tpm_pt, locty_data->w_buffer.buffer, locty_data->w_offset, locty_data->r_buffer.buffer, - locty_data->r_buffer.size); + locty_data->r_buffer.size, + selftest_done); } static void tpm_passthrough_worker_thread(gpointer data,
@@ -175,16 +199,19 @@ static void tpm_passthrough_worker_thread(gpointer data,TPMPassthruThreadParams *thr_parms = user_data;TPMPassthruState *tpm_pt =TPM_PASSTHROUGH (thr_parms->tb);TPMBackendCmd cmd = (TPMBackendCmd )data; +bool selftest_done = false;DPRINTF ("tpm_passthrough: processing command type %d\n" , cmd);switch (cmd) {case TPM_BACKEND_CMD_PROCESS_CMD :tpm_passthrough_unix_transfer (tpm_pt, - thr_parms->tpm_state->locty_data); + thr_parms->tpm_state->locty_data, + &selftest_done); thr_parms->recv_data_callback (thr_parms->tpm_state, - thr_parms->tpm_state->locty_number); + thr_parms->tpm_state->locty_number, + selftest_done);break ;case TPM_BACKEND_CMD_INIT :case TPM_BACKEND_CMD_END :
hw/tpm/tpm_tis.c +45 -13
137 lines not on this page · raw message
include/sysemu/tpm_backend.h +1 -1
@@ -56,7 +56,7 @@ struct TPMBackend {QLIST_ENTRY (TPMBackend) list; }; -typedef void (TPMRecvDataCB )(TPMState *,uint8_t locty); +typedef void (TPMRecvDataCB )(TPMState *,uint8_t locty,bool selftest_done); typedef struct TPMSizedBuffer { uint32_t size;
Signature · 1 line
1.9.3
PATCH 5/5 tpm: Support for capability flags of TIS 1.3
In reply to Stefan BergerProvide the TIS 1.3 capability flags.
The interface now looks like a TIS 1.3 interface. It's fully compatible with previous TIS 1.2 and drivers written for TIS 1.2 continue to work.
--- hw/tpm/tpm_tis.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
hw/tpm/tpm_tis.c +8 -1
@@ -14,7 +14,7 @@* * Implementation of the TIS interface according to specs found at * http://www.trustedcomputinggroup.org. This implementation currently -* supports version 1.21, revision 1.0. +* supports version 1.3, 21 March 2013 * In the developers menu choose the PC Client section then find the TIS * specification. */
@@ -103,8 +103,15 @@#endif +#define TPM_TIS_CAP_INTERFACE_VERSION1_3 (2 << 28) +#define TPM_TIS_CAP_DATA_TRANSFER_64B (3 << 9) +#define TPM_TIS_CAP_DATA_TRANSFER_LEGACY (0 << 9) +#define TPM_TIS_CAP_BURST_COUNT_DYNAMIC (0 << 8)#define TPM_TIS_CAP_INTERRUPT_LOW_LEVEL (1 << 4)/* support is mandatory */ #define TPM_TIS_CAPABILITIES_SUPPORTED (TPM_TIS_CAP_INTERRUPT_LOW_LEVEL | \ + TPM_TIS_CAP_BURST_COUNT_DYNAMIC | \ + TPM_TIS_CAP_DATA_TRANSFER_64B | \ + TPM_TIS_CAP_INTERFACE_VERSION1_3 | \ TPM_TIS_INTERRUPTS_SUPPORTED)#define TPM_TIS_TPM_DID 0x0001
Signature · 1 line
1.9.3