diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-01-26 09:51:02 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-01-26 09:51:02 +0000 |
| commit | 9cd69f1a270235b652766f00b94114f48a2d603f (patch) | |
| tree | a0ebcbd5250f7aa41df839711295eea739d89735 | |
| parent | 31ee895047bdcf7387e3570cbd2a473c6f744b08 (diff) | |
| parent | 68a5b02a4684e6f9bbe5113499f88c0018469d08 (diff) | |
Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2021-01-25-1' into staging
Merge tpm 2021/01/25 v1
# gpg: Signature made Tue 26 Jan 2021 01:58:26 GMT
# gpg: using RSA key B818B9CADF9089C2D5CEC66B75AD65802A0B4211
# gpg: Good signature from "Stefan Berger <stefanb@linux.vnet.ibm.com>" [unknown]
# 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-2021-01-25-1:
tpm: tpm_spapr: Remove unused tracepoint
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/tpm/tpm_spapr.c | 8 | ||||
| -rw-r--r-- | hw/tpm/trace-events | 1 |
2 files changed, 2 insertions, 7 deletions
diff --git a/hw/tpm/tpm_spapr.c b/hw/tpm/tpm_spapr.c index e3775adc57..dea7b1333b 100644 --- a/hw/tpm/tpm_spapr.c +++ b/hw/tpm/tpm_spapr.c @@ -93,9 +93,7 @@ struct SpaprTpmState { */ static void tpm_spapr_tpm_send(SpaprTpmState *s) { - if (trace_event_get_state_backends(TRACE_TPM_SPAPR_SHOW_BUFFER)) { - tpm_util_show_buffer(s->buffer, s->be_buffer_size, "To TPM"); - } + tpm_util_show_buffer(s->buffer, s->be_buffer_size, "To TPM"); s->state = SPAPR_VTPM_STATE_EXECUTION; s->cmd = (TPMBackendCmd) { @@ -255,9 +253,7 @@ static void tpm_spapr_request_completed(TPMIf *ti, int ret) rc = spapr_vio_dma_write(&s->vdev, be32_to_cpu(crq->data), s->buffer, len); - if (trace_event_get_state_backends(TRACE_TPM_SPAPR_SHOW_BUFFER)) { - tpm_util_show_buffer(s->buffer, len, "From TPM"); - } + tpm_util_show_buffer(s->buffer, len, "From TPM"); crq->valid = SPAPR_VTPM_MSG_RESULT; if (rc == H_SUCCESS) { diff --git a/hw/tpm/trace-events b/hw/tpm/trace-events index 266de17d38..6005ecb5da 100644 --- a/hw/tpm/trace-events +++ b/hw/tpm/trace-events @@ -25,7 +25,6 @@ tpm_tis_pre_save(uint8_t locty, uint32_t rw_offset) "locty: %d, rw_offset = %u" tpm_ppi_memset(uint8_t *ptr, size_t size) "memset: %p %zu" # tpm_spapr.c -tpm_spapr_show_buffer(const char *direction, size_t len, const char *buf) "direction: %s len: %zu\n%s" tpm_spapr_do_crq(uint8_t raw1, uint8_t raw2) "1st 2 bytes in CRQ: 0x%02x 0x%02x" tpm_spapr_do_crq_crq_result(void) "SPAPR_VTPM_INIT_CRQ_RESULT" tpm_spapr_do_crq_crq_complete_result(void) "SPAPR_VTPM_INIT_CRQ_COMP_RESULT" |