tpm-tis: fold TPMTISEmuState in TPMState

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
This commit is contained in:
Marc-André Lureau 2017-10-10 00:56:00 +02:00 committed by Stefan Berger
parent 732cd5877e
commit 3d4960c7ad
1 changed files with 156 additions and 178 deletions
hw/tpm

View File

@ -72,7 +72,10 @@ typedef struct TPMLocality {
TPMSizedBuffer r_buffer; TPMSizedBuffer r_buffer;
} TPMLocality; } TPMLocality;
typedef struct TPMTISEmuState { struct TPMState {
ISADevice busdev;
MemoryRegion mmio;
QEMUBH *bh; QEMUBH *bh;
uint32_t offset; uint32_t offset;
uint8_t buf[TPM_TIS_BUFFER_MAX]; uint8_t buf[TPM_TIS_BUFFER_MAX];
@ -85,15 +88,6 @@ typedef struct TPMTISEmuState {
qemu_irq irq; qemu_irq irq;
uint32_t irq_num; uint32_t irq_num;
} TPMTISEmuState;
struct TPMState {
ISADevice busdev;
MemoryRegion mmio;
union {
TPMTISEmuState tis;
} s;
uint8_t locty_number; uint8_t locty_number;
TPMBackendCmd cmd; TPMBackendCmd cmd;
@ -272,16 +266,15 @@ 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)
{ {
TPMTISEmuState *tis = &s->s.tis; TPMLocality *locty_data = &s->loc[locty];
TPMLocality *locty_data = &tis->loc[locty];
tpm_tis_show_buffer(&tis->loc[locty].w_buffer, "tpm_tis: To TPM"); tpm_tis_show_buffer(&s->loc[locty].w_buffer, "tpm_tis: To TPM");
/* /*
* w_offset serves as length indicator for length of data; * w_offset serves as length indicator for length of data;
* it's reset when the response comes back * it's reset when the response comes back
*/ */
tis->loc[locty].state = TPM_TIS_STATE_EXECUTION; s->loc[locty].state = TPM_TIS_STATE_EXECUTION;
s->cmd = (TPMBackendCmd) { s->cmd = (TPMBackendCmd) {
.locty = locty, .locty = locty,
@ -297,17 +290,15 @@ static void tpm_tis_tpm_send(TPMState *s, uint8_t locty)
/* raise an interrupt if allowed */ /* raise an interrupt if allowed */
static void tpm_tis_raise_irq(TPMState *s, uint8_t locty, uint32_t irqmask) static void tpm_tis_raise_irq(TPMState *s, uint8_t locty, uint32_t irqmask)
{ {
TPMTISEmuState *tis = &s->s.tis;
if (!TPM_TIS_IS_VALID_LOCTY(locty)) { if (!TPM_TIS_IS_VALID_LOCTY(locty)) {
return; return;
} }
if ((tis->loc[locty].inte & TPM_TIS_INT_ENABLED) && if ((s->loc[locty].inte & TPM_TIS_INT_ENABLED) &&
(tis->loc[locty].inte & irqmask)) { (s->loc[locty].inte & irqmask)) {
DPRINTF("tpm_tis: Raising IRQ for flag %08x\n", irqmask); DPRINTF("tpm_tis: Raising IRQ for flag %08x\n", irqmask);
qemu_irq_raise(s->s.tis.irq); qemu_irq_raise(s->irq);
tis->loc[locty].ints |= irqmask; s->loc[locty].ints |= irqmask;
} }
} }
@ -319,7 +310,7 @@ static uint32_t tpm_tis_check_request_use_except(TPMState *s, uint8_t locty)
if (l == locty) { if (l == locty) {
continue; continue;
} }
if ((s->s.tis.loc[l].access & TPM_TIS_ACCESS_REQUEST_USE)) { if ((s->loc[l].access & TPM_TIS_ACCESS_REQUEST_USE)) {
return 1; return 1;
} }
} }
@ -329,14 +320,13 @@ static uint32_t tpm_tis_check_request_use_except(TPMState *s, uint8_t locty)
static void tpm_tis_new_active_locality(TPMState *s, uint8_t new_active_locty) static void tpm_tis_new_active_locality(TPMState *s, uint8_t new_active_locty)
{ {
TPMTISEmuState *tis = &s->s.tis; bool change = (s->active_locty != new_active_locty);
bool change = (s->s.tis.active_locty != new_active_locty);
bool is_seize; bool is_seize;
uint8_t mask; uint8_t mask;
if (change && TPM_TIS_IS_VALID_LOCTY(s->s.tis.active_locty)) { if (change && TPM_TIS_IS_VALID_LOCTY(s->active_locty)) {
is_seize = TPM_TIS_IS_VALID_LOCTY(new_active_locty) && is_seize = TPM_TIS_IS_VALID_LOCTY(new_active_locty) &&
tis->loc[new_active_locty].access & TPM_TIS_ACCESS_SEIZE; s->loc[new_active_locty].access & TPM_TIS_ACCESS_SEIZE;
if (is_seize) { if (is_seize) {
mask = ~(TPM_TIS_ACCESS_ACTIVE_LOCALITY); mask = ~(TPM_TIS_ACCESS_ACTIVE_LOCALITY);
@ -345,73 +335,70 @@ static void tpm_tis_new_active_locality(TPMState *s, uint8_t new_active_locty)
TPM_TIS_ACCESS_REQUEST_USE); TPM_TIS_ACCESS_REQUEST_USE);
} }
/* reset flags on the old active locality */ /* reset flags on the old active locality */
tis->loc[s->s.tis.active_locty].access &= mask; s->loc[s->active_locty].access &= mask;
if (is_seize) { if (is_seize) {
tis->loc[tis->active_locty].access |= TPM_TIS_ACCESS_BEEN_SEIZED; s->loc[s->active_locty].access |= TPM_TIS_ACCESS_BEEN_SEIZED;
} }
} }
tis->active_locty = new_active_locty; s->active_locty = new_active_locty;
DPRINTF("tpm_tis: Active locality is now %d\n", s->s.tis.active_locty); DPRINTF("tpm_tis: Active locality is now %d\n", 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 */
tis->loc[new_active_locty].access |= TPM_TIS_ACCESS_ACTIVE_LOCALITY; s->loc[new_active_locty].access |= TPM_TIS_ACCESS_ACTIVE_LOCALITY;
tis->loc[new_active_locty].access &= ~(TPM_TIS_ACCESS_REQUEST_USE | s->loc[new_active_locty].access &= ~(TPM_TIS_ACCESS_REQUEST_USE |
TPM_TIS_ACCESS_SEIZE); TPM_TIS_ACCESS_SEIZE);
} }
if (change) { if (change) {
tpm_tis_raise_irq(s, tis->active_locty, TPM_TIS_INT_LOCALITY_CHANGED); tpm_tis_raise_irq(s, s->active_locty, TPM_TIS_INT_LOCALITY_CHANGED);
} }
} }
/* 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)
{ {
TPMTISEmuState *tis = &s->s.tis; s->loc[locty].r_offset = 0;
s->loc[locty].w_offset = 0;
tis->loc[locty].r_offset = 0; DPRINTF("tpm_tis: tis_abort: new active locality is %d\n", s->next_locty);
tis->loc[locty].w_offset = 0;
DPRINTF("tpm_tis: tis_abort: new active locality is %d\n", tis->next_locty);
/* /*
* Need to react differently depending on who's aborting now and * Need to react differently depending on who's aborting now and
* which locality will become active afterwards. * which locality will become active afterwards.
*/ */
if (tis->aborting_locty == tis->next_locty) { if (s->aborting_locty == s->next_locty) {
tis->loc[tis->aborting_locty].state = TPM_TIS_STATE_READY; s->loc[s->aborting_locty].state = TPM_TIS_STATE_READY;
tpm_tis_sts_set(&tis->loc[tis->aborting_locty], tpm_tis_sts_set(&s->loc[s->aborting_locty],
TPM_TIS_STS_COMMAND_READY); TPM_TIS_STS_COMMAND_READY);
tpm_tis_raise_irq(s, tis->aborting_locty, TPM_TIS_INT_COMMAND_READY); tpm_tis_raise_irq(s, s->aborting_locty, TPM_TIS_INT_COMMAND_READY);
} }
/* locality after abort is another one than the current one */ /* locality after abort is another one than the current one */
tpm_tis_new_active_locality(s, tis->next_locty); tpm_tis_new_active_locality(s, s->next_locty);
tis->next_locty = TPM_TIS_NO_LOCALITY; s->next_locty = TPM_TIS_NO_LOCALITY;
/* nobody's aborting a command anymore */ /* nobody's aborting a command anymore */
tis->aborting_locty = TPM_TIS_NO_LOCALITY; s->aborting_locty = TPM_TIS_NO_LOCALITY;
} }
/* prepare aborting current command */ /* prepare aborting current command */
static void tpm_tis_prep_abort(TPMState *s, uint8_t locty, uint8_t newlocty) static void tpm_tis_prep_abort(TPMState *s, uint8_t locty, uint8_t newlocty)
{ {
TPMTISEmuState *tis = &s->s.tis;
uint8_t busy_locty; uint8_t busy_locty;
tis->aborting_locty = locty; s->aborting_locty = locty;
tis->next_locty = newlocty; /* locality after successful abort */ s->next_locty = newlocty; /* locality after successful abort */
/* /*
* only abort a command using an interrupt if currently executing * only abort a command using an interrupt if currently executing
* a command AND if there's a valid connection to the vTPM. * a command AND if there's a valid connection to the vTPM.
*/ */
for (busy_locty = 0; busy_locty < TPM_TIS_NUM_LOCALITIES; busy_locty++) { for (busy_locty = 0; busy_locty < TPM_TIS_NUM_LOCALITIES; busy_locty++) {
if (tis->loc[busy_locty].state == TPM_TIS_STATE_EXECUTION) { if (s->loc[busy_locty].state == TPM_TIS_STATE_EXECUTION) {
/* /*
* request the backend to cancel. Some backends may not * request the backend to cancel. Some backends may not
* support it * support it
@ -427,16 +414,15 @@ static void tpm_tis_prep_abort(TPMState *s, uint8_t locty, uint8_t newlocty)
static void tpm_tis_receive_bh(void *opaque) static void tpm_tis_receive_bh(void *opaque)
{ {
TPMState *s = opaque; TPMState *s = opaque;
TPMTISEmuState *tis = &s->s.tis;
uint8_t locty = s->cmd.locty; uint8_t locty = s->cmd.locty;
tpm_tis_sts_set(&tis->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);
tis->loc[locty].state = TPM_TIS_STATE_COMPLETION; s->loc[locty].state = TPM_TIS_STATE_COMPLETION;
tis->loc[locty].r_offset = 0; s->loc[locty].r_offset = 0;
tis->loc[locty].w_offset = 0; s->loc[locty].w_offset = 0;
if (TPM_TIS_IS_VALID_LOCTY(tis->next_locty)) { if (TPM_TIS_IS_VALID_LOCTY(s->next_locty)) {
tpm_tis_abort(s, locty); tpm_tis_abort(s, locty);
} }
@ -449,18 +435,17 @@ static void tpm_tis_receive_bh(void *opaque)
*/ */
static void tpm_tis_receive_cb(TPMState *s) static void tpm_tis_receive_cb(TPMState *s)
{ {
TPMTISEmuState *tis = &s->s.tis;
bool is_selftest_done = s->cmd.selftest_done; bool is_selftest_done = s->cmd.selftest_done;
uint8_t locty = s->cmd.locty; uint8_t locty = s->cmd.locty;
uint8_t l; uint8_t l;
if (is_selftest_done) { if (is_selftest_done) {
for (l = 0; l < TPM_TIS_NUM_LOCALITIES; l++) { for (l = 0; l < TPM_TIS_NUM_LOCALITIES; l++) {
tis->loc[locty].sts |= TPM_TIS_STS_SELFTEST_DONE; s->loc[locty].sts |= TPM_TIS_STS_SELFTEST_DONE;
} }
} }
qemu_bh_schedule(tis->bh); qemu_bh_schedule(s->bh);
} }
/* /*
@ -468,21 +453,20 @@ static void tpm_tis_receive_cb(TPMState *s)
*/ */
static uint32_t tpm_tis_data_read(TPMState *s, uint8_t locty) static uint32_t tpm_tis_data_read(TPMState *s, uint8_t locty)
{ {
TPMTISEmuState *tis = &s->s.tis;
uint32_t ret = TPM_TIS_NO_DATA_BYTE; uint32_t ret = TPM_TIS_NO_DATA_BYTE;
uint16_t len; uint16_t len;
if ((tis->loc[locty].sts & TPM_TIS_STS_DATA_AVAILABLE)) { if ((s->loc[locty].sts & TPM_TIS_STS_DATA_AVAILABLE)) {
len = tpm_tis_get_size_from_buffer(&tis->loc[locty].r_buffer); len = tpm_tis_get_size_from_buffer(&s->loc[locty].r_buffer);
ret = tis->loc[locty].r_buffer.buffer[tis->loc[locty].r_offset++]; ret = s->loc[locty].r_buffer.buffer[s->loc[locty].r_offset++];
if (tis->loc[locty].r_offset >= len) { if (s->loc[locty].r_offset >= len) {
/* got last byte */ /* got last byte */
tpm_tis_sts_set(&tis->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, tis->loc[locty].r_offset-1); ret, s->loc[locty].r_offset - 1);
} }
return ret; return ret;
@ -505,13 +489,12 @@ static void tpm_tis_dump_state(void *opaque, hwaddr addr)
uint8_t locty = tpm_tis_locality_from_addr(addr); uint8_t locty = tpm_tis_locality_from_addr(addr);
hwaddr base = addr & ~0xfff; hwaddr base = addr & ~0xfff;
TPMState *s = opaque; TPMState *s = opaque;
TPMTISEmuState *tis = &s->s.tis;
DPRINTF("tpm_tis: active locality : %d\n" DPRINTF("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",
tis->active_locty, s->active_locty,
locty, tis->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], DPRINTF("tpm_tis: 0x%04x : 0x%08x\n", regs[idx],
@ -520,25 +503,25 @@ 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 : ",
tis->loc[locty].r_offset); s->loc[locty].r_offset);
for (idx = 0; for (idx = 0;
idx < tpm_tis_get_size_from_buffer(&tis->loc[locty].r_buffer); idx < tpm_tis_get_size_from_buffer(&s->loc[locty].r_buffer);
idx++) { idx++) {
DPRINTF("%c%02x%s", DPRINTF("%c%02x%s",
tis->loc[locty].r_offset == idx ? '>' : ' ', s->loc[locty].r_offset == idx ? '>' : ' ',
tis->loc[locty].r_buffer.buffer[idx], s->loc[locty].r_buffer.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: ",
tis->loc[locty].w_offset); s->loc[locty].w_offset);
for (idx = 0; for (idx = 0;
idx < tpm_tis_get_size_from_buffer(&tis->loc[locty].w_buffer); idx < tpm_tis_get_size_from_buffer(&s->loc[locty].w_buffer);
idx++) { idx++) {
DPRINTF("%c%02x%s", DPRINTF("%c%02x%s",
tis->loc[locty].w_offset == idx ? '>' : ' ', s->loc[locty].w_offset == idx ? '>' : ' ',
tis->loc[locty].w_buffer.buffer[idx], s->loc[locty].w_buffer.buffer[idx],
((idx & 0xf) == 0xf) ? "\ntpm_tis: " : ""); ((idx & 0xf) == 0xf) ? "\ntpm_tis: " : "");
} }
DPRINTF("\n"); DPRINTF("\n");
@ -553,7 +536,6 @@ static uint64_t tpm_tis_mmio_read(void *opaque, hwaddr addr,
unsigned size) unsigned size)
{ {
TPMState *s = opaque; TPMState *s = opaque;
TPMTISEmuState *tis = &s->s.tis;
uint16_t offset = addr & 0xffc; uint16_t offset = addr & 0xffc;
uint8_t shift = (addr & 0x3) * 8; uint8_t shift = (addr & 0x3) * 8;
uint32_t val = 0xffffffff; uint32_t val = 0xffffffff;
@ -568,7 +550,7 @@ static uint64_t tpm_tis_mmio_read(void *opaque, hwaddr addr,
switch (offset) { switch (offset) {
case TPM_TIS_REG_ACCESS: case TPM_TIS_REG_ACCESS:
/* never show the SEIZE flag even though we use it internally */ /* never show the SEIZE flag even though we use it internally */
val = tis->loc[locty].access & ~TPM_TIS_ACCESS_SEIZE; val = s->loc[locty].access & ~TPM_TIS_ACCESS_SEIZE;
/* the pending flag is always calculated */ /* the pending flag is always calculated */
if (tpm_tis_check_request_use_except(s, locty)) { if (tpm_tis_check_request_use_except(s, locty)) {
val |= TPM_TIS_ACCESS_PENDING_REQUEST; val |= TPM_TIS_ACCESS_PENDING_REQUEST;
@ -576,13 +558,13 @@ static uint64_t tpm_tis_mmio_read(void *opaque, hwaddr addr,
val |= !tpm_backend_get_tpm_established_flag(s->be_driver); val |= !tpm_backend_get_tpm_established_flag(s->be_driver);
break; break;
case TPM_TIS_REG_INT_ENABLE: case TPM_TIS_REG_INT_ENABLE:
val = tis->loc[locty].inte; val = s->loc[locty].inte;
break; break;
case TPM_TIS_REG_INT_VECTOR: case TPM_TIS_REG_INT_VECTOR:
val = tis->irq_num; val = s->irq_num;
break; break;
case TPM_TIS_REG_INT_STATUS: case TPM_TIS_REG_INT_STATUS:
val = tis->loc[locty].ints; val = s->loc[locty].ints;
break; break;
case TPM_TIS_REG_INTF_CAPABILITY: case TPM_TIS_REG_INTF_CAPABILITY:
switch (s->be_tpm_version) { switch (s->be_tpm_version) {
@ -598,14 +580,14 @@ static uint64_t tpm_tis_mmio_read(void *opaque, hwaddr addr,
} }
break; break;
case TPM_TIS_REG_STS: case TPM_TIS_REG_STS:
if (tis->active_locty == locty) { if (s->active_locty == locty) {
if ((tis->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(
tpm_tis_get_size_from_buffer(&tis->loc[locty].r_buffer) tpm_tis_get_size_from_buffer(&s->loc[locty].r_buffer)
- tis->loc[locty].r_offset) | tis->loc[locty].sts; - s->loc[locty].r_offset) | s->loc[locty].sts;
} else { } else {
avail = tis->loc[locty].w_buffer.size avail = s->loc[locty].w_buffer.size
- tis->loc[locty].w_offset; - s->loc[locty].w_offset;
/* /*
* byte-sized reads should not return 0x00 for 0x100 * byte-sized reads should not return 0x00 for 0x100
* available bytes. * available bytes.
@ -613,13 +595,13 @@ static uint64_t tpm_tis_mmio_read(void *opaque, hwaddr addr,
if (size == 1 && avail > 0xff) { if (size == 1 && avail > 0xff) {
avail = 0xff; avail = 0xff;
} }
val = TPM_TIS_BURST_COUNT(avail) | tis->loc[locty].sts; val = TPM_TIS_BURST_COUNT(avail) | s->loc[locty].sts;
} }
} }
break; break;
case TPM_TIS_REG_DATA_FIFO: case TPM_TIS_REG_DATA_FIFO:
case TPM_TIS_REG_DATA_XFIFO ... TPM_TIS_REG_DATA_XFIFO_END: case TPM_TIS_REG_DATA_XFIFO ... TPM_TIS_REG_DATA_XFIFO_END:
if (tis->active_locty == locty) { if (s->active_locty == locty) {
if (size > 4 - (addr & 0x3)) { if (size > 4 - (addr & 0x3)) {
/* prevent access beyond FIFO */ /* prevent access beyond FIFO */
size = 4 - (addr & 0x3); size = 4 - (addr & 0x3);
@ -627,7 +609,7 @@ static uint64_t tpm_tis_mmio_read(void *opaque, hwaddr addr,
val = 0; val = 0;
shift = 0; shift = 0;
while (size > 0) { while (size > 0) {
switch (tis->loc[locty].state) { switch (s->loc[locty].state) {
case TPM_TIS_STATE_COMPLETION: case TPM_TIS_STATE_COMPLETION:
v = tpm_tis_data_read(s, locty); v = tpm_tis_data_read(s, locty);
break; break;
@ -643,7 +625,7 @@ static uint64_t tpm_tis_mmio_read(void *opaque, hwaddr addr,
} }
break; break;
case TPM_TIS_REG_INTERFACE_ID: case TPM_TIS_REG_INTERFACE_ID:
val = tis->loc[locty].iface_id; val = s->loc[locty].iface_id;
break; break;
case TPM_TIS_REG_DID_VID: case TPM_TIS_REG_DID_VID:
val = (TPM_TIS_TPM_DID << 16) | TPM_TIS_TPM_VID; val = (TPM_TIS_TPM_DID << 16) | TPM_TIS_TPM_VID;
@ -675,7 +657,6 @@ static void tpm_tis_mmio_write(void *opaque, hwaddr addr,
uint64_t val, unsigned size) uint64_t val, unsigned size)
{ {
TPMState *s = opaque; TPMState *s = opaque;
TPMTISEmuState *tis = &s->s.tis;
uint16_t off = addr & 0xffc; uint16_t off = addr & 0xffc;
uint8_t shift = (addr & 0x3) * 8; uint8_t shift = (addr & 0x3) * 8;
uint8_t locty = tpm_tis_locality_from_addr(addr); uint8_t locty = tpm_tis_locality_from_addr(addr);
@ -712,17 +693,17 @@ static void tpm_tis_mmio_write(void *opaque, hwaddr addr,
TPM_TIS_ACCESS_ACTIVE_LOCALITY); TPM_TIS_ACCESS_ACTIVE_LOCALITY);
} }
active_locty = tis->active_locty; active_locty = s->active_locty;
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 (tis->active_locty == locty) { if (s->active_locty == locty) {
DPRINTF("tpm_tis: Releasing locality %d\n", locty); DPRINTF("tpm_tis: Releasing locality %d\n", 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 ((tis->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); DPRINTF("tpm_tis: Locality %d requests use.\n", c);
newlocty = c; newlocty = c;
break; break;
@ -740,12 +721,12 @@ static void tpm_tis_mmio_write(void *opaque, hwaddr addr,
} }
} else { } else {
/* not currently the owner; clear a pending request */ /* not currently the owner; clear a pending request */
tis->loc[locty].access &= ~TPM_TIS_ACCESS_REQUEST_USE; s->loc[locty].access &= ~TPM_TIS_ACCESS_REQUEST_USE;
} }
} }
if ((val & TPM_TIS_ACCESS_BEEN_SEIZED)) { if ((val & TPM_TIS_ACCESS_BEEN_SEIZED)) {
tis->loc[locty].access &= ~TPM_TIS_ACCESS_BEEN_SEIZED; s->loc[locty].access &= ~TPM_TIS_ACCESS_BEEN_SEIZED;
} }
if ((val & TPM_TIS_ACCESS_SEIZE)) { if ((val & TPM_TIS_ACCESS_SEIZE)) {
@ -756,19 +737,19 @@ static void tpm_tis_mmio_write(void *opaque, hwaddr addr,
* allow seize for requesting locality if no locality is * allow seize for requesting locality if no locality is
* active * active
*/ */
while ((TPM_TIS_IS_VALID_LOCTY(tis->active_locty) && while ((TPM_TIS_IS_VALID_LOCTY(s->active_locty) &&
locty > tis->active_locty) || locty > s->active_locty) ||
!TPM_TIS_IS_VALID_LOCTY(tis->active_locty)) { !TPM_TIS_IS_VALID_LOCTY(s->active_locty)) {
bool higher_seize = FALSE; bool higher_seize = FALSE;
/* already a pending SEIZE ? */ /* already a pending SEIZE ? */
if ((tis->loc[locty].access & TPM_TIS_ACCESS_SEIZE)) { if ((s->loc[locty].access & TPM_TIS_ACCESS_SEIZE)) {
break; break;
} }
/* check for ongoing seize by a higher locality */ /* check for ongoing seize by a higher locality */
for (l = locty + 1; l < TPM_TIS_NUM_LOCALITIES; l++) { for (l = locty + 1; l < TPM_TIS_NUM_LOCALITIES; l++) {
if ((tis->loc[l].access & TPM_TIS_ACCESS_SEIZE)) { if ((s->loc[l].access & TPM_TIS_ACCESS_SEIZE)) {
higher_seize = TRUE; higher_seize = TRUE;
break; break;
} }
@ -780,24 +761,24 @@ static void tpm_tis_mmio_write(void *opaque, hwaddr addr,
/* cancel any seize by a lower locality */ /* cancel any seize by a lower locality */
for (l = 0; l < locty - 1; l++) { for (l = 0; l < locty - 1; l++) {
tis->loc[l].access &= ~TPM_TIS_ACCESS_SEIZE; s->loc[l].access &= ~TPM_TIS_ACCESS_SEIZE;
} }
tis->loc[locty].access |= TPM_TIS_ACCESS_SEIZE; s->loc[locty].access |= TPM_TIS_ACCESS_SEIZE;
DPRINTF("tpm_tis: TPM_TIS_ACCESS_SEIZE: " DPRINTF("tpm_tis: TPM_TIS_ACCESS_SEIZE: "
"Locality %d seized from locality %d\n", "Locality %d seized from locality %d\n",
locty, tis->active_locty); locty, s->active_locty);
DPRINTF("tpm_tis: TPM_TIS_ACCESS_SEIZE: Initiating abort.\n"); DPRINTF("tpm_tis: TPM_TIS_ACCESS_SEIZE: Initiating abort.\n");
set_new_locty = 0; set_new_locty = 0;
tpm_tis_prep_abort(s, tis->active_locty, locty); tpm_tis_prep_abort(s, s->active_locty, locty);
break; break;
} }
} }
if ((val & TPM_TIS_ACCESS_REQUEST_USE)) { if ((val & TPM_TIS_ACCESS_REQUEST_USE)) {
if (tis->active_locty != locty) { if (s->active_locty != locty) {
if (TPM_TIS_IS_VALID_LOCTY(tis->active_locty)) { if (TPM_TIS_IS_VALID_LOCTY(s->active_locty)) {
tis->loc[locty].access |= TPM_TIS_ACCESS_REQUEST_USE; s->loc[locty].access |= TPM_TIS_ACCESS_REQUEST_USE;
} else { } else {
/* no locality active -> make this one active now */ /* no locality active -> make this one active now */
active_locty = locty; active_locty = locty;
@ -811,12 +792,12 @@ static void tpm_tis_mmio_write(void *opaque, hwaddr addr,
break; break;
case TPM_TIS_REG_INT_ENABLE: case TPM_TIS_REG_INT_ENABLE:
if (tis->active_locty != locty) { if (s->active_locty != locty) {
break; break;
} }
tis->loc[locty].inte &= mask; s->loc[locty].inte &= mask;
tis->loc[locty].inte |= (val & (TPM_TIS_INT_ENABLED | s->loc[locty].inte |= (val & (TPM_TIS_INT_ENABLED |
TPM_TIS_INT_POLARITY_MASK | TPM_TIS_INT_POLARITY_MASK |
TPM_TIS_INTERRUPTS_SUPPORTED)); TPM_TIS_INTERRUPTS_SUPPORTED));
break; break;
@ -824,30 +805,30 @@ static void tpm_tis_mmio_write(void *opaque, hwaddr addr,
/* hard wired -- ignore */ /* hard wired -- ignore */
break; break;
case TPM_TIS_REG_INT_STATUS: case TPM_TIS_REG_INT_STATUS:
if (tis->active_locty != locty) { if (s->active_locty != locty) {
break; break;
} }
/* clearing of interrupt flags */ /* clearing of interrupt flags */
if (((val & TPM_TIS_INTERRUPTS_SUPPORTED)) && if (((val & TPM_TIS_INTERRUPTS_SUPPORTED)) &&
(tis->loc[locty].ints & TPM_TIS_INTERRUPTS_SUPPORTED)) { (s->loc[locty].ints & TPM_TIS_INTERRUPTS_SUPPORTED)) {
tis->loc[locty].ints &= ~val; s->loc[locty].ints &= ~val;
if (tis->loc[locty].ints == 0) { if (s->loc[locty].ints == 0) {
qemu_irq_lower(tis->irq); qemu_irq_lower(s->irq);
DPRINTF("tpm_tis: Lowering IRQ\n"); DPRINTF("tpm_tis: Lowering IRQ\n");
} }
} }
tis->loc[locty].ints &= ~(val & TPM_TIS_INTERRUPTS_SUPPORTED); s->loc[locty].ints &= ~(val & TPM_TIS_INTERRUPTS_SUPPORTED);
break; break;
case TPM_TIS_REG_STS: case TPM_TIS_REG_STS:
if (tis->active_locty != locty) { if (s->active_locty != locty) {
break; break;
} }
if (s->be_tpm_version == TPM_VERSION_2_0) { if (s->be_tpm_version == TPM_VERSION_2_0) {
/* some flags that are only supported for TPM 2 */ /* some flags that are only supported for TPM 2 */
if (val & TPM_TIS_STS_COMMAND_CANCEL) { if (val & TPM_TIS_STS_COMMAND_CANCEL) {
if (tis->loc[locty].state == TPM_TIS_STATE_EXECUTION) { if (s->loc[locty].state == TPM_TIS_STATE_EXECUTION) {
/* /*
* request the backend to cancel. Some backends may not * request the backend to cancel. Some backends may not
* support it * support it
@ -867,16 +848,16 @@ static void tpm_tis_mmio_write(void *opaque, hwaddr addr,
TPM_TIS_STS_RESPONSE_RETRY); TPM_TIS_STS_RESPONSE_RETRY);
if (val == TPM_TIS_STS_COMMAND_READY) { if (val == TPM_TIS_STS_COMMAND_READY) {
switch (tis->loc[locty].state) { switch (s->loc[locty].state) {
case TPM_TIS_STATE_READY: case TPM_TIS_STATE_READY:
tis->loc[locty].w_offset = 0; s->loc[locty].w_offset = 0;
tis->loc[locty].r_offset = 0; s->loc[locty].r_offset = 0;
break; break;
case TPM_TIS_STATE_IDLE: case TPM_TIS_STATE_IDLE:
tpm_tis_sts_set(&tis->loc[locty], TPM_TIS_STS_COMMAND_READY); tpm_tis_sts_set(&s->loc[locty], TPM_TIS_STS_COMMAND_READY);
tis->loc[locty].state = TPM_TIS_STATE_READY; s->loc[locty].state = TPM_TIS_STATE_READY;
tpm_tis_raise_irq(s, locty, TPM_TIS_INT_COMMAND_READY); tpm_tis_raise_irq(s, locty, TPM_TIS_INT_COMMAND_READY);
break; break;
@ -889,23 +870,23 @@ static void tpm_tis_mmio_write(void *opaque, hwaddr addr,
break; break;
case TPM_TIS_STATE_COMPLETION: case TPM_TIS_STATE_COMPLETION:
tis->loc[locty].w_offset = 0; s->loc[locty].w_offset = 0;
tis->loc[locty].r_offset = 0; s->loc[locty].r_offset = 0;
/* shortcut to ready state with C/R set */ /* shortcut to ready state with C/R set */
tis->loc[locty].state = TPM_TIS_STATE_READY; s->loc[locty].state = TPM_TIS_STATE_READY;
if (!(tis->loc[locty].sts & TPM_TIS_STS_COMMAND_READY)) { if (!(s->loc[locty].sts & TPM_TIS_STS_COMMAND_READY)) {
tpm_tis_sts_set(&tis->loc[locty], tpm_tis_sts_set(&s->loc[locty],
TPM_TIS_STS_COMMAND_READY); TPM_TIS_STS_COMMAND_READY);
tpm_tis_raise_irq(s, locty, TPM_TIS_INT_COMMAND_READY); tpm_tis_raise_irq(s, locty, TPM_TIS_INT_COMMAND_READY);
} }
tis->loc[locty].sts &= ~(TPM_TIS_STS_DATA_AVAILABLE); s->loc[locty].sts &= ~(TPM_TIS_STS_DATA_AVAILABLE);
break; break;
} }
} else if (val == TPM_TIS_STS_TPM_GO) { } else if (val == TPM_TIS_STS_TPM_GO) {
switch (tis->loc[locty].state) { switch (s->loc[locty].state) {
case TPM_TIS_STATE_RECEPTION: case TPM_TIS_STATE_RECEPTION:
if ((tis->loc[locty].sts & TPM_TIS_STS_EXPECT) == 0) { if ((s->loc[locty].sts & TPM_TIS_STS_EXPECT) == 0) {
tpm_tis_tpm_send(s, locty); tpm_tis_tpm_send(s, locty);
} }
break; break;
@ -914,10 +895,10 @@ static void tpm_tis_mmio_write(void *opaque, hwaddr addr,
break; break;
} }
} else if (val == TPM_TIS_STS_RESPONSE_RETRY) { } else if (val == TPM_TIS_STS_RESPONSE_RETRY) {
switch (tis->loc[locty].state) { switch (s->loc[locty].state) {
case TPM_TIS_STATE_COMPLETION: case TPM_TIS_STATE_COMPLETION:
tis->loc[locty].r_offset = 0; s->loc[locty].r_offset = 0;
tpm_tis_sts_set(&tis->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);
break; break;
@ -930,20 +911,20 @@ static void tpm_tis_mmio_write(void *opaque, hwaddr addr,
case TPM_TIS_REG_DATA_FIFO: case TPM_TIS_REG_DATA_FIFO:
case TPM_TIS_REG_DATA_XFIFO ... TPM_TIS_REG_DATA_XFIFO_END: case TPM_TIS_REG_DATA_XFIFO ... TPM_TIS_REG_DATA_XFIFO_END:
/* data fifo */ /* data fifo */
if (tis->active_locty != locty) { if (s->active_locty != locty) {
break; break;
} }
if (tis->loc[locty].state == TPM_TIS_STATE_IDLE || if (s->loc[locty].state == TPM_TIS_STATE_IDLE ||
tis->loc[locty].state == TPM_TIS_STATE_EXECUTION || s->loc[locty].state == TPM_TIS_STATE_EXECUTION ||
tis->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", DPRINTF("tpm_tis: Data to send to TPM: %08x (size=%d)\n",
(int)val, size); (int)val, size);
if (tis->loc[locty].state == TPM_TIS_STATE_READY) { if (s->loc[locty].state == TPM_TIS_STATE_READY) {
tis->loc[locty].state = TPM_TIS_STATE_RECEPTION; s->loc[locty].state = TPM_TIS_STATE_RECEPTION;
tpm_tis_sts_set(&tis->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);
} }
@ -953,30 +934,30 @@ static void tpm_tis_mmio_write(void *opaque, hwaddr addr,
size = 4 - (addr & 0x3); size = 4 - (addr & 0x3);
} }
while ((tis->loc[locty].sts & TPM_TIS_STS_EXPECT) && size > 0) { while ((s->loc[locty].sts & TPM_TIS_STS_EXPECT) && size > 0) {
if (tis->loc[locty].w_offset < tis->loc[locty].w_buffer.size) { if (s->loc[locty].w_offset < s->loc[locty].w_buffer.size) {
tis->loc[locty].w_buffer. s->loc[locty].w_buffer.
buffer[tis->loc[locty].w_offset++] = (uint8_t)val; buffer[s->loc[locty].w_offset++] = (uint8_t)val;
val >>= 8; val >>= 8;
size--; size--;
} else { } else {
tpm_tis_sts_set(&tis->loc[locty], TPM_TIS_STS_VALID); tpm_tis_sts_set(&s->loc[locty], TPM_TIS_STS_VALID);
} }
} }
/* check for complete packet */ /* check for complete packet */
if (tis->loc[locty].w_offset > 5 && if (s->loc[locty].w_offset > 5 &&
(tis->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 = !(tis->loc[locty].sts & TPM_TIS_STS_VALID); bool need_irq = !(s->loc[locty].sts & TPM_TIS_STS_VALID);
len = tpm_tis_get_size_from_buffer(&tis->loc[locty].w_buffer); len = tpm_tis_get_size_from_buffer(&s->loc[locty].w_buffer);
if (len > tis->loc[locty].w_offset) { if (len > s->loc[locty].w_offset) {
tpm_tis_sts_set(&tis->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 {
/* packet complete */ /* packet complete */
tpm_tis_sts_set(&tis->loc[locty], TPM_TIS_STS_VALID); tpm_tis_sts_set(&s->loc[locty], TPM_TIS_STS_VALID);
} }
if (need_irq) { if (need_irq) {
tpm_tis_raise_irq(s, locty, TPM_TIS_INT_STS_VALID); tpm_tis_raise_irq(s, locty, TPM_TIS_INT_STS_VALID);
@ -987,7 +968,7 @@ static void tpm_tis_mmio_write(void *opaque, hwaddr addr,
case TPM_TIS_REG_INTERFACE_ID: case TPM_TIS_REG_INTERFACE_ID:
if (val & TPM_TIS_IFACE_ID_INT_SEL_LOCK) { if (val & TPM_TIS_IFACE_ID_INT_SEL_LOCK) {
for (l = 0; l < TPM_TIS_NUM_LOCALITIES; l++) { for (l = 0; l < TPM_TIS_NUM_LOCALITIES; l++) {
tis->loc[l].iface_id |= TPM_TIS_IFACE_ID_INT_SEL_LOCK; s->loc[l].iface_id |= TPM_TIS_IFACE_ID_INT_SEL_LOCK;
} }
} }
break; break;
@ -1036,39 +1017,38 @@ TPMVersion tpm_tis_get_tpm_version(Object *obj)
static void tpm_tis_reset(DeviceState *dev) static void tpm_tis_reset(DeviceState *dev)
{ {
TPMState *s = TPM(dev); TPMState *s = TPM(dev);
TPMTISEmuState *tis = &s->s.tis;
int c; int c;
s->be_tpm_version = tpm_backend_get_tpm_version(s->be_driver); s->be_tpm_version = tpm_backend_get_tpm_version(s->be_driver);
tpm_backend_reset(s->be_driver); tpm_backend_reset(s->be_driver);
tis->active_locty = TPM_TIS_NO_LOCALITY; s->active_locty = TPM_TIS_NO_LOCALITY;
tis->next_locty = TPM_TIS_NO_LOCALITY; s->next_locty = TPM_TIS_NO_LOCALITY;
tis->aborting_locty = TPM_TIS_NO_LOCALITY; s->aborting_locty = TPM_TIS_NO_LOCALITY;
for (c = 0; c < TPM_TIS_NUM_LOCALITIES; c++) { for (c = 0; c < TPM_TIS_NUM_LOCALITIES; c++) {
tis->loc[c].access = TPM_TIS_ACCESS_TPM_REG_VALID_STS; s->loc[c].access = TPM_TIS_ACCESS_TPM_REG_VALID_STS;
switch (s->be_tpm_version) { switch (s->be_tpm_version) {
case TPM_VERSION_UNSPEC: case TPM_VERSION_UNSPEC:
break; break;
case TPM_VERSION_1_2: case TPM_VERSION_1_2:
tis->loc[c].sts = TPM_TIS_STS_TPM_FAMILY1_2; s->loc[c].sts = TPM_TIS_STS_TPM_FAMILY1_2;
tis->loc[c].iface_id = TPM_TIS_IFACE_ID_SUPPORTED_FLAGS1_3; s->loc[c].iface_id = TPM_TIS_IFACE_ID_SUPPORTED_FLAGS1_3;
break; break;
case TPM_VERSION_2_0: case TPM_VERSION_2_0:
tis->loc[c].sts = TPM_TIS_STS_TPM_FAMILY2_0; s->loc[c].sts = TPM_TIS_STS_TPM_FAMILY2_0;
tis->loc[c].iface_id = TPM_TIS_IFACE_ID_SUPPORTED_FLAGS2_0; s->loc[c].iface_id = TPM_TIS_IFACE_ID_SUPPORTED_FLAGS2_0;
break; break;
} }
tis->loc[c].inte = TPM_TIS_INT_POLARITY_LOW_LEVEL; s->loc[c].inte = TPM_TIS_INT_POLARITY_LOW_LEVEL;
tis->loc[c].ints = 0; s->loc[c].ints = 0;
tis->loc[c].state = TPM_TIS_STATE_IDLE; s->loc[c].state = TPM_TIS_STATE_IDLE;
tis->loc[c].w_offset = 0; s->loc[c].w_offset = 0;
tpm_tis_realloc_buffer(&tis->loc[c].w_buffer); tpm_tis_realloc_buffer(&s->loc[c].w_buffer);
tis->loc[c].r_offset = 0; s->loc[c].r_offset = 0;
tpm_tis_realloc_buffer(&tis->loc[c].r_buffer); tpm_tis_realloc_buffer(&s->loc[c].r_buffer);
} }
tpm_tis_do_startup_tpm(s); tpm_tis_do_startup_tpm(s);
@ -1080,8 +1060,7 @@ static const VMStateDescription vmstate_tpm_tis = {
}; };
static Property tpm_tis_properties[] = { static Property tpm_tis_properties[] = {
DEFINE_PROP_UINT32("irq", TPMState, DEFINE_PROP_UINT32("irq", TPMState, irq_num, TPM_TIS_IRQ),
s.tis.irq_num, TPM_TIS_IRQ),
DEFINE_PROP_STRING("tpmdev", TPMState, backend), DEFINE_PROP_STRING("tpmdev", TPMState, backend),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };
@ -1089,7 +1068,6 @@ static Property tpm_tis_properties[] = {
static void tpm_tis_realizefn(DeviceState *dev, Error **errp) static void tpm_tis_realizefn(DeviceState *dev, Error **errp)
{ {
TPMState *s = TPM(dev); TPMState *s = TPM(dev);
TPMTISEmuState *tis = &s->s.tis;
s->be_driver = qemu_find_tpm(s->backend); s->be_driver = qemu_find_tpm(s->backend);
if (!s->be_driver) { if (!s->be_driver) {
@ -1106,15 +1084,15 @@ static void tpm_tis_realizefn(DeviceState *dev, Error **errp)
return; return;
} }
if (tis->irq_num > 15) { if (s->irq_num > 15) {
error_setg(errp, "tpm_tis: IRQ %d for TPM TIS is outside valid range " error_setg(errp, "tpm_tis: IRQ %d for TPM TIS is outside valid range "
"of 0 to 15", tis->irq_num); "of 0 to 15", s->irq_num);
return; return;
} }
tis->bh = qemu_bh_new(tpm_tis_receive_bh, s); s->bh = qemu_bh_new(tpm_tis_receive_bh, s);
isa_init_irq(&s->busdev, &tis->irq, tis->irq_num); isa_init_irq(&s->busdev, &s->irq, s->irq_num);
memory_region_add_subregion(isa_address_space(ISA_DEVICE(dev)), memory_region_add_subregion(isa_address_space(ISA_DEVICE(dev)),
TPM_TIS_ADDR_BASE, &s->mmio); TPM_TIS_ADDR_BASE, &s->mmio);