<p>Philipp Deppenwiese has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/29181">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">arch/x86/acpi: Add TPM2 table support<br><br>* Distinguish between TPM 1.2 and 2.0<br> ACPI table support<br>* Add TPM2 table support for TIS interface only<br><br>Change-Id: I030c7ea744bcfe61ebef8d66d1295273b5dccda5<br>Signed-off-by: Philipp Deppenwiese <zaolin@das-labor.org><br>---<br>M src/arch/x86/acpi.c<br>M src/arch/x86/include/arch/acpi.h<br>2 files changed, 55 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/81/29181/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/arch/x86/acpi.c b/src/arch/x86/acpi.c</span><br><span>index 1b43004..286b56a 100644</span><br><span>--- a/src/arch/x86/acpi.c</span><br><span>+++ b/src/arch/x86/acpi.c</span><br><span>@@ -308,6 +308,30 @@</span><br><span> header->checksum = acpi_checksum((void *)tcpa, header->length);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void acpi_create_tpm2(acpi_tpm2_t *tpm2)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ acpi_header_t *header = &(tpm2->header);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ memset((void *)tpm2, 0, sizeof(acpi_tpm2_t));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Fill out header fields. */</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(header->signature, "TPM2", 4);</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(header->oem_id, OEM_ID, 6);</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8);</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(header->asl_compiler_id, ASLC, 4);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ header->length = sizeof(acpi_tpm2_t);</span><br><span style="color: hsl(120, 100%, 40%);">+ header->revision = get_acpi_table_revision(TPM2);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ tpm2->platform_class = 0; // Always pc platform..</span><br><span style="color: hsl(120, 100%, 40%);">+ tpm2->control_area = 0; // no CRB interface support</span><br><span style="color: hsl(120, 100%, 40%);">+ tpm2->start_method = 6; // no CRB interface support</span><br><span style="color: hsl(120, 100%, 40%);">+ tpm2->psp = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Calculate checksum. */</span><br><span style="color: hsl(120, 100%, 40%);">+ header->checksum = acpi_checksum((void *)tpm2, header->length);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static void acpi_ssdt_write_cbtable(void)</span><br><span> {</span><br><span> const struct cbmem_entry *cbtable;</span><br><span>@@ -1163,13 +1187,26 @@</span><br><span> acpi_add_table(rsdp, mcfg);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- printk(BIOS_DEBUG, "ACPI: * TCPA\n");</span><br><span style="color: hsl(0, 100%, 40%);">- tcpa = (acpi_tcpa_t *) current;</span><br><span style="color: hsl(0, 100%, 40%);">- acpi_create_tcpa(tcpa);</span><br><span style="color: hsl(0, 100%, 40%);">- if (tcpa->header.length >= sizeof(acpi_tcpa_t)) {</span><br><span style="color: hsl(0, 100%, 40%);">- current += tcpa->header.length;</span><br><span style="color: hsl(0, 100%, 40%);">- current = acpi_align_current(current);</span><br><span style="color: hsl(0, 100%, 40%);">- acpi_add_table(rsdp, tcpa);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (IS_DEFINED(CONFIG_TPM1)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ printk(BIOS_DEBUG, "ACPI: * TCPA\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ tcpa = (acpi_tcpa_t *) current;</span><br><span style="color: hsl(120, 100%, 40%);">+ acpi_create_tcpa(tcpa);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (tcpa->header.length >= sizeof(acpi_tcpa_t)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ current += tcpa->header.length;</span><br><span style="color: hsl(120, 100%, 40%);">+ current = acpi_align_current(current);</span><br><span style="color: hsl(120, 100%, 40%);">+ acpi_add_table(rsdp, tcpa);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (IS_DEFINED(CONFIG_TPM2)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ printk(BIOS_DEBUG, "ACPI: * TPM2\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ tpm2 = (acpi_tpm2_t *) current;</span><br><span style="color: hsl(120, 100%, 40%);">+ acpi_create_tpm2(tpm2);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (tpm2->header.length >= sizeof(acpi_tpm2_t)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ current += tpm2->header.length;</span><br><span style="color: hsl(120, 100%, 40%);">+ current = acpi_align_current(current);</span><br><span style="color: hsl(120, 100%, 40%);">+ acpi_add_table(rsdp, tpm2);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> printk(BIOS_DEBUG, "ACPI: * MADT\n");</span><br><span>@@ -1288,6 +1325,8 @@</span><br><span> return 1;</span><br><span> case TCPA:</span><br><span> return 2;</span><br><span style="color: hsl(120, 100%, 40%);">+ case TPM2:</span><br><span style="color: hsl(120, 100%, 40%);">+ return 4;</span><br><span> case SSDT: /* ACPI 1.0/2.0: ?, ACPI 3.0/4.0: 2 */</span><br><span> return 2;</span><br><span> case SRAT: /* ACPI 1.0: N/A, 2.0: 1, 3.0: 2, 4.0: 3 */</span><br><span>diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h</span><br><span>index 54be1f4..5cf89da 100644</span><br><span>--- a/src/arch/x86/include/arch/acpi.h</span><br><span>+++ b/src/arch/x86/include/arch/acpi.h</span><br><span>@@ -191,6 +191,15 @@</span><br><span> u64 lasa;</span><br><span> } __packed acpi_tcpa_t;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+typedef struct acpi_tpm2 {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct acpi_table_header header;</span><br><span style="color: hsl(120, 100%, 40%);">+ u16 platform_class;</span><br><span style="color: hsl(120, 100%, 40%);">+ u8 reserved[2];</span><br><span style="color: hsl(120, 100%, 40%);">+ u64 control_area;</span><br><span style="color: hsl(120, 100%, 40%);">+ u32 start_method</span><br><span style="color: hsl(120, 100%, 40%);">+ u64 psp;</span><br><span style="color: hsl(120, 100%, 40%);">+} __packed acpi_tpm2_t;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> typedef struct acpi_mcfg_mmconfig {</span><br><span> u32 base_address;</span><br><span> u32 base_reserved;</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/29181">change 29181</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/29181"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I030c7ea744bcfe61ebef8d66d1295273b5dccda5 </div>
<div style="display:none"> Gerrit-Change-Number: 29181 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Philipp Deppenwiese <zaolin.daisuki@gmail.com> </div>