Commit e27e1e63 authored by Eric Auger's avatar Eric Auger Committed by Michael S. Tsirkin
Browse files

acpi: Some build_tpm2() code reshape 



Remove any reference to Acpi20TPM2 and adopt an implementation
similar to build_ghes_v2().

Signed-off-by: default avatarEric Auger <eric.auger@redhat.com>
Suggested-by: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarStefan Berger <stefanb@linux.ibm.com>
Tested-by: default avatarStefan Berger <stefanb@linux.ibm.com>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>

Message-Id: <20200622140620.17229-2-eric.auger@redhat.com>
Tested-by: default avatarArd Biesheuvel <ardb@kernel.org>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 93dd625f

hw/acpi/aml-build.c

+32 −19
Original line number Diff line number Diff line
@@ -1878,48 +1878,61 @@ build_hdr: 
                 "FACP", tbl->len - fadt_start, f->rev, oem_id, oem_table_id);

}



/*

 * build_tpm2 - Build the TPM2 table as specified in

 * table 7: TCG Hardware Interface Description Table Format for TPM 2.0

 * of TCG ACPI Specification, Family “1.2” and “2.0”, Version 1.2, Rev 8

 */

void build_tpm2(GArray *table_data, BIOSLinker *linker, GArray *tcpalog)

{

    Acpi20TPM2 *tpm2_ptr = acpi_data_push(table_data, sizeof(AcpiTableHeader));

    unsigned log_addr_size = sizeof(tpm2_ptr->log_area_start_address);

    unsigned log_addr_offset =

        (char *)&tpm2_ptr->log_area_start_address - table_data->data;

    uint8_t start_method_params[12] = {};

    unsigned log_addr_offset, tpm2_start;

    uint64_t control_area_start_address;

    TPMIf *tpmif = tpm_find();

    uint32_t start_method;

    void *tpm2_ptr;



    tpm2_start = table_data->len;

    tpm2_ptr = acpi_data_push(table_data, sizeof(AcpiTableHeader));



    /* platform class */

    /* Platform Class */

    build_append_int_noprefix(table_data, TPM2_ACPI_CLASS_CLIENT, 2);

    /* reserved */

    /* Reserved */

    build_append_int_noprefix(table_data, 0, 2);

    if (TPM_IS_TIS_ISA(tpmif) || TPM_IS_TIS_SYSBUS(tpmif)) {

        /* address of control area */

        build_append_int_noprefix(table_data, 0, 8);

        /* start method */

        build_append_int_noprefix(table_data, TPM2_START_METHOD_MMIO, 4);

        control_area_start_address = 0;

        start_method = TPM2_START_METHOD_MMIO;

    } else if (TPM_IS_CRB(tpmif)) {

        build_append_int_noprefix(table_data, TPM_CRB_ADDR_CTRL, 8);

        build_append_int_noprefix(table_data, TPM2_START_METHOD_CRB, 4);

        control_area_start_address = TPM_CRB_ADDR_CTRL;

        start_method = TPM2_START_METHOD_CRB;

    } else {

        g_warn_if_reached();

        g_assert_not_reached();

    }

    /* Address of Control Area */

    build_append_int_noprefix(table_data, control_area_start_address, 8);

    /* Start Method */

    build_append_int_noprefix(table_data, start_method, 4);



    /* platform specific parameters */

    g_array_append_vals(table_data, &start_method_params, 12);

    /* Platform Specific Parameters */

    g_array_append_vals(table_data, &start_method_params,

                        ARRAY_SIZE(start_method_params));



    /* log area minimum length */

    /* Log Area Minimum Length */

    build_append_int_noprefix(table_data, TPM_LOG_AREA_MINIMUM_SIZE, 4);



    acpi_data_push(tcpalog, TPM_LOG_AREA_MINIMUM_SIZE);

    bios_linker_loader_alloc(linker, ACPI_BUILD_TPMLOG_FILE, tcpalog, 1,

                             false);



    /* log area start address to be filled by Guest linker */

    log_addr_offset = table_data->len;



    /* Log Area Start Address to be filled by Guest linker */

    build_append_int_noprefix(table_data, 0, 8);

    bios_linker_loader_add_pointer(linker, ACPI_BUILD_TABLE_FILE,

                                   log_addr_offset, log_addr_size,

                                   log_addr_offset, 8,

                                   ACPI_BUILD_TPMLOG_FILE, 0);

    build_header(linker, table_data,

                 (void *)tpm2_ptr, "TPM2", sizeof(*tpm2_ptr), 4, NULL, NULL);

                 tpm2_ptr, "TPM2", table_data->len - tpm2_start, 4, NULL, NULL);

}



/* ACPI 5.0: 6.4.3.8.2 Serial Bus Connection Descriptors */

include/hw/acpi/acpi-defs.h

+0 −18
Original line number Diff line number Diff line
@@ -465,24 +465,6 @@ struct Acpi20Tcpa { 
} QEMU_PACKED;

typedef struct Acpi20Tcpa Acpi20Tcpa;



/*

 * TPM2

 *

 * Following Version 1.2, Revision 8 of specs:

 * https://trustedcomputinggroup.org/tcg-acpi-specification/

 */

struct Acpi20TPM2 {

    ACPI_TABLE_HEADER_DEF

    uint16_t platform_class;

    uint16_t reserved;

    uint64_t control_area_address;

    uint32_t start_method;

    uint8_t start_method_params[12];

    uint32_t log_area_minimum_length;

    uint64_t log_area_start_address;

} QEMU_PACKED;

typedef struct Acpi20TPM2 Acpi20TPM2;



/* DMAR - DMA Remapping table r2.2 */

struct AcpiTableDmar {

    ACPI_TABLE_HEADER_DEF