diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-10-26 09:20:11 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-10-26 09:20:11 +0100 |
| commit | 325a084c1ebccb265a3c8f1dd092ffbbfb448a00 (patch) | |
| tree | cb94a661c36efc359ba4147d7d93493e4b3ca955 /hw | |
| parent | ae49fbbcd8e4e9d8bf7131add34773f579e1aff7 (diff) | |
| parent | 298d8b81d45d2297f88d93604bd5eebfd653d6cf (diff) | |
Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2017-10-24-1' into staging
Merge tpm 2017/10/24 v1
# gpg: Signature made Wed 25 Oct 2017 06:06:55 BST
# gpg: using RSA key 0x75AD65802A0B4211
# gpg: Good signature from "Stefan Berger <stefanb@linux.vnet.ibm.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: B818 B9CA DF90 89C2 D5CE C66B 75AD 6580 2A0B 4211
* remotes/stefanberger/tags/pull-tpm-2017-10-24-1:
tpm: print buffers received from TPM when debugging
vl: remove unnecessary #ifdef CONFIG_TPM
tpm: remove unnecessary #ifdef CONFIG_TPM
tpm: add stubs
tpm: add missing include
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/tpm/tpm_tis.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c index 8c5cac5fa5..7402528b25 100644 --- a/hw/tpm/tpm_tis.c +++ b/hw/tpm/tpm_tis.c @@ -422,6 +422,8 @@ static void tpm_tis_receive_bh(void *opaque) s->loc[locty].r_offset = 0; s->loc[locty].w_offset = 0; + tpm_tis_show_buffer(&s->loc[locty].r_buffer, "tpm_tis: From TPM"); + if (TPM_TIS_IS_VALID_LOCTY(s->next_locty)) { tpm_tis_abort(s, locty); } |