mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tpm_tis: merge read and write buffer into single buffer

Browse Source 
Since we can only be in read or write mode, we can merge the buffers
into a single buffer.

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-09 20:12:39 -05:00
parent 0804084230
commit c5496b9797
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
hw/tpm/tpm_tis.c
View File

@ -70,8 +70,7 @@ typedef struct TPMState {
ISADevice busdev; ISADevice busdev;
MemoryRegion mmio; MemoryRegion mmio;
unsigned char w_buffer[TPM_TIS_BUFFER_MAX]; unsigned char buffer[TPM_TIS_BUFFER_MAX];
unsigned char r_buffer[TPM_TIS_BUFFER_MAX];
uint8_t active_locty; uint8_t active_locty;
uint8_t aborting_locty; uint8_t aborting_locty;
@ -257,7 +256,7 @@ static void tpm_tis_tpm_send(TPMState *s, uint8_t locty)
{ {
TPMLocality *locty_data = &s->loc[locty]; TPMLocality *locty_data = &s->loc[locty];
tpm_tis_show_buffer(s->w_buffer, s->be_buffer_size, tpm_tis_show_buffer(s->buffer, s->be_buffer_size,
"tpm_tis: To TPM"); "tpm_tis: To TPM");
/* /*
@ -268,9 +267,9 @@ static void tpm_tis_tpm_send(TPMState *s, uint8_t locty)
s->cmd = (TPMBackendCmd) { s->cmd = (TPMBackendCmd) {
.locty = locty, .locty = locty,
.in = s->w_buffer, .in = s->buffer,
.in_len = locty_data->w_offset, .in_len = locty_data->w_offset,
.out = s->r_buffer, .out = s->buffer,
.out_len = s->be_buffer_size, .out_len = s->be_buffer_size,
}; };
@ -422,7 +421,7 @@ static void tpm_tis_request_completed(TPMIf *ti)
s->loc[locty].r_offset = 0; s->loc[locty].r_offset = 0;
s->loc[locty].w_offset = 0; s->loc[locty].w_offset = 0;
tpm_tis_show_buffer(s->r_buffer, s->be_buffer_size, tpm_tis_show_buffer(s->buffer, s->be_buffer_size,
"tpm_tis: From TPM"); "tpm_tis: From TPM");
if (TPM_TIS_IS_VALID_LOCTY(s->next_locty)) { if (TPM_TIS_IS_VALID_LOCTY(s->next_locty)) {
@ -442,10 +441,10 @@ static uint32_t tpm_tis_data_read(TPMState *s, uint8_t locty)
uint16_t len; uint16_t len;
if ((s->loc[locty].sts & TPM_TIS_STS_DATA_AVAILABLE)) { if ((s->loc[locty].sts & TPM_TIS_STS_DATA_AVAILABLE)) {
len = MIN(tpm_cmd_get_size(&s->r_buffer), len = MIN(tpm_cmd_get_size(&s->buffer),
s->be_buffer_size); s->be_buffer_size);
ret = s->r_buffer[s->loc[locty].r_offset++]; ret = s->buffer[s->loc[locty].r_offset++];
if (s->loc[locty].r_offset >= len) { if (s->loc[locty].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);
@ -491,11 +490,11 @@ static void tpm_tis_dump_state(void *opaque, hwaddr addr)
"tpm_tis: result buffer : ", "tpm_tis: result buffer : ",
s->loc[locty].r_offset); s->loc[locty].r_offset);
for (idx = 0; for (idx = 0;
idx < MIN(tpm_cmd_get_size(&s->r_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->loc[locty].r_offset == idx ? '>' : ' ',
s->r_buffer[idx], s->buffer[idx],
((idx & 0xf) == 0xf) ? "\ntpm_tis: " : ""); ((idx & 0xf) == 0xf) ? "\ntpm_tis: " : "");
} }
DPRINTF("\n" DPRINTF("\n"
@ -503,11 +502,11 @@ static void tpm_tis_dump_state(void *opaque, hwaddr addr)
"tpm_tis: request buffer: ", "tpm_tis: request buffer: ",
s->loc[locty].w_offset); s->loc[locty].w_offset);
for (idx = 0; for (idx = 0;
idx < MIN(tpm_cmd_get_size(s->w_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->loc[locty].w_offset == idx ? '>' : ' ',
s->w_buffer[idx], s->buffer[idx],
((idx & 0xf) == 0xf) ? "\ntpm_tis: " : ""); ((idx & 0xf) == 0xf) ? "\ntpm_tis: " : "");
} }
DPRINTF("\n"); DPRINTF("\n");
@ -569,7 +568,7 @@ static uint64_t tpm_tis_mmio_read(void *opaque, hwaddr addr,
if (s->active_locty == locty) { if (s->active_locty == locty) {
if ((s->loc[locty].sts & TPM_TIS_STS_DATA_AVAILABLE)) { if ((s->loc[locty].sts & TPM_TIS_STS_DATA_AVAILABLE)) {
val = TPM_TIS_BURST_COUNT( val = TPM_TIS_BURST_COUNT(
MIN(tpm_cmd_get_size(&s->r_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->loc[locty].r_offset) | s->loc[locty].sts;
} else { } else {
@ -922,7 +921,7 @@ 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->loc[locty].w_offset < s->be_buffer_size) {
s->w_buffer[s->loc[locty].w_offset++] = s->buffer[s->loc[locty].w_offset++] =
(uint8_t)val; (uint8_t)val;
val >>= 8; val >>= 8;
size--; size--;
@ -937,7 +936,7 @@ static void tpm_tis_mmio_write(void *opaque, hwaddr addr,
/* 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->w_buffer); len = tpm_cmd_get_size(&s->buffer);
if (len > s->loc[locty].w_offset) { if (len > s->loc[locty].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);