Commit 5cb18b3d authored by Stefan Berger's avatar Stefan Berger Committed by Michael S. Tsirkin
Browse files

TPM2 ACPI table support 



Add a TPM2 ACPI table if a TPM 2 is used in the backend.
Also add an SSDT for the TPM 2.

Rename tpm_find() to tpm_get_version() and have this function
return the version of the TPM found, TPMVersion_Unspec if
no TPM is found. Use the version number to build version
specific ACPI tables.

Signed-off-by: default avatarStefan Berger <stefanb@linux.vnet.ibm.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 56a3c24f

hw/i386/Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ obj-y += kvmvapic.o 
obj-y += acpi-build.o

hw/i386/acpi-build.o: hw/i386/acpi-build.c \

	hw/i386/acpi-dsdt.hex hw/i386/q35-acpi-dsdt.hex \

	hw/i386/ssdt-tpm.hex

	hw/i386/ssdt-tpm.hex hw/i386/ssdt-tpm2.hex



iasl-option=$(shell if test -z "`$(1) $(2) 2>&1 > /dev/null`" \

    ; then echo "$(2)"; else echo "$(3)"; fi ;)

hw/i386/acpi-build.c

+34 −4
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#include "hw/acpi/memory_hotplug.h"

#include "sysemu/tpm.h"

#include "hw/acpi/tpm.h"

#include "sysemu/tpm_backend.h"



/* Supported chipsets: */

#include "hw/acpi/piix4.h"
@@ -106,7 +107,7 @@ typedef struct AcpiPmInfo { 


typedef struct AcpiMiscInfo {

    bool has_hpet;

    bool has_tpm;

    TPMVersion tpm_version;

    const unsigned char *dsdt_code;

    unsigned dsdt_size;

    uint16_t pvpanic_port;
@@ -234,7 +235,7 @@ static void acpi_get_pm_info(AcpiPmInfo *pm) 
static void acpi_get_misc_info(AcpiMiscInfo *info)

{

    info->has_hpet = hpet_find();

    info->has_tpm = tpm_find();

    info->tpm_version = tpm_get_version();

    info->pvpanic_port = pvpanic_port();

    info->applesmc_io_base = applesmc_port();

}
@@ -414,6 +415,7 @@ build_madt(GArray *table_data, GArray *linker, AcpiCpuInfo *cpu, 
}



#include "hw/i386/ssdt-tpm.hex"

#include "hw/i386/ssdt-tpm2.hex"



/* Assign BSEL property to all buses.  In the future, this can be changed

 * to only assign to buses that support hotplug.
@@ -1029,6 +1031,25 @@ build_tpm_ssdt(GArray *table_data, GArray *linker) 
    memcpy(tpm_ptr, ssdt_tpm_aml, sizeof(ssdt_tpm_aml));

}



static void

build_tpm2(GArray *table_data, GArray *linker)

{

    Acpi20TPM2 *tpm2_ptr;

    void *tpm_ptr;



    tpm_ptr = acpi_data_push(table_data, sizeof(ssdt_tpm2_aml));

    memcpy(tpm_ptr, ssdt_tpm2_aml, sizeof(ssdt_tpm2_aml));



    tpm2_ptr = acpi_data_push(table_data, sizeof *tpm2_ptr);



    tpm2_ptr->platform_class = cpu_to_le16(TPM2_ACPI_CLASS_CLIENT);

    tpm2_ptr->control_area_address = cpu_to_le64(0);

    tpm2_ptr->start_method = cpu_to_le32(TPM2_START_METHOD_MMIO);



    build_header(linker, table_data,

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

}



typedef enum {

    MEM_AFFINITY_NOFLAGS      = 0,

    MEM_AFFINITY_ENABLED      = (1 << 0),
@@ -1343,12 +1364,21 @@ void acpi_build(PcGuestInfo *guest_info, AcpiBuildTables *tables) 
        acpi_add_table(table_offsets, tables_blob);

        build_hpet(tables_blob, tables->linker);

    }

    if (misc.has_tpm) {

    if (misc.tpm_version != TPM_VERSION_UNSPEC) {

        acpi_add_table(table_offsets, tables_blob);

        build_tpm_tcpa(tables_blob, tables->linker, tables->tcpalog);



        acpi_add_table(table_offsets, tables_blob);

        switch (misc.tpm_version) {

        case TPM_VERSION_1_2:

            build_tpm_ssdt(tables_blob, tables->linker);

            break;

        case TPM_VERSION_2_0:

            build_tpm2(tables_blob, tables->linker);

            break;

        default:

            assert(false);

        }

    }

    if (guest_info->numa_nodes) {

        acpi_add_table(table_offsets, tables_blob);

hw/i386/ssdt-tpm.dsl

+1 −15
Original line number Diff line number Diff line
@@ -25,19 +25,5 @@ DefinitionBlock ( 
    0x1                 // OEM Revision

    )

{

    Scope(\_SB) {

        /* TPM with emulated TPM TIS interface */

        Device (TPM) {

            Name (_HID, EisaID ("PNP0C31"))

            Name (_CRS, ResourceTemplate ()

            {

                Memory32Fixed (ReadWrite, TPM_TIS_ADDR_BASE, TPM_TIS_ADDR_SIZE)

                // older Linux tpm_tis drivers do not work with IRQ

                //IRQNoFlags () {TPM_TIS_IRQ}

            })

            Method (_STA, 0, NotSerialized) {

                Return (0x0F)

            }

        }

    }

#include "ssdt-tpm-common.dsl"

}

hw/i386/ssdt-tpm.hex.generated

+20 −6
Original line number Diff line number Diff line
@@ -3,12 +3,12 @@ static unsigned char ssdt_tpm_aml[] = { 
0x53,

0x44,

0x54,

0x5d,

0x6b,

0x0,

0x0,

0x0,

0x1,

0x1c,

0x37,

0x42,

0x58,

0x50,
@@ -36,15 +36,26 @@ static unsigned char ssdt_tpm_aml[] = { 
0x14,

0x20,

0x10,

0x38,

0x46,

0x4,

0x5c,

0x2f,

0x3,

0x5f,

0x53,

0x42,

0x5f,

0x50,

0x43,

0x49,

0x30,

0x49,

0x53,

0x41,

0x5f,

0x5b,

0x82,

0x30,

0x33,

0x54,

0x50,

0x4d,
@@ -65,9 +76,9 @@ static unsigned char ssdt_tpm_aml[] = { 
0x52,

0x53,

0x11,

0x11,

0x14,

0xa,

0xe,

0x11,

0x86,

0x9,

0x0,
@@ -80,6 +91,9 @@ static unsigned char ssdt_tpm_aml[] = { 
0x50,

0x0,

0x0,

0x22,

0x20,

0x0,

0x79,

0x0,

0x14,

hw/i386/ssdt-tpm2.dsl

0 → 100644
+29 −0
Original line number Diff line number Diff line 
/*

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.



 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.



 * You should have received a copy of the GNU General Public License along

 * with this program; if not, see <http://www.gnu.org/licenses/>.

 */

#include "hw/acpi/tpm.h"



ACPI_EXTRACT_ALL_CODE ssdt_tpm2_aml



DefinitionBlock (

    "ssdt-tpm2.aml",    // Output Filename

    "SSDT",             // Signature

    0x01,               // SSDT Compliance Revision

    "BXPC",             // OEMID

    "BXSSDT",           // TABLE ID

    0x1                 // OEM Revision

    )

{

#include "ssdt-tpm-common.dsl"

}