ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tpm: convert tpm_tis.c to use trace-events 

Leave the DEBUG_TIS for more debugging and convert to use if (DEBUG_TIS)
rather than #if DEBUG_TIS where it is being used.

Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Stefan Berger 2018-03-02 21:30:38 -05:00
parent 9d9dcd9602
commit fcbed221ff
2 changed files with 61 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
hw/tpm/tpm_tis.c
View File

@ -31,6 +31,7 @@
#include "sysemu/tpm_backend.h" #include "sysemu/tpm_backend.h"
#include "tpm_int.h" #include "tpm_int.h"
#include "tpm_util.h" #include "tpm_util.h"
#include "trace.h"
#define TPM_TIS_NUM_LOCALITIES 5 /* per spec */ #define TPM_TIS_NUM_LOCALITIES 5 /* per spec */
#define TPM_TIS_LOCALITY_SHIFT 12 #define TPM_TIS_LOCALITY_SHIFT 12
@ -86,12 +87,6 @@ typedef struct TPMState {
#define DEBUG_TIS 0 #define DEBUG_TIS 0
#define DPRINTF(fmt, ...) do { \
if (DEBUG_TIS) { \
printf(fmt, ## __VA_ARGS__); \
} \
} while (0)
/* local prototypes */ /* local prototypes */
static uint64_t tpm_tis_mmio_read(void *opaque, hwaddr addr, static uint64_t tpm_tis_mmio_read(void *opaque, hwaddr addr,
@ -107,19 +102,17 @@ static uint8_t tpm_tis_locality_from_addr(hwaddr addr)
static void tpm_tis_show_buffer(const unsigned char *buffer, static void tpm_tis_show_buffer(const unsigned char *buffer,
size_t buffer_size, const char *string) size_t buffer_size, const char *string)
{ {
#ifdef DEBUG_TIS
uint32_t len, i; uint32_t len, i;
len = MIN(tpm_cmd_get_size(buffer), buffer_size); len = MIN(tpm_cmd_get_size(buffer), buffer_size);
DPRINTF("tpm_tis: %s length = %d\n", string, len); printf("tpm_tis: %s length = %d\n", string, len);
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
if (i && !(i % 16)) { if (i && !(i % 16)) {
DPRINTF("\n"); printf("\n");
} }
DPRINTF("%.2X ", buffer[i]); printf("%.2X ", buffer[i]);
} }
DPRINTF("\n"); printf("\n");
#endif
} }
/* /*
@ -146,8 +139,10 @@ static void tpm_tis_sts_set(TPMLocality *l, uint32_t flags)
*/ */
static void tpm_tis_tpm_send(TPMState *s, uint8_t locty) static void tpm_tis_tpm_send(TPMState *s, uint8_t locty)
{ {
tpm_tis_show_buffer(s->buffer, s->be_buffer_size, if (DEBUG_TIS) {
"tpm_tis: To TPM"); tpm_tis_show_buffer(s->buffer, s->be_buffer_size,
"tpm_tis: To TPM");
}
/* /*
* rw_offset serves as length indicator for length of data; * rw_offset serves as length indicator for length of data;
@ -175,7 +170,7 @@ static void tpm_tis_raise_irq(TPMState *s, uint8_t locty, uint32_t irqmask)
if ((s->loc[locty].inte & TPM_TIS_INT_ENABLED) && if ((s->loc[locty].inte & TPM_TIS_INT_ENABLED) &&
(s->loc[locty].inte & irqmask)) { (s->loc[locty].inte & irqmask)) {
DPRINTF("tpm_tis: Raising IRQ for flag %08x\n", irqmask); trace_tpm_tis_raise_irq(irqmask);
qemu_irq_raise(s->irq); qemu_irq_raise(s->irq);
s->loc[locty].ints |= irqmask; s->loc[locty].ints |= irqmask;
} }
@ -223,7 +218,7 @@ static void tpm_tis_new_active_locality(TPMState *s, uint8_t new_active_locty)
s->active_locty = new_active_locty; s->active_locty = new_active_locty;
DPRINTF("tpm_tis: Active locality is now %d\n", s->active_locty); trace_tpm_tis_new_active_locality(s->active_locty);
if (TPM_TIS_IS_VALID_LOCTY(new_active_locty)) { if (TPM_TIS_IS_VALID_LOCTY(new_active_locty)) {
/* set flags on the new active locality */ /* set flags on the new active locality */
@ -242,7 +237,7 @@ static void tpm_tis_abort(TPMState *s, uint8_t locty)
{ {
s->rw_offset = 0; s->rw_offset = 0;
DPRINTF("tpm_tis: tis_abort: new active locality is %d\n", s->next_locty); trace_tpm_tis_abort(s->next_locty);
/* /*
* Need to react differently depending on who's aborting now and * Need to react differently depending on who's aborting now and
@ -310,8 +305,10 @@ static void tpm_tis_request_completed(TPMIf *ti, int ret)
s->loc[locty].state = TPM_TIS_STATE_COMPLETION; s->loc[locty].state = TPM_TIS_STATE_COMPLETION;
s->rw_offset = 0; s->rw_offset = 0;
tpm_tis_show_buffer(s->buffer, s->be_buffer_size, if (DEBUG_TIS) {
"tpm_tis: From TPM"); tpm_tis_show_buffer(s->buffer, s->be_buffer_size,
"tpm_tis: From TPM");
}
if (TPM_TIS_IS_VALID_LOCTY(s->next_locty)) { if (TPM_TIS_IS_VALID_LOCTY(s->next_locty)) {
tpm_tis_abort(s, locty); tpm_tis_abort(s, locty);
@ -339,8 +336,7 @@ static uint32_t tpm_tis_data_read(TPMState *s, uint8_t locty)
tpm_tis_sts_set(&s->loc[locty], TPM_TIS_STS_VALID); tpm_tis_sts_set(&s->loc[locty], TPM_TIS_STS_VALID);
tpm_tis_raise_irq(s, locty, TPM_TIS_INT_STS_VALID); tpm_tis_raise_irq(s, locty, TPM_TIS_INT_STS_VALID);
} }
DPRINTF("tpm_tis: tpm_tis_data_read byte 0x%02x [%d]\n", trace_tpm_tis_data_read(ret, s->rw_offset - 1);
ret, s->rw_offset - 1);
} }
return ret; return ret;
@ -364,29 +360,29 @@ static void tpm_tis_dump_state(void *opaque, hwaddr addr)
hwaddr base = addr & ~0xfff; hwaddr base = addr & ~0xfff;
TPMState *s = opaque; TPMState *s = opaque;
DPRINTF("tpm_tis: active locality : %d\n" printf("tpm_tis: active locality : %d\n"
"tpm_tis: state of locality %d : %d\n" "tpm_tis: state of locality %d : %d\n"
"tpm_tis: register dump:\n", "tpm_tis: register dump:\n",
s->active_locty, s->active_locty,
locty, s->loc[locty].state); locty, s->loc[locty].state);
for (idx = 0; regs[idx] != 0xfff; idx++) { for (idx = 0; regs[idx] != 0xfff; idx++) {
DPRINTF("tpm_tis: 0x%04x : 0x%08x\n", regs[idx], printf("tpm_tis: 0x%04x : 0x%08x\n", regs[idx],
(int)tpm_tis_mmio_read(opaque, base + regs[idx], 4)); (int)tpm_tis_mmio_read(opaque, base + regs[idx], 4));
} }
DPRINTF("tpm_tis: r/w offset : %d\n" printf("tpm_tis: r/w offset : %d\n"
"tpm_tis: result buffer : ", "tpm_tis: result buffer : ",
s->rw_offset); s->rw_offset);
for (idx = 0; for (idx = 0;
idx < MIN(tpm_cmd_get_size(&s->buffer), s->be_buffer_size); idx < MIN(tpm_cmd_get_size(&s->buffer), s->be_buffer_size);
idx++) { idx++) {
DPRINTF("%c%02x%s", printf("%c%02x%s",
s->rw_offset == idx ? '>' : ' ', s->rw_offset == idx ? '>' : ' ',
s->buffer[idx], s->buffer[idx],
((idx & 0xf) == 0xf) ? "\ntpm_tis: " : ""); ((idx & 0xf) == 0xf) ? "\ntpm_tis: " : "");
} }
DPRINTF("\n"); printf("\n");
} }
#endif #endif
@ -506,7 +502,7 @@ static uint64_t tpm_tis_mmio_read(void *opaque, hwaddr addr,
val >>= shift; val >>= shift;
} }
DPRINTF("tpm_tis: read.%u(%08x) = %08x\n", size, (int)addr, (int)val); trace_tpm_tis_mmio_read(size, addr, val);
return val; return val;
} }
@ -527,10 +523,10 @@ static void tpm_tis_mmio_write(void *opaque, hwaddr addr,
uint16_t len; uint16_t len;
uint32_t mask = (size == 1) ? 0xff : ((size == 2) ? 0xffff : ~0); uint32_t mask = (size == 1) ? 0xff : ((size == 2) ? 0xffff : ~0);
DPRINTF("tpm_tis: write.%u(%08x) = %08x\n", size, (int)addr, (int)val); trace_tpm_tis_mmio_write(size, addr, val);
if (locty == 4) { if (locty == 4) {
DPRINTF("tpm_tis: Access to locality 4 only allowed from hardware\n"); trace_tpm_tis_mmio_write_locty4();
return; return;
} }
@ -560,20 +556,18 @@ static void tpm_tis_mmio_write(void *opaque, hwaddr addr,
if ((val & TPM_TIS_ACCESS_ACTIVE_LOCALITY)) { if ((val & TPM_TIS_ACCESS_ACTIVE_LOCALITY)) {
/* give up locality if currently owned */ /* give up locality if currently owned */
if (s->active_locty == locty) { if (s->active_locty == locty) {
DPRINTF("tpm_tis: Releasing locality %d\n", locty); trace_tpm_tis_mmio_write_release_locty(locty);
uint8_t newlocty = TPM_TIS_NO_LOCALITY; uint8_t newlocty = TPM_TIS_NO_LOCALITY;
/* anybody wants the locality ? */ /* anybody wants the locality ? */
for (c = TPM_TIS_NUM_LOCALITIES - 1; c >= 0; c--) { for (c = TPM_TIS_NUM_LOCALITIES - 1; c >= 0; c--) {
if ((s->loc[c].access & TPM_TIS_ACCESS_REQUEST_USE)) { if ((s->loc[c].access & TPM_TIS_ACCESS_REQUEST_USE)) {
DPRINTF("tpm_tis: Locality %d requests use.\n", c); trace_tpm_tis_mmio_write_locty_req_use(c);
newlocty = c; newlocty = c;
break; break;
} }
} }
DPRINTF("tpm_tis: TPM_TIS_ACCESS_ACTIVE_LOCALITY: " trace_tpm_tis_mmio_write_next_locty(newlocty);
"Next active locality: %d\n",
newlocty);
if (TPM_TIS_IS_VALID_LOCTY(newlocty)) { if (TPM_TIS_IS_VALID_LOCTY(newlocty)) {
set_new_locty = 0; set_new_locty = 0;
@ -627,10 +621,10 @@ static void tpm_tis_mmio_write(void *opaque, hwaddr addr,
} }
s->loc[locty].access |= TPM_TIS_ACCESS_SEIZE; s->loc[locty].access |= TPM_TIS_ACCESS_SEIZE;
DPRINTF("tpm_tis: TPM_TIS_ACCESS_SEIZE: "
"Locality %d seized from locality %d\n", trace_tpm_tis_mmio_write_locty_seized(locty, s->active_locty);
locty, s->active_locty); trace_tpm_tis_mmio_write_init_abort();
DPRINTF("tpm_tis: TPM_TIS_ACCESS_SEIZE: Initiating abort.\n");
set_new_locty = 0; set_new_locty = 0;
tpm_tis_prep_abort(s, s->active_locty, locty); tpm_tis_prep_abort(s, s->active_locty, locty);
break; break;
@ -677,7 +671,7 @@ static void tpm_tis_mmio_write(void *opaque, hwaddr addr,
s->loc[locty].ints &= ~val; s->loc[locty].ints &= ~val;
if (s->loc[locty].ints == 0) { if (s->loc[locty].ints == 0) {
qemu_irq_lower(s->irq); qemu_irq_lower(s->irq);
DPRINTF("tpm_tis: Lowering IRQ\n"); trace_tpm_tis_mmio_write_lowering_irq();
} }
} }
s->loc[locty].ints &= ~(val & TPM_TIS_INTERRUPTS_SUPPORTED); s->loc[locty].ints &= ~(val & TPM_TIS_INTERRUPTS_SUPPORTED);
@ -725,8 +719,7 @@ static void tpm_tis_mmio_write(void *opaque, hwaddr addr,
case TPM_TIS_STATE_EXECUTION: case TPM_TIS_STATE_EXECUTION:
case TPM_TIS_STATE_RECEPTION: case TPM_TIS_STATE_RECEPTION:
/* abort currently running command */ /* abort currently running command */
DPRINTF("tpm_tis: %s: Initiating abort.\n", trace_tpm_tis_mmio_write_init_abort();
__func__);
tpm_tis_prep_abort(s, locty, locty); tpm_tis_prep_abort(s, locty, locty);
break; break;
@ -780,8 +773,7 @@ static void tpm_tis_mmio_write(void *opaque, hwaddr addr,
s->loc[locty].state == TPM_TIS_STATE_COMPLETION) { s->loc[locty].state == TPM_TIS_STATE_COMPLETION) {
/* drop the byte */ /* drop the byte */
} else { } else {
DPRINTF("tpm_tis: Data to send to TPM: %08x (size=%d)\n", trace_tpm_tis_mmio_write_data2send(val, size);
(int)val, size);
if (s->loc[locty].state == TPM_TIS_STATE_READY) { if (s->loc[locty].state == TPM_TIS_STATE_READY) {
s->loc[locty].state = TPM_TIS_STATE_RECEPTION; s->loc[locty].state = TPM_TIS_STATE_RECEPTION;
tpm_tis_sts_set(&s->loc[locty], tpm_tis_sts_set(&s->loc[locty],

16
hw/tpm/trace-events
View File

@ -28,3 +28,19 @@ tpm_emulator_handle_device_opts_tpm2(void) "TPM Version 2"
tpm_emulator_handle_device_opts_unspec(void) "TPM Version Unspecified" tpm_emulator_handle_device_opts_unspec(void) "TPM Version Unspecified"
tpm_emulator_handle_device_opts_startup_error(void) "Startup error" tpm_emulator_handle_device_opts_startup_error(void) "Startup error"
tpm_emulator_inst_init(void) "" tpm_emulator_inst_init(void) ""
# hw/tpm/tpm_tis.c
tpm_tis_raise_irq(uint32_t irqmask) "Raising IRQ for flag 0x%08x"
tpm_tis_new_active_locality(uint8_t locty) "Active locality is now %d"
tpm_tis_abort(uint8_t locty) "New active locality is %d"
tpm_tis_data_read(uint32_t value, uint32_t off) "byte 0x%02x [%d]"
tpm_tis_mmio_read(unsigned size, uint32_t addr, uint32_t val) " read.%u(0x%08x) = 0x%08x"
tpm_tis_mmio_write(unsigned size, uint32_t addr, uint32_t val) "write.%u(0x%08x) = 0x%08x"
tpm_tis_mmio_write_locty4(void) "Access to locality 4 only allowed from hardware"
tpm_tis_mmio_write_release_locty(uint8_t locty) "Releasing locality %d"
tpm_tis_mmio_write_locty_req_use(uint8_t locty) "Locality %d requests use"
tpm_tis_mmio_write_next_locty(uint8_t locty) "Next active locality is %d"
tpm_tis_mmio_write_locty_seized(uint8_t locty, uint8_t active) "Locality %d seized from locality %d"
tpm_tis_mmio_write_init_abort(void) "Initiating abort"
tpm_tis_mmio_write_lowering_irq(void) "Lowering IRQ"
tpm_tis_mmio_write_data2send(uint32_t value, unsigned size) "Data to send to TPM: 0x%08x (size=%d)"