GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 14:41:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

x86: Move TPM2 table to a writer function

Browse source 
Move this table over to use a writer function, for x86 only.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2021-12-01 09:02:57 -07:00
parent d953137526
commit 9aacd83389
1 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
arch/x86/lib/acpi_table.c
View file

@ -233,14 +233,21 @@ static int get_tpm2_log(void **ptrp, int *sizep)
return 0; return 0;
} }
static int acpi_create_tpm2(struct acpi_tpm2 *tpm2) static int acpi_write_tpm2(struct acpi_ctx *ctx,
const struct acpi_writer *entry)
{ {
struct acpi_table_header *header = &tpm2->header; struct acpi_table_header *header;
struct acpi_tpm2 *tpm2;
int tpm2_log_len; int tpm2_log_len;
void *lasa; void *lasa;
int ret; int ret;
memset((void *)tpm2, 0, sizeof(struct acpi_tpm2)); if (!IS_ENABLED(CONFIG_TPM_V2))
return log_msg_ret("none", -ENOENT);
tpm2 = ctx->current;
header = &tpm2->header;
memset(tpm2, '\0', sizeof(struct acpi_tpm2));
/* /*
* Some payloads like SeaBIOS depend on log area to use TPM2. * Some payloads like SeaBIOS depend on log area to use TPM2.
@ -248,7 +255,7 @@ static int acpi_create_tpm2(struct acpi_tpm2 *tpm2)
*/ */
ret = get_tpm2_log(&lasa, &tpm2_log_len); ret = get_tpm2_log(&lasa, &tpm2_log_len);
if (ret) if (ret)
return ret; return log_msg_ret("log", ret);
/* Fill out header fields. */ /* Fill out header fields. */
acpi_fill_header(header, "TPM2"); acpi_fill_header(header, "TPM2");
@ -257,7 +264,7 @@ static int acpi_create_tpm2(struct acpi_tpm2 *tpm2)
header->length = sizeof(struct acpi_tpm2); header->length = sizeof(struct acpi_tpm2);
header->revision = acpi_get_table_revision(ACPITAB_TPM2); header->revision = acpi_get_table_revision(ACPITAB_TPM2);
/* Hard to detect for coreboot. Just set it to 0 */ /* Hard to detect for U-Boot. Just set it to 0 */
tpm2->platform_class = 0; tpm2->platform_class = 0;
/* Must be set to 0 for FIFO-interface support */ /* Must be set to 0 for FIFO-interface support */
@ -267,13 +274,17 @@ static int acpi_create_tpm2(struct acpi_tpm2 *tpm2)
/* Fill the log area size and start address fields. */ /* Fill the log area size and start address fields. */
tpm2->laml = tpm2_log_len; tpm2->laml = tpm2_log_len;
tpm2->lasa = (uintptr_t)lasa; tpm2->lasa = map_to_sysmem(lasa);
/* Calculate checksum. */ /* Calculate checksum. */
header->checksum = table_compute_checksum((void *)tpm2, header->length); header->checksum = table_compute_checksum(tpm2, header->length);
acpi_inc(ctx, tpm2->header.length);
acpi_add_table(ctx, tpm2);
return 0; return 0;
} }
ACPI_WRITER(5tpm2, "TPM2", acpi_write_tpm2, 0);
__weak u32 acpi_fill_csrt(u32 current) __weak u32 acpi_fill_csrt(u32 current)
{ {
@ -515,20 +526,6 @@ int write_acpi_tables_x86(struct acpi_ctx *ctx,
struct acpi_spcr *spcr; struct acpi_spcr *spcr;
int ret; int ret;
if (IS_ENABLED(CONFIG_TPM_V2)) {
struct acpi_tpm2 *tpm2;
debug("ACPI: * TPM2\n");
tpm2 = (struct acpi_tpm2 *)ctx->current;
ret = acpi_create_tpm2(tpm2);
if (!ret) {
acpi_inc_align(ctx, tpm2->header.length);
acpi_add_table(ctx, tpm2);
} else {
log_warning("TPM2 table creation failed\n");
}
}
debug("ACPI: * MADT\n"); debug("ACPI: * MADT\n");
madt = ctx->current; madt = ctx->current;
acpi_create_madt(madt); acpi_create_madt(madt);