mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2026-06-02 09:46:37 +03:00
3d09ec64eb
When creating the RSDT and the XSDT table they contain no entries. The table size therefore must equal the header size. Without this change a NULL deference has been observed in acpi_find_table() when running `ut dm` on sandbox64_defconfig executed via `sudo ./u-boot -D`. Fixes:94ba15a3f1("x86: Move base tables to a writer function") Fixes:7e586f6907("acpi: Put table-setup code in its own function") Fixes:ab5efd576c("x86: acpi: Adjust order in acpi_table.c") Fixes:867bcb63e7("x86: Generate a valid ACPI table") Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> Reviewed-by: Simon Glass <sjg@chromium.org> Update dm_test_acpi_ctx_and_base_tables() in test/dm/acpi.c to expect sizeof(struct acpi_table_header) for the initial table length (instead of sizeof(*rsdt) / sizeof(*xsdt)), and to compute the checksum over header->length bytes rather than the full struct size: Signed-off-by: Simon Glass <sjg@chromium.org>
103 lines
2.5 KiB
C
103 lines
2.5 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* Write base ACPI tables
|
|
*
|
|
* Copyright 2021 Google LLC
|
|
*/
|
|
|
|
#define LOG_CATEGORY LOGC_ACPI
|
|
|
|
#include <acpi/acpi_table.h>
|
|
#include <dm/acpi.h>
|
|
#include <mapmem.h>
|
|
#include <tables_csum.h>
|
|
#include <linux/sizes.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/string.h>
|
|
|
|
void acpi_write_rsdp(struct acpi_rsdp *rsdp, struct acpi_rsdt *rsdt,
|
|
struct acpi_xsdt *xsdt)
|
|
{
|
|
memset(rsdp, 0, sizeof(struct acpi_rsdp));
|
|
|
|
memcpy(rsdp->signature, RSDP_SIG, 8);
|
|
memcpy(rsdp->oem_id, OEM_ID, 6);
|
|
|
|
if (rsdt)
|
|
rsdp->rsdt_address = nomap_to_sysmem(rsdt);
|
|
|
|
if (xsdt)
|
|
rsdp->xsdt_address = nomap_to_sysmem(xsdt);
|
|
|
|
rsdp->length = sizeof(struct acpi_rsdp);
|
|
rsdp->revision = ACPI_RSDP_REV_ACPI_2_0;
|
|
|
|
/* Calculate checksums */
|
|
rsdp->checksum = table_compute_checksum(rsdp, 20);
|
|
rsdp->ext_checksum = table_compute_checksum(rsdp,
|
|
sizeof(struct acpi_rsdp));
|
|
}
|
|
|
|
static void acpi_write_rsdt(struct acpi_rsdt *rsdt)
|
|
{
|
|
struct acpi_table_header *header = &rsdt->header;
|
|
|
|
/* Fill out header fields */
|
|
acpi_fill_header(header, "RSDT");
|
|
header->length = sizeof(struct acpi_table_header);
|
|
header->revision = 1;
|
|
|
|
/* Entries are filled in later, we come with an empty set */
|
|
|
|
/* Fix checksum */
|
|
acpi_update_checksum(header);
|
|
}
|
|
|
|
static void acpi_write_xsdt(struct acpi_xsdt *xsdt)
|
|
{
|
|
struct acpi_table_header *header = &xsdt->header;
|
|
|
|
/* Fill out header fields */
|
|
acpi_fill_header(header, "XSDT");
|
|
header->length = sizeof(struct acpi_table_header);
|
|
header->revision = 1;
|
|
|
|
/* Entries are filled in later, we come with an empty set */
|
|
|
|
/* Fix checksum */
|
|
acpi_update_checksum(header);
|
|
}
|
|
|
|
static int acpi_write_base(struct acpi_ctx *ctx,
|
|
const struct acpi_writer *entry)
|
|
{
|
|
/* We need at least an RSDP and an XSDT Table */
|
|
ctx->rsdp = ctx->current;
|
|
acpi_inc_align(ctx, sizeof(struct acpi_rsdp));
|
|
if (map_to_sysmem(ctx->current) < SZ_4G - SZ_64K) {
|
|
ctx->rsdt = ctx->current;
|
|
acpi_inc_align(ctx, sizeof(struct acpi_rsdt));
|
|
} else {
|
|
ctx->rsdt = 0;
|
|
}
|
|
ctx->xsdt = ctx->current;
|
|
acpi_inc_align(ctx, sizeof(struct acpi_xsdt));
|
|
|
|
/* clear all table memory */
|
|
memset(ctx->base, '\0', ctx->current - ctx->base);
|
|
|
|
acpi_write_rsdp(ctx->rsdp, ctx->rsdt, ctx->xsdt);
|
|
if (ctx->rsdt)
|
|
acpi_write_rsdt(ctx->rsdt);
|
|
acpi_write_xsdt(ctx->xsdt);
|
|
|
|
return 0;
|
|
}
|
|
/*
|
|
* Per ACPI spec, the FACS table address must be aligned to a 64-byte boundary
|
|
* (Windows checks this, but Linux does not).
|
|
*
|
|
* Use the '0' prefix to put this one first
|
|
*/
|
|
ACPI_WRITER(0base, NULL, acpi_write_base, ACPIWF_ALIGN64);
|