david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tpm_tis: move r/w_offsets to TPMState

Browse Source 
Now that we have a single buffer, we also only need a single set of
read/write offsets into that buffer. This works since only one
locality can be active.

Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
This commit is contained in:
Stefan Berger 2017-11-10 07:37:27 -05:00
parent c5496b9797
commit e6b30c71f4
1 changed files with 27 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
hw/tpm/tpm_tis.c
View File

@ -61,9 +61,6 @@ typedef struct TPMLocality {
uint32_t iface_id; uint32_t iface_id;
uint32_t inte; uint32_t inte;
uint32_t ints; uint32_t ints;
uint16_t w_offset;
uint16_t r_offset;
} TPMLocality; } TPMLocality;
typedef struct TPMState { typedef struct TPMState {
@ -71,6 +68,8 @@ typedef struct TPMState {
MemoryRegion mmio; MemoryRegion mmio;
unsigned char buffer[TPM_TIS_BUFFER_MAX]; unsigned char buffer[TPM_TIS_BUFFER_MAX];
uint16_t w_offset;
uint16_t r_offset;
uint8_t active_locty; uint8_t active_locty;
uint8_t aborting_locty; uint8_t aborting_locty;
@ -254,8 +253,6 @@ 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)
{ {
TPMLocality *locty_data = &s->loc[locty];
tpm_tis_show_buffer(s->buffer, s->be_buffer_size, tpm_tis_show_buffer(s->buffer, s->be_buffer_size,
"tpm_tis: To TPM"); "tpm_tis: To TPM");
@ -268,7 +265,7 @@ static void tpm_tis_tpm_send(TPMState *s, uint8_t locty)
s->cmd = (TPMBackendCmd) { s->cmd = (TPMBackendCmd) {
.locty = locty, .locty = locty,
.in = s->buffer, .in = s->buffer,
.in_len = locty_data->w_offset, .in_len = s->w_offset,
.out = s->buffer, .out = s->buffer,
.out_len = s->be_buffer_size, .out_len = s->be_buffer_size,
}; };
@ -350,8 +347,8 @@ static void tpm_tis_new_active_locality(TPMState *s, uint8_t new_active_locty)
/* abort -- this function switches the locality */ /* abort -- this function switches the locality */
static void tpm_tis_abort(TPMState *s, uint8_t locty) static void tpm_tis_abort(TPMState *s, uint8_t locty)
{ {
s->loc[locty].r_offset = 0; s->r_offset = 0;
s->loc[locty].w_offset = 0; s->w_offset = 0;
DPRINTF("tpm_tis: tis_abort: new active locality is %d\n", s->next_locty); DPRINTF("tpm_tis: tis_abort: new active locality is %d\n", s->next_locty);
@ -418,8 +415,8 @@ static void tpm_tis_request_completed(TPMIf *ti)
tpm_tis_sts_set(&s->loc[locty], tpm_tis_sts_set(&s->loc[locty],
TPM_TIS_STS_VALID | TPM_TIS_STS_DATA_AVAILABLE); TPM_TIS_STS_VALID | TPM_TIS_STS_DATA_AVAILABLE);
s->loc[locty].state = TPM_TIS_STATE_COMPLETION; s->loc[locty].state = TPM_TIS_STATE_COMPLETION;
s->loc[locty].r_offset = 0; s->r_offset = 0;
s->loc[locty].w_offset = 0; s->w_offset = 0;
tpm_tis_show_buffer(s->buffer, s->be_buffer_size, tpm_tis_show_buffer(s->buffer, s->be_buffer_size,
"tpm_tis: From TPM"); "tpm_tis: From TPM");
@ -444,14 +441,14 @@ static uint32_t tpm_tis_data_read(TPMState *s, uint8_t locty)
len = MIN(tpm_cmd_get_size(&s->buffer), len = MIN(tpm_cmd_get_size(&s->buffer),
s->be_buffer_size); s->be_buffer_size);
ret = s->buffer[s->loc[locty].r_offset++]; ret = s->buffer[s->r_offset++];
if (s->loc[locty].r_offset >= len) { if (s->r_offset >= len) {
/* got last byte */ /* got last byte */
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", DPRINTF("tpm_tis: tpm_tis_data_read byte 0x%02x [%d]\n",
ret, s->loc[locty].r_offset - 1); ret, s->r_offset - 1);
} }
return ret; return ret;
@ -488,24 +485,24 @@ static void tpm_tis_dump_state(void *opaque, hwaddr addr)
DPRINTF("tpm_tis: read offset : %d\n" DPRINTF("tpm_tis: read offset : %d\n"
"tpm_tis: result buffer : ", "tpm_tis: result buffer : ",
s->loc[locty].r_offset); s->r_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", DPRINTF("%c%02x%s",
s->loc[locty].r_offset == idx ? '>' : ' ', s->r_offset == idx ? '>' : ' ',
s->buffer[idx], s->buffer[idx],
((idx & 0xf) == 0xf) ? "\ntpm_tis: " : ""); ((idx & 0xf) == 0xf) ? "\ntpm_tis: " : "");
} }
DPRINTF("\n" DPRINTF("\n"
"tpm_tis: write offset : %d\n" "tpm_tis: write offset : %d\n"
"tpm_tis: request buffer: ", "tpm_tis: request buffer: ",
s->loc[locty].w_offset); s->w_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", DPRINTF("%c%02x%s",
s->loc[locty].w_offset == idx ? '>' : ' ', s->w_offset == idx ? '>' : ' ',
s->buffer[idx], s->buffer[idx],
((idx & 0xf) == 0xf) ? "\ntpm_tis: " : ""); ((idx & 0xf) == 0xf) ? "\ntpm_tis: " : "");
} }
@ -570,9 +567,9 @@ static uint64_t tpm_tis_mmio_read(void *opaque, hwaddr addr,
val = TPM_TIS_BURST_COUNT( val = TPM_TIS_BURST_COUNT(
MIN(tpm_cmd_get_size(&s->buffer), MIN(tpm_cmd_get_size(&s->buffer),
s->be_buffer_size) s->be_buffer_size)
- s->loc[locty].r_offset) | s->loc[locty].sts; - s->r_offset) | s->loc[locty].sts;
} else { } else {
avail = s->be_buffer_size - s->loc[locty].w_offset; avail = s->be_buffer_size - s->w_offset;
/* /*
* byte-sized reads should not return 0x00 for 0x100 * byte-sized reads should not return 0x00 for 0x100
* available bytes. * available bytes.
@ -836,8 +833,8 @@ static void tpm_tis_mmio_write(void *opaque, hwaddr addr,
switch (s->loc[locty].state) { switch (s->loc[locty].state) {
case TPM_TIS_STATE_READY: case TPM_TIS_STATE_READY:
s->loc[locty].w_offset = 0; s->w_offset = 0;
s->loc[locty].r_offset = 0; s->r_offset = 0;
break; break;
case TPM_TIS_STATE_IDLE: case TPM_TIS_STATE_IDLE:
@ -855,8 +852,8 @@ static void tpm_tis_mmio_write(void *opaque, hwaddr addr,
break; break;
case TPM_TIS_STATE_COMPLETION: case TPM_TIS_STATE_COMPLETION:
s->loc[locty].w_offset = 0; s->w_offset = 0;
s->loc[locty].r_offset = 0; s->r_offset = 0;
/* shortcut to ready state with C/R set */ /* shortcut to ready state with C/R set */
s->loc[locty].state = TPM_TIS_STATE_READY; s->loc[locty].state = TPM_TIS_STATE_READY;
if (!(s->loc[locty].sts & TPM_TIS_STS_COMMAND_READY)) { if (!(s->loc[locty].sts & TPM_TIS_STS_COMMAND_READY)) {
@ -882,7 +879,7 @@ static void tpm_tis_mmio_write(void *opaque, hwaddr addr,
} else if (val == TPM_TIS_STS_RESPONSE_RETRY) { } else if (val == TPM_TIS_STS_RESPONSE_RETRY) {
switch (s->loc[locty].state) { switch (s->loc[locty].state) {
case TPM_TIS_STATE_COMPLETION: case TPM_TIS_STATE_COMPLETION:
s->loc[locty].r_offset = 0; s->r_offset = 0;
tpm_tis_sts_set(&s->loc[locty], tpm_tis_sts_set(&s->loc[locty],
TPM_TIS_STS_VALID| TPM_TIS_STS_VALID|
TPM_TIS_STS_DATA_AVAILABLE); TPM_TIS_STS_DATA_AVAILABLE);
@ -920,8 +917,8 @@ static void tpm_tis_mmio_write(void *opaque, hwaddr addr,
} }
while ((s->loc[locty].sts & TPM_TIS_STS_EXPECT) && size > 0) { while ((s->loc[locty].sts & TPM_TIS_STS_EXPECT) && size > 0) {
if (s->loc[locty].w_offset < s->be_buffer_size) { if (s->w_offset < s->be_buffer_size) {
s->buffer[s->loc[locty].w_offset++] = s->buffer[s->w_offset++] =
(uint8_t)val; (uint8_t)val;
val >>= 8; val >>= 8;
size--; size--;
@ -931,13 +928,13 @@ static void tpm_tis_mmio_write(void *opaque, hwaddr addr,
} }
/* check for complete packet */ /* check for complete packet */
if (s->loc[locty].w_offset > 5 && if (s->w_offset > 5 &&
(s->loc[locty].sts & TPM_TIS_STS_EXPECT)) { (s->loc[locty].sts & TPM_TIS_STS_EXPECT)) {
/* we have a packet length - see if we have all of it */ /* we have a packet length - see if we have all of it */
bool need_irq = !(s->loc[locty].sts & TPM_TIS_STS_VALID); bool need_irq = !(s->loc[locty].sts & TPM_TIS_STS_VALID);
len = tpm_cmd_get_size(&s->buffer); len = tpm_cmd_get_size(&s->buffer);
if (len > s->loc[locty].w_offset) { if (len > s->w_offset) {
tpm_tis_sts_set(&s->loc[locty], tpm_tis_sts_set(&s->loc[locty],
TPM_TIS_STS_EXPECT | TPM_TIS_STS_VALID); TPM_TIS_STS_EXPECT | TPM_TIS_STS_VALID);
} else { } else {
@ -1026,8 +1023,8 @@ static void tpm_tis_reset(DeviceState *dev)
s->loc[c].ints = 0; s->loc[c].ints = 0;
s->loc[c].state = TPM_TIS_STATE_IDLE; s->loc[c].state = TPM_TIS_STATE_IDLE;
s->loc[c].w_offset = 0; s->w_offset = 0;
s->loc[c].r_offset = 0; s->r_offset = 0;
} }
tpm_tis_do_startup_tpm(s, s->be_buffer_size); tpm_tis_do_startup_tpm(s, s->be_buffer_size);