acpi: tpm: Add a TPM1 table

This provides information about a v1 TPM in the system. Generate this
table if the TPM is present.

Add a required new bloblist type and correct the header order of one
header file.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/x86/lib/acpi_table.c b/arch/x86/lib/acpi_table.c
index c31cc923c9c694849527c02b333ed5e331631f43..10cf3b709454507e611599b836c3d1825fe92a56 100644 (file)
--- a/arch/x86/lib/acpi_table.c
+++ b/arch/x86/lib/acpi_table.c
@@ -215,6 +215,47 @@ static void acpi_create_mcfg(struct acpi_mcfg *mcfg)
        header->checksum = table_compute_checksum((void *)mcfg, header->length);
 }
 
+/**
+ * acpi_create_tcpa() - Create a TCPA table
+ *
+ * @tcpa: Pointer to place to put table
+ *
+ * Trusted Computing Platform Alliance Capabilities Table
+ * TCPA PC Specific Implementation SpecificationTCPA is defined in the PCI
+ * Firmware Specification 3.0
+ */
+static int acpi_create_tcpa(struct acpi_tcpa *tcpa)
+{
+       struct acpi_table_header *header = &tcpa->header;
+       u32 current = (u32)tcpa + sizeof(struct acpi_tcpa);
+       int size = 0x10000;     /* Use this as the default size */
+       void *log;
+       int ret;
+
+       if (!CONFIG_IS_ENABLED(BLOBLIST))
+               return -ENXIO;
+       memset(tcpa, '\0', sizeof(struct acpi_tcpa));
+
+       /* Fill out header fields */
+       acpi_fill_header(header, "TCPA");
+       header->length = sizeof(struct acpi_tcpa);
+       header->revision = 1;
+
+       ret = bloblist_ensure_size_ret(BLOBLISTT_TCPA_LOG, &size, &log);
+       if (ret)
+               return log_msg_ret("blob", ret);
+
+       tcpa->platform_class = 0;
+       tcpa->laml = size;
+       tcpa->lasa = (ulong)log;
+
+       /* (Re)calculate length and checksum */
+       header->length = current - (u32)tcpa;
+       header->checksum = table_compute_checksum((void *)tcpa, header->length);
+
+       return 0;
+}
+
 static int get_tpm2_log(void **ptrp, int *sizep)
 {
        const int tpm2_default_log_len = 0x10000;
@@ -457,11 +498,13 @@ ulong write_acpi_tables(ulong start_addr)
        struct acpi_fadt *fadt;
        struct acpi_table_header *ssdt;
        struct acpi_mcfg *mcfg;
+       struct acpi_tcpa *tcpa;
        struct acpi_madt *madt;
        struct acpi_csrt *csrt;
        struct acpi_spcr *spcr;
        void *start;
        ulong addr;
+       int ret;
        int i;
 
        start = map_sysmem(start_addr, 0);
@@ -560,7 +603,6 @@ ulong write_acpi_tables(ulong start_addr)
 
        if (IS_ENABLED(CONFIG_TPM_V2)) {
                struct acpi_tpm2 *tpm2;
-               int ret;
 
                debug("ACPI:    * TPM2\n");
                tpm2 = (struct acpi_tpm2 *)ctx->current;
@@ -579,6 +621,16 @@ ulong write_acpi_tables(ulong start_addr)
        acpi_inc_align(ctx, madt->header.length);
        acpi_add_table(ctx, madt);
 
+       debug("ACPI:    * TCPA\n");
+       tcpa = (struct acpi_tcpa *)ctx->current;
+       ret = acpi_create_tcpa(tcpa);
+       if (ret) {
+               log_warning("Failed to create TCPA table (err=%d)\n", ret);
+       } else {
+               acpi_inc_align(ctx, tcpa->header.length);
+               acpi_add_table(ctx, tcpa);
+       }
+
        debug("ACPI:    * CSRT\n");
        csrt = ctx->current;
        if (!acpi_create_csrt(csrt)) {

diff --git a/include/acpi/acpi_table.h b/include/acpi/acpi_table.h
index c7ee8b55da485ec639a5c0297267e51ce27e2f73..9fba6536f505089df5663adb303ba496857f5316 100644 (file)
--- a/include/acpi/acpi_table.h
+++ b/include/acpi/acpi_table.h
@@ -104,6 +104,13 @@ struct __packed acpi_tpm2 {
        u64 lasa;
 };
 
+struct __packed acpi_tcpa {
+       struct acpi_table_header header;
+       u16 platform_class;
+       u32 laml;
+       u64 lasa;
+};
+
 /* FADT Preferred Power Management Profile */
 enum acpi_pm_profile {
        ACPI_PM_UNSPECIFIED = 0,

diff --git a/include/bloblist.h b/include/bloblist.h
index dc7d80bd8518943eddb9150fed3b56abcd7f1b1c..5784c2226e7e03677516e9f8be07bfab569cfb5a 100644 (file)
--- a/include/bloblist.h
+++ b/include/bloblist.h
@@ -34,6 +34,7 @@ enum bloblist_tag_t {
        BLOBLISTT_ACPI_GNVS,
        BLOBLISTT_INTEL_VBT,            /* Intel Video-BIOS table */
        BLOBLISTT_TPM2_TCG_LOG,         /* TPM v2 log space */
+       BLOBLISTT_TCPA_LOG,             /* TPM log space */
 };
 
 /**