From: Wolfgang Wallner <wolfgang.wallner@br-automation.com>
To: u-boot@lists.denx.de
Subject: Antwort: [PATCH v2 24/39] acpi: Move acpi_add_table() to generic code
Date: Wed, 11 Mar 2020 14:43:14 +0100 [thread overview]
Message-ID: <OF1782247B.E861E6D9-ONC1258528.004023BE-C1258528.004B5EC2@br-automation.com> (raw)
In-Reply-To: <20200308214442.v2.24.Ie9d79ce7293bd55022f7c6e940ce3583d38353da@changeid>
Hi Simon,
-----"Simon Glass" <sjg@chromium.org> schrieb: -----
>
> Move this code to a generic location so that we can test it with sandbox.
> This requires adding a few new fields to acpi_ctx, so drop the local
> variables used in the original code.
>
> Also use mapmem to avoid pointer-to-address casts which don't work on
> sandbox.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
> Changes in v2: None
>
> arch/x86/lib/acpi_table.c | 82 +++++----------------------------------
> include/acpi_table.h | 9 +++++
> include/dm/acpi.h | 5 +++
> lib/acpi/acpi_table.c | 64 ++++++++++++++++++++++++++++++
> test/dm/acpi.c | 4 ++
> 5 files changed, 92 insertions(+), 72 deletions(-)
>
> diff --git a/arch/x86/lib/acpi_table.c b/arch/x86/lib/acpi_table.c
> index 0757ac3431..9168119547 100644
> --- a/arch/x86/lib/acpi_table.c
> +++ b/arch/x86/lib/acpi_table.c
> @@ -83,66 +83,6 @@ static void acpi_write_xsdt(struct acpi_xsdt *xsdt)
> sizeof(struct acpi_xsdt));
> }
>
> -/**
> - * Add an ACPI table to the RSDT (and XSDT) structure, recalculate length
> - * and checksum.
> - */
> -static void acpi_add_table(struct acpi_rsdp *rsdp, void *table)
> -{
> - int i, entries_num;
> - struct acpi_rsdt *rsdt;
> - struct acpi_xsdt *xsdt = NULL;
> -
> - /* The RSDT is mandatory while the XSDT is not */
> - rsdt = (struct acpi_rsdt *)rsdp->rsdt_address;
> -
> - if (rsdp->xsdt_address)
> - xsdt = (struct acpi_xsdt *)((u32)rsdp->xsdt_address);
> -
> - /* This should always be MAX_ACPI_TABLES */
> - entries_num = ARRAY_SIZE(rsdt->entry);
> -
> - for (i = 0; i < entries_num; i++) {
> - if (rsdt->entry[i] == 0)
> - break;
> - }
> -
> - if (i >= entries_num) {
> - debug("ACPI: Error: too many tables\n");
> - return;
> - }
> -
> - /* Add table to the RSDT */
> - rsdt->entry[i] = (u32)table;
> -
> - /* Fix RSDT length or the kernel will assume invalid entries */
> - rsdt->header.length = sizeof(struct acpi_table_header) +
> - (sizeof(u32) * (i + 1));
> -
> - /* Re-calculate checksum */
> - rsdt->header.checksum = 0;
> - rsdt->header.checksum = table_compute_checksum((u8 *)rsdt,
> - rsdt->header.length);
> -
> - /*
> - * And now the same thing for the XSDT. We use the same index as for
> - * now we want the XSDT and RSDT to always be in sync in U-Boot
> - */
> - if (xsdt) {
> - /* Add table to the XSDT */
> - xsdt->entry[i] = (u64)(u32)table;
> -
> - /* Fix XSDT length */
> - xsdt->header.length = sizeof(struct acpi_table_header) +
> - (sizeof(u64) * (i + 1));
> -
> - /* Re-calculate checksum */
> - xsdt->header.checksum = 0;
> - xsdt->header.checksum = table_compute_checksum((u8 *)xsdt,
> - xsdt->header.length);
> - }
> -}
> -
> static void acpi_create_facs(struct acpi_facs *facs)
> {
> memset((void *)facs, 0, sizeof(struct acpi_facs));
> @@ -462,8 +402,6 @@ static void acpi_create_spcr(struct acpi_spcr *spcr)
> ulong write_acpi_tables(ulong start_addr)
> {
> struct acpi_ctx sctx, *ctx = &sctx;
> - struct acpi_rsdp *rsdp;
> - struct acpi_rsdt *rsdt;
> struct acpi_xsdt *xsdt;
> struct acpi_facs *facs;
> struct acpi_table_header *dsdt;
> @@ -485,9 +423,9 @@ ulong write_acpi_tables(ulong start_addr)
> debug("ACPI: Writing ACPI tables at %lx\n", start_addr);
>
> /* We need at least an RSDP and an RSDT Table */
> - rsdp = ctx->current;
> + ctx->rsdp = ctx->current;
> acpi_inc_align(ctx, sizeof(struct acpi_rsdp));
> - rsdt = ctx->current;
> + ctx->rsdt = ctx->current;
> acpi_inc_align(ctx, sizeof(struct acpi_rsdt));
> xsdt = ctx->current;
> acpi_inc_align(ctx, sizeof(struct acpi_xsdt));
> @@ -500,8 +438,8 @@ ulong write_acpi_tables(ulong start_addr)
> /* clear all table memory */
> memset((void *)start, 0, ctx->current - start);
>
> - acpi_write_rsdp(rsdp, rsdt, xsdt);
> - acpi_write_rsdt(rsdt);
> + acpi_write_rsdp(ctx->rsdp, ctx->rsdt, xsdt);
> + acpi_write_rsdt(ctx->rsdt);
> acpi_write_xsdt(xsdt);
>
> debug("ACPI: * FACS\n");
> @@ -543,38 +481,38 @@ ulong write_acpi_tables(ulong start_addr)
> fadt = ctx->current;
> acpi_inc_align(ctx, sizeof(struct acpi_fadt));
> acpi_create_fadt(fadt, facs, dsdt);
> - acpi_add_table(rsdp, fadt);
> + acpi_add_table(ctx, fadt);
>
> debug("ACPI: * MADT\n");
> madt = ctx->current;
> acpi_create_madt(madt);
> acpi_inc_align(ctx, madt->header.length);
> - acpi_add_table(rsdp, madt);
> + acpi_add_table(ctx, madt);
>
> debug("ACPI: * MCFG\n");
> mcfg = ctx->current;
> acpi_create_mcfg(mcfg);
> acpi_inc_align(ctx, mcfg->header.length);
> - acpi_add_table(rsdp, mcfg);
> + acpi_add_table(ctx, mcfg);
>
> debug("ACPI: * CSRT\n");
> csrt = ctx->current;
> acpi_create_csrt(csrt);
> acpi_inc_align(ctx, csrt->header.length);
> - acpi_add_table(rsdp, csrt);
> + 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(rsdp, spcr);
> + acpi_add_table(ctx, spcr);
>
> acpi_write_dev_tables(ctx);
>
> addr = map_to_sysmem(ctx->current);
> debug("current = %lx\n", addr);
>
> - acpi_rsdp_addr = (unsigned long)rsdp;
> + acpi_rsdp_addr = (unsigned long)ctx->rsdp;
> debug("ACPI: done\n");
>
> return addr;
> diff --git a/include/acpi_table.h b/include/acpi_table.h
> index 5fd0fa71a6..2131484880 100644
> --- a/include/acpi_table.h
> +++ b/include/acpi_table.h
> @@ -555,6 +555,15 @@ void acpi_inc(struct acpi_ctx *ctx, uint amount);
> */
> void acpi_inc_align(struct acpi_ctx *ctx, uint amount);
>
> +/**
> + * acpi_add_table() - Add a new table to the RSDP and XSDT
> + *
> + * @ctx: ACPI context
> + * @table: Table to add
> + * @return 0 if OK, -E2BIG if too many tables
> + */
> +int acpi_add_table(struct acpi_ctx *ctx, void *table);
> +
> #endif /* !__ACPI__*/
>
> #include <asm/acpi_table.h>
> diff --git a/include/dm/acpi.h b/include/dm/acpi.h
> index dcfcf5c347..4465e62848 100644
> --- a/include/dm/acpi.h
> +++ b/include/dm/acpi.h
> @@ -30,9 +30,14 @@
> * This contains a few useful pieces of information used when writing
> *
> * @current: Current address for writing
> + * @rsdp: Pointer to the Root System Description Pointer, typically used when
> + * adding a new table. The RSDP holds pointers to the RSDP and XSDT.
typo: "to the RSDT" (not RSDP)
> + * @rsdt: Pointer to the Root System Description Table
> */
> struct acpi_ctx {
> void *current;
> + struct acpi_rsdp *rsdp;
> + struct acpi_rsdt *rsdt;
> };
>
> /**
> diff --git a/lib/acpi/acpi_table.c b/lib/acpi/acpi_table.c
> index 3d24cc26b6..00e80ac39a 100644
> --- a/lib/acpi/acpi_table.c
> +++ b/lib/acpi/acpi_table.c
> @@ -9,6 +9,8 @@
> #include <dm.h>
> #include <acpi_table.h>
> #include <cpu.h>
> +#include <mapmem.h>
> +#include <tables_csum.h>
> #include <version.h>
> #include <dm/acpi.h>
>
> @@ -116,3 +118,65 @@ void acpi_inc_align(struct acpi_ctx *ctx, uint amount)
> ctx->current += amount;
> acpi_align(ctx);
> }
> +
> +/**
> + * Add an ACPI table to the RSDT (and XSDT) structure, recalculate length
> + * and checksum.
> + */
> +int acpi_add_table(struct acpi_ctx *ctx, void *table)
> +{
> + int i, entries_num;
> + struct acpi_rsdt *rsdt;
> + struct acpi_xsdt *xsdt = NULL;
> +
> + /* The RSDT is mandatory while the XSDT is not */
> + rsdt = ctx->rsdt;
> +
> + if (ctx->rsdp->xsdt_address)
> + xsdt = map_sysmem(ctx->rsdp->xsdt_address, 0);
> +
> + /* This should always be MAX_ACPI_TABLES */
> + entries_num = ARRAY_SIZE(rsdt->entry);
> +
> + for (i = 0; i < entries_num; i++) {
> + if (rsdt->entry[i] == 0)
> + break;
> + }
> +
> + if (i >= entries_num) {
> + debug("ACPI: Error: too many tables\n");
> + return -E2BIG;
> + }
> +
> + /* Add table to the RSDT */
> + rsdt->entry[i] = map_to_sysmem(table);
> +
> + /* Fix RSDT length or the kernel will assume invalid entries */
> + rsdt->header.length = sizeof(struct acpi_table_header) +
> + (sizeof(u32) * (i + 1));
> +
> + /* Re-calculate checksum */
> + rsdt->header.checksum = 0;
> + rsdt->header.checksum = table_compute_checksum((u8 *)rsdt,
> + rsdt->header.length);
> +
> + /*
> + * And now the same thing for the XSDT. We use the same index as for
> + * now we want the XSDT and RSDT to always be in sync in U-Boot
> + */
> + if (xsdt) {
> + /* Add table to the XSDT */
> + xsdt->entry[i] = map_to_sysmem(table);
> +
> + /* Fix XSDT length */
> + xsdt->header.length = sizeof(struct acpi_table_header) +
> + (sizeof(u64) * (i + 1));
> +
> + /* Re-calculate checksum */
> + xsdt->header.checksum = 0;
> + xsdt->header.checksum =
> + table_compute_checksum((u8 *)xsdt, xsdt->header.length);
> + }
> +
> + return 0;
> +}
> diff --git a/test/dm/acpi.c b/test/dm/acpi.c
> index 0bd7e51ac9..a2a57a29a6 100644
> --- a/test/dm/acpi.c
> +++ b/test/dm/acpi.c
> @@ -21,10 +21,14 @@ static int testacpi_write_tables(const struct udevice *dev,
> struct acpi_ctx *ctx)
> {
> struct acpi_dmar *dmar;
> + int ret;
>
> dmar = (struct acpi_dmar *)ctx->current;
> acpi_create_dmar(dmar, DMAR_INTR_REMAP);
> ctx->current += sizeof(struct acpi_dmar);
> + ret = acpi_add_table(ctx, dmar);
> + if (ret)
> + return log_msg_ret("add", ret);
>
> return 0;
> }
> --
> 2.25.1.481.gfbce0eb801-goog
Reviewed-by: Wolfgang Wallner <wolfgang.wallner@br-automation.com>
next prev parent reply other threads:[~2020-03-11 13:43 UTC|newest]
Thread overview: 86+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-09 3:44 [PATCH v2 00/39] dm: Add programmatic generation of ACPI tables (part A) Simon Glass
2020-03-09 3:44 ` [PATCH v2 01/39] cpu: Support querying the address width Simon Glass
2020-03-09 3:44 ` [PATCH v2 02/39] spi: Add SPI mode enums Simon Glass
2020-03-09 7:41 ` Andy Shevchenko
2020-03-09 3:44 ` [PATCH v2 03/39] tpm: cr50: Release locality on exit Simon Glass
2020-03-09 3:44 ` [PATCH v2 04/39] tpm: cr50: Add a comment for cr50_priv Simon Glass
2020-03-09 3:44 ` [PATCH v2 05/39] tpm: cr50: Use the correct GPIO binding Simon Glass
2020-03-09 3:44 ` [PATCH v2 06/39] tpm: Don't cleanup unless an error happens Simon Glass
2020-03-09 3:44 ` [PATCH v2 07/39] dm: pci: Allow disabling auto-config for a device Simon Glass
2020-03-09 7:43 ` Andy Shevchenko
2020-03-09 3:44 ` [PATCH v2 08/39] x86: Correct wording of coreboot source code Simon Glass
2020-03-09 7:44 ` Andy Shevchenko
2020-03-10 23:22 ` Simon Glass
2020-03-09 3:44 ` [PATCH v2 09/39] x86: apl: Move p2sb ofdata reading to the correct method Simon Glass
2020-03-10 14:39 ` Andy Shevchenko
2020-03-11 12:17 ` Simon Glass
2020-03-11 13:06 ` Andy Shevchenko
2020-03-09 3:44 ` [PATCH v2 10/39] pci: Adjust dm_pci_read_bar32() to return errors correctly Simon Glass
2020-03-09 3:44 ` [PATCH v2 11/39] x86: apl: Add Global NVS table header Simon Glass
2020-03-09 3:44 ` [PATCH v2 12/39] dm: core: Add basic ACPI support Simon Glass
2020-03-10 14:46 ` Andy Shevchenko
2020-03-11 12:17 ` Simon Glass
2020-03-09 3:44 ` [PATCH v2 13/39] acpi: Add a binding for ACPI settings in the device tree Simon Glass
2020-03-10 14:50 ` Andy Shevchenko
2020-03-12 3:22 ` Simon Glass
2020-03-09 3:44 ` [PATCH v2 14/39] acpi: Add a simple sandbox test Simon Glass
2020-03-09 3:44 ` [PATCH v2 15/39] x86: Move acpi_table header to main include/ directory Simon Glass
2020-03-09 3:44 ` [PATCH v2 16/39] acpi: Add an __ACPI__ preprocessor symbol Simon Glass
2020-03-09 3:44 ` [PATCH v2 17/39] acpi: Add a central location for table version numbers Simon Glass
2020-03-09 3:44 ` [PATCH v2 18/39] acpi: Add support for DMAR Simon Glass
2020-03-09 3:44 ` [PATCH v2 19/39] acpi: Move acpi_fill_header() to generic code Simon Glass
2020-03-09 3:44 ` [PATCH v2 20/39] acpi: Add a method to write tables for a device Simon Glass
2020-03-09 3:44 ` [PATCH v2 21/39] acpi: Convert part of acpi_table to use acpi_ctx Simon Glass
2020-03-09 3:44 ` [PATCH v2 22/39] x86: Allow devices to write ACPI tables Simon Glass
2020-03-09 3:44 ` [PATCH v2 23/39] acpi: Drop code for missing XSDT from acpi_write_rsdp() Simon Glass
2020-03-09 3:44 ` [PATCH v2 24/39] acpi: Move acpi_add_table() to generic code Simon Glass
2020-03-09 3:44 ` [PATCH v2 25/39] acpi: Put table-setup code in its own function Simon Glass
2020-03-09 3:44 ` [PATCH v2 26/39] acpi: Move the xsdt pointer to acpi_ctx Simon Glass
2020-03-09 3:44 ` [PATCH v2 27/39] acpi: Add an acpi command Simon Glass
2020-03-09 3:44 ` [PATCH v2 28/39] acpi: Add some tables required by the generation code Simon Glass
2020-03-09 3:44 ` [PATCH v2 29/39] acpi: Add generation code for devices Simon Glass
2020-03-09 3:44 ` [PATCH v2 30/39] acpi: Add functions to generate ACPI code Simon Glass
2020-03-09 3:44 ` [PATCH v2 31/39] gpio: Add a method to convert a GPIO to ACPI Simon Glass
2020-03-09 3:44 ` [PATCH v2 32/39] irq: Add a method to convert an interrupt " Simon Glass
2020-03-18 16:17 ` Antwort: " Wolfgang Wallner
2020-03-18 16:20 ` Wolfgang Wallner
2020-03-19 16:18 ` Simon Glass
2020-03-09 3:44 ` [PATCH v2 33/39] acpi: Add support for SSDT generation Simon Glass
2020-03-18 16:48 ` Antwort: " Wolfgang Wallner
2020-03-19 7:39 ` Wolfgang Wallner
2020-03-09 3:44 ` [PATCH v2 34/39] x86: acpi: Move MADT up a bit Simon Glass
2020-03-09 3:44 ` [PATCH v2 35/39] acpi: Record the items added to SSDT Simon Glass
2020-03-09 3:45 ` [PATCH v2 36/39] acpi: Support ordering SSDT data by device Simon Glass
2020-03-09 3:45 ` [PATCH v2 37/39] x86: Allow devices to write an SSDT Simon Glass
2020-03-09 3:45 ` [PATCH v2 38/39] acpi: Add support for DSDT generation Simon Glass
2020-03-09 3:45 ` [PATCH v2 39/39] x86: Allow devices to write to DSDT Simon Glass
2020-03-09 7:38 ` Antwort: [PATCH v2 02/39] spi: Add SPI mode enums Wolfgang Wallner
2020-03-09 7:38 ` Antwort: [PATCH v2 08/39] x86: Correct wording of coreboot source code Wolfgang Wallner
2020-03-09 7:38 ` Antwort: [PATCH v2 10/39] pci: Adjust dm_pci_read_bar32() to return errors correctly Wolfgang Wallner
2020-03-09 7:38 ` Antwort: [PATCH v2 11/39] x86: apl: Add Global NVS table header Wolfgang Wallner
2020-03-09 9:07 ` Antwort: [PATCH v2 12/39] dm: core: Add basic ACPI support Wolfgang Wallner
2020-03-10 9:15 ` Antwort: [PATCH v2 13/39] acpi: Add a binding for ACPI settings in the device tree Wolfgang Wallner
2020-03-12 3:24 ` Simon Glass
2020-03-12 12:44 ` Antwort: " Wolfgang Wallner
2020-03-13 0:36 ` Simon Glass
2020-03-10 9:16 ` Antwort: [PATCH v2 15/39] x86: Move acpi_table header to main include/ directory Wolfgang Wallner
2020-03-10 9:17 ` Antwort: [PATCH v2 16/39] acpi: Add an __ACPI__ preprocessor symbol Wolfgang Wallner
2020-03-10 9:26 ` Antwort: [PATCH v2 17/39] acpi: Add a central location for table version numbers Wolfgang Wallner
2020-03-12 3:22 ` Simon Glass
2020-03-10 12:32 ` Antwort: [PATCH v2 18/39] acpi: Add support for DMAR Wolfgang Wallner
2020-03-10 12:33 ` Antwort: [PATCH v2 19/39] acpi: Move acpi_fill_header() to generic code Wolfgang Wallner
2020-03-10 12:53 ` Antwort: [PATCH v2 14/39] acpi: Add a simple sandbox test Wolfgang Wallner
2020-03-11 9:04 ` Antwort: [PATCH v2 19/39] acpi: Move acpi_fill_header() to generic code Wolfgang Wallner
2020-03-11 11:36 ` Antwort: [PATCH v2 20/39] acpi: Add a method to write tables for a device Wolfgang Wallner
2020-03-11 11:37 ` Antwort: [PATCH v2 22/39] x86: Allow devices to write ACPI tables Wolfgang Wallner
2020-03-11 12:58 ` Antwort: [PATCH v2 21/39] acpi: Convert part of acpi_table to use acpi_ctx Wolfgang Wallner
2020-03-12 3:23 ` Simon Glass
2020-03-12 13:03 ` Antwort: " Wolfgang Wallner
2020-03-11 13:43 ` Wolfgang Wallner [this message]
2020-03-11 14:33 ` Antwort: [PATCH v2 25/39] acpi: Put table-setup code in its own function Wolfgang Wallner
2020-03-11 14:34 ` Antwort: [PATCH v2 23/39] acpi: Drop code for missing XSDT from acpi_write_rsdp() Wolfgang Wallner
2020-03-11 14:57 ` Antwort: [PATCH v2 26/39] acpi: Move the xsdt pointer to acpi_ctx Wolfgang Wallner
2020-03-12 14:30 ` Antwort: [PATCH v2 27/39] acpi: Add an acpi command Wolfgang Wallner
2020-03-13 9:55 ` Antwort: [PATCH v2 30/39] acpi: Add functions to generate ACPI code Wolfgang Wallner
2020-03-14 20:34 ` Simon Glass
2020-03-13 11:16 ` Antwort: [PATCH v2 31/39] gpio: Add a method to convert a GPIO to ACPI Wolfgang Wallner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=OF1782247B.E861E6D9-ONC1258528.004023BE-C1258528.004B5EC2@br-automation.com \
--to=wolfgang.wallner@br-automation.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.