mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-28 15:41:40 +00:00
acpi: Move acpi_add_table() to generic code
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> Reviewed-by: Wolfgang Wallner <wolfgang.wallner@br-automation.com>
This commit is contained in:
Simon Glass
Bin Meng
parent
288edc7821
commit
29b351122e
5 changed files with 100 additions and 74 deletions
|
|
@ -83,67 +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;
|
||||
|
||||
/* The RSDT is mandatory while the XSDT is not */
|
||||
rsdt = (struct acpi_rsdt *)rsdp->rsdt_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);
|
||||
|
||||
/* The RSDT is mandatory while the XSDT is not */
|
||||
if (!rsdp->xsdt_address)
|
||||
return;
|
||||
|
||||
/*
|
||||
* 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
|
||||
*/
|
||||
xsdt = (struct acpi_xsdt *)((u32)rsdp->xsdt_address);
|
||||
|
||||
/* 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));
|
||||
|
|
@ -472,8 +411,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;
|
||||
|
|
@ -495,9 +432,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));
|
||||
|
|
@ -510,8 +447,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");
|
||||
|
|
@ -553,38 +490,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;
|
||||
|
|
|
|||
|
|
@ -551,6 +551,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>
|
||||
|
|
|
|||
|
|
@ -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 RSDT and XSDT.
|
||||
* @rsdt: Pointer to the Root System Description Table
|
||||
*/
|
||||
struct acpi_ctx {
|
||||
void *current;
|
||||
struct acpi_rsdp *rsdp;
|
||||
struct acpi_rsdt *rsdt;
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -8,6 +8,8 @@
|
|||
#include <common.h>
|
||||
#include <dm.h>
|
||||
#include <cpu.h>
|
||||
#include <mapmem.h>
|
||||
#include <tables_csum.h>
|
||||
#include <version.h>
|
||||
#include <acpi/acpi_table.h>
|
||||
#include <dm/acpi.h>
|
||||
|
|
@ -120,3 +122,62 @@ 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;
|
||||
|
||||
/* The RSDT is mandatory while the XSDT is not */
|
||||
rsdt = ctx->rsdt;
|
||||
|
||||
/* 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) {
|
||||
log_err("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
|
||||
*/
|
||||
xsdt = map_sysmem(ctx->rsdp->xsdt_address, sizeof(*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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
|
||||
#include <common.h>
|
||||
#include <dm.h>
|
||||
#include <mapmem.h>
|
||||
#include <version.h>
|
||||
#include <acpi/acpi_table.h>
|
||||
#include <dm/acpi.h>
|
||||
|
|
@ -21,10 +22,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;
|
||||
}
|
||||
|
|
@ -127,6 +132,7 @@ DM_TEST(dm_test_acpi_fill_header, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT);
|
|||
static int dm_test_acpi_write_tables(struct unit_test_state *uts)
|
||||
{
|
||||
struct acpi_dmar *dmar;
|
||||
struct acpi_xsdt *xsdt;
|
||||
struct acpi_ctx ctx;
|
||||
void *buf;
|
||||
|
||||
|
|
@ -134,8 +140,16 @@ static int dm_test_acpi_write_tables(struct unit_test_state *uts)
|
|||
ut_assertnonnull(buf);
|
||||
|
||||
ctx.current = buf;
|
||||
ctx.rsdp = ctx.current;
|
||||
acpi_inc_align(&ctx, sizeof(struct acpi_rsdp));
|
||||
ctx.rsdt = ctx.current;
|
||||
acpi_inc_align(&ctx, sizeof(struct acpi_rsdt));
|
||||
xsdt = ctx.current;
|
||||
acpi_inc_align(&ctx, sizeof(struct acpi_xsdt));
|
||||
ctx.rsdp->xsdt_address = map_to_sysmem(xsdt);
|
||||
dmar = ctx.current;
|
||||
|
||||
ut_assertok(acpi_write_dev_tables(&ctx));
|
||||
dmar = buf;
|
||||
|
||||
/*
|
||||
* We should have two dmar tables, one for each "denx,u-boot-acpi-test"
|
||||
|
|
|
|||
Loading…
Reference in a new issue