x86: Move CSRT table to a writer function

Move this table over to use a writer function, moving the code from the
x86 implementation.

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 f5045cde3ef8f0ce5bed8190086bdf4bc917ffe7..b7557f7f3fd199b638b31e47dc103283985c9d6d 100644 (file)
--- a/arch/x86/lib/acpi_table.c
+++ b/arch/x86/lib/acpi_table.c
@@ -305,41 +305,12 @@ static int acpi_write_tpm2(struct acpi_ctx *ctx,
 }
 ACPI_WRITER(5tpm2, "TPM2", acpi_write_tpm2, 0);
 
-__weak u32 acpi_fill_csrt(u32 current)
+int acpi_write_spcr(struct acpi_ctx *ctx, const struct acpi_writer *entry)
 {
-       return 0;
-}
-
-static int acpi_create_csrt(struct acpi_csrt *csrt)
-{
-       struct acpi_table_header *header = &(csrt->header);
-       u32 current = (u32)csrt + sizeof(struct acpi_csrt);
-       uint ptr;
-
-       memset((void *)csrt, 0, sizeof(struct acpi_csrt));
-
-       /* Fill out header fields */
-       acpi_fill_header(header, "CSRT");
-       header->length = sizeof(struct acpi_csrt);
-       header->revision = 0;
-
-       ptr = acpi_fill_csrt(current);
-       if (!ptr)
-               return -ENOENT;
-       current = ptr;
-
-       /* (Re)calculate length and checksum */
-       header->length = current - (u32)csrt;
-       header->checksum = table_compute_checksum((void *)csrt, header->length);
-
-       return 0;
-}
-
-static void acpi_create_spcr(struct acpi_spcr *spcr)
-{
-       struct acpi_table_header *header = &(spcr->header);
        struct serial_device_info serial_info = {0};
        ulong serial_address, serial_offset;
+       struct acpi_table_header *header;
+       struct acpi_spcr *spcr;
        struct udevice *dev;
        uint serial_config;
        uint serial_width;
@@ -347,7 +318,10 @@ static void acpi_create_spcr(struct acpi_spcr *spcr)
        int space_id;
        int ret = -ENODEV;
 
-       memset((void *)spcr, 0, sizeof(struct acpi_spcr));
+       spcr = ctx->current;
+       header = &spcr->header;
+
+       memset(spcr, '\0', sizeof(struct acpi_spcr));
 
        /* Fill out header fields */
        acpi_fill_header(header, "SPCR");
@@ -457,7 +431,13 @@ static void acpi_create_spcr(struct acpi_spcr *spcr)
 
        /* Fix checksum */
        header->checksum = table_compute_checksum((void *)spcr, header->length);
+
+       acpi_add_table(ctx, spcr);
+       acpi_inc(ctx, spcr->header.length);
+
+       return 0;
 }
+ACPI_WRITER(5spcr, "SPCR", acpi_write_spcr, 0);
 
 int acpi_write_gnvs(struct acpi_ctx *ctx, const struct acpi_writer *entry)
 {
@@ -539,22 +519,6 @@ ACPI_WRITER(5mcfg, "MCFG", acpi_write_mcfg, 0);
 int write_acpi_tables_x86(struct acpi_ctx *ctx,
                          const struct acpi_writer *entry)
 {
-       struct acpi_csrt *csrt;
-       struct acpi_spcr *spcr;
-
-       debug("ACPI:    * CSRT\n");
-       csrt = ctx->current;
-       if (!acpi_create_csrt(csrt)) {
-               acpi_inc_align(ctx, csrt->header.length);
-               acpi_add_table(ctx, csrt);
-       }
-
-       debug("ACPI:    * SPCR\n");
-       spcr = ctx->current;
-       acpi_create_spcr(spcr);
-       acpi_inc_align(ctx, spcr->header.length);
-       acpi_add_table(ctx, spcr);
-
        acpi_write_dev_tables(ctx);
 
        acpi_rsdp_addr = (unsigned long)ctx->rsdp;

diff --git a/lib/acpi/Makefile b/lib/acpi/Makefile
index 552d499fde42367325e0e5182975aad6bed96d04..f9b504988f2e50e586f013f18f95b33a9edaabb9 100644 (file)
--- a/lib/acpi/Makefile
+++ b/lib/acpi/Makefile
@@ -10,6 +10,7 @@ obj-y += acpi_writer.o
 # With QEMU the ACPI tables come from there, not from U-Boot
 ifndef CONFIG_QEMU
 obj-y += base.o
+obj-y += csrt.o
 
 # Sandbox does not build a .asl file
 ifndef CONFIG_SANDBOX

diff --git a/lib/acpi/csrt.c b/lib/acpi/csrt.c
new file mode 100644 (file)
index 0000000..7606931
--- /dev/null
+++ b/lib/acpi/csrt.c
@@ -0,0 +1,50 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Write an ACPI Core System Resource Table (CSRT)
+ *
+ * Copyright 2021 Google LLC
+ */
+
+#define LOG_CATEGORY LOGC_ACPI
+
+#include <common.h>
+#include <mapmem.h>
+#include <tables_csum.h>
+#include <acpi/acpi_table.h>
+#include <dm/acpi.h>
+
+__weak u32 acpi_fill_csrt(u32 current)
+{
+       return 0;
+}
+
+int acpi_write_csrt(struct acpi_ctx *ctx, const struct acpi_writer *entry)
+{
+       struct acpi_table_header *header;
+       struct acpi_csrt *csrt;
+       uint ptr;
+
+       csrt = ctx->current;
+       header = &csrt->header;
+
+       memset(csrt, '\0', sizeof(struct acpi_csrt));
+
+       /* Fill out header fields */
+       acpi_fill_header(header, "CSRT");
+       header->length = sizeof(struct acpi_csrt);
+       header->revision = 0;
+
+       ptr = acpi_fill_csrt(map_to_sysmem(csrt));
+       if (!ptr)
+               return log_msg_ret("fill", -ENOENT);
+
+       /* (Re)calculate length and checksum */
+       header->length = (ulong)ctx->current - (ulong)csrt;
+       header->checksum = table_compute_checksum(csrt, header->length);
+
+       acpi_add_table(ctx, csrt);
+       acpi_inc(ctx, csrt->header.length);
+
+       return 0;
+}
+ACPI_WRITER(5csrt, "CSRT", acpi_write_csrt, 0);