Re: [Qemu-devel] [PATCH 18/42] tpm-tis: remove tpm_tis.h header

[Stefan Berger <stefanb@linux.vnet.ibm.com>]

On 10/09/2017 06:55 PM, Marc-André Lureau wrote:
> The definitions are now private to TIS implementation.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>


With that stray locty_number, introduced in previous patch, removed:

Reviewed-by: Stefan Berger <stefanb@linux.vnet.ibm.com>

> ---
>   hw/tpm/tpm_tis.h         | 94 ------------------------------------------------
>   hw/tpm/tpm_passthrough.c |  1 -
>   hw/tpm/tpm_tis.c         | 72 ++++++++++++++++++++++++++++++++++++-
>   3 files changed, 71 insertions(+), 96 deletions(-)
>   delete mode 100644 hw/tpm/tpm_tis.h
>
> diff --git a/hw/tpm/tpm_tis.h b/hw/tpm/tpm_tis.h
> deleted file mode 100644
> index 30e35eef64..0000000000
> --- a/hw/tpm/tpm_tis.h
> +++ /dev/null
> @@ -1,94 +0,0 @@
> -/*
> - * tpm_tis.h - QEMU's TPM TIS interface emulator
> - *
> - * Copyright (C) 2006, 2010-2013 IBM Corporation
> - *
> - * Authors:
> - *  Stefan Berger <stefanb@us.ibm.com>
> - *  David Safford <safford@us.ibm.com>
> - *
> - * This work is licensed under the terms of the GNU GPL, version 2 or later.
> - * See the COPYING file in the top-level directory.
> - *
> - * Implementation of the TIS interface according to specs found at
> - * http://www.trustedcomputinggroup.org
> - *
> - */
> -#ifndef TPM_TPM_TIS_H
> -#define TPM_TPM_TIS_H
> -
> -#include "hw/isa/isa.h"
> -#include "hw/acpi/tpm.h"
> -#include "qemu-common.h"
> -
> -#define TPM_TIS_NUM_LOCALITIES      5     /* per spec */
> -#define TPM_TIS_LOCALITY_SHIFT      12
> -#define TPM_TIS_NO_LOCALITY         0xff
> -
> -#define TPM_TIS_IS_VALID_LOCTY(x)   ((x) < TPM_TIS_NUM_LOCALITIES)
> -
> -#define TPM_TIS_BUFFER_MAX          4096
> -
> -typedef enum {
> -    TPM_TIS_STATE_IDLE = 0,
> -    TPM_TIS_STATE_READY,
> -    TPM_TIS_STATE_COMPLETION,
> -    TPM_TIS_STATE_EXECUTION,
> -    TPM_TIS_STATE_RECEPTION,
> -} TPMTISState;
> -
> -typedef struct TPMSizedBuffer {
> -    uint32_t size;
> -    uint8_t  *buffer;
> -} TPMSizedBuffer;
> -
> -/* locality data  -- all fields are persisted */
> -typedef struct TPMLocality {
> -    TPMTISState state;
> -    uint8_t access;
> -    uint32_t sts;
> -    uint32_t iface_id;
> -    uint32_t inte;
> -    uint32_t ints;
> -
> -    uint16_t w_offset;
> -    uint16_t r_offset;
> -    TPMSizedBuffer w_buffer;
> -    TPMSizedBuffer r_buffer;
> -} TPMLocality;
> -
> -typedef struct TPMTISEmuState {
> -    QEMUBH *bh;
> -    uint32_t offset;
> -    uint8_t buf[TPM_TIS_BUFFER_MAX];
> -
> -    uint8_t active_locty;
> -    uint8_t aborting_locty;
> -    uint8_t next_locty;
> -
> -    TPMLocality loc[TPM_TIS_NUM_LOCALITIES];
> -
> -    qemu_irq irq;
> -    uint32_t irq_num;
> -} TPMTISEmuState;
> -
> -/* overall state of the TPM interface */
> -struct TPMState {
> -    ISADevice busdev;
> -    MemoryRegion mmio;
> -
> -    union {
> -        TPMTISEmuState tis;
> -    } s;
> -
> -    uint8_t     locty_number;
> -    TPMBackendCmd cmd;
> -
> -    char *backend;
> -    TPMBackend *be_driver;
> -    TPMVersion be_tpm_version;
> -};
> -
> -#define TPM(obj) OBJECT_CHECK(TPMState, (obj), TYPE_TPM_TIS)
> -
> -#endif /* TPM_TPM_TIS_H */
> diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c
> index 93d72b8e9e..4274164a61 100644
> --- a/hw/tpm/tpm_passthrough.c
> +++ b/hw/tpm/tpm_passthrough.c
> @@ -31,7 +31,6 @@
>   #include "hw/hw.h"
>   #include "hw/i386/pc.h"
>   #include "qapi/clone-visitor.h"
> -#include "tpm_tis.h"
>   #include "tpm_util.h"
>
>   #define DEBUG_TPM 0
> diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c
> index ad2845622e..73cda41dc6 100644
> --- a/hw/tpm/tpm_tis.c
> +++ b/hw/tpm/tpm_tis.c
> @@ -23,6 +23,7 @@
>    */
>
>   #include "qemu/osdep.h"
> +#include "hw/isa/isa.h"
>   #include "sysemu/tpm_backend.h"
>   #include "tpm_int.h"
>   #include "sysemu/block-backend.h"
> @@ -30,10 +31,79 @@
>   #include "hw/hw.h"
>   #include "hw/i386/pc.h"
>   #include "hw/pci/pci_ids.h"
> -#include "tpm_tis.h"
>   #include "qapi/error.h"
>   #include "qemu-common.h"
>   #include "qemu/main-loop.h"
> +#include "hw/acpi/tpm.h"
> +
> +#define TPM_TIS_NUM_LOCALITIES      5     /* per spec */
> +#define TPM_TIS_LOCALITY_SHIFT      12
> +#define TPM_TIS_NO_LOCALITY         0xff
> +
> +#define TPM_TIS_IS_VALID_LOCTY(x)   ((x) < TPM_TIS_NUM_LOCALITIES)
> +
> +#define TPM_TIS_BUFFER_MAX          4096
> +
> +typedef enum {
> +    TPM_TIS_STATE_IDLE = 0,
> +    TPM_TIS_STATE_READY,
> +    TPM_TIS_STATE_COMPLETION,
> +    TPM_TIS_STATE_EXECUTION,
> +    TPM_TIS_STATE_RECEPTION,
> +} TPMTISState;
> +
> +typedef struct TPMSizedBuffer {
> +    uint32_t size;
> +    uint8_t  *buffer;
> +} TPMSizedBuffer;
> +
> +/* locality data  -- all fields are persisted */
> +typedef struct TPMLocality {
> +    TPMTISState state;
> +    uint8_t access;
> +    uint32_t sts;
> +    uint32_t iface_id;
> +    uint32_t inte;
> +    uint32_t ints;
> +
> +    uint16_t w_offset;
> +    uint16_t r_offset;
> +    TPMSizedBuffer w_buffer;
> +    TPMSizedBuffer r_buffer;
> +} TPMLocality;
> +
> +typedef struct TPMTISEmuState {
> +    QEMUBH *bh;
> +    uint32_t offset;
> +    uint8_t buf[TPM_TIS_BUFFER_MAX];
> +
> +    uint8_t active_locty;
> +    uint8_t aborting_locty;
> +    uint8_t next_locty;
> +
> +    TPMLocality loc[TPM_TIS_NUM_LOCALITIES];
> +
> +    qemu_irq irq;
> +    uint32_t irq_num;
> +} TPMTISEmuState;
> +
> +struct TPMState {
> +    ISADevice busdev;
> +    MemoryRegion mmio;
> +
> +    union {
> +        TPMTISEmuState tis;
> +    } s;
> +
> +    uint8_t     locty_number;
> +    TPMBackendCmd cmd;
> +
> +    char *backend;
> +    TPMBackend *be_driver;
> +    TPMVersion be_tpm_version;
> +};
> +
> +#define TPM(obj) OBJECT_CHECK(TPMState, (obj), TYPE_TPM_TIS)
>
>   #define DEBUG_TIS 0
>