summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArthur Heymans <arthur@aheymans.xyz>2023-06-22 21:41:51 +0200
committerFelix Held <felix-coreboot@felixheld.de>2023-09-18 13:26:37 +0000
commitf3aa88a51cefc12da3304cd827bbfd6e7fcbfe76 (patch)
tree2d098e82e5f283987ed11ee13fa20fd880f919ec
parentfbb612f6d25bdd03a691396eb5a3f73d5d4c56b3 (diff)
downloadcoreboot-f3aa88a51cefc12da3304cd827bbfd6e7fcbfe76.tar.gz
coreboot-f3aa88a51cefc12da3304cd827bbfd6e7fcbfe76.tar.bz2
coreboot-f3aa88a51cefc12da3304cd827bbfd6e7fcbfe76.zip
arch/arm64: Hook up ACPI table generation
Linux v6.3.5 is able to detect and use ACPI tables on an out of tree target using hacked version of u-boot to pass ACPI through UEFI. Signed-off-by: Arthur Heymans <arthur@aheymans.xyz> Change-Id: I4f60c546ec262ffb4d447fe6476844cf5a1b756d Reviewed-on: https://review.coreboot.org/c/coreboot/+/76071 Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com> Reviewed-by: Lean Sheng Tan <sheng.tan@9elements.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Elyes Haouas <ehaouas@noos.fr>
-rw-r--r--src/acpi/Kconfig6
-rw-r--r--src/arch/arm64/tables.c19
-rw-r--r--src/arch/x86/Kconfig6
3 files changed, 23 insertions, 8 deletions
diff --git a/src/acpi/Kconfig b/src/acpi/Kconfig
index b72d2c63e7a2..dc57fef05e2b 100644
--- a/src/acpi/Kconfig
+++ b/src/acpi/Kconfig
@@ -81,3 +81,9 @@ config ACPI_GTDT
depends on HAVE_ACPI_TABLES
help
Selected by platforms that implement ARM generic timers
+
+config MAX_ACPI_TABLE_SIZE_KB
+ int
+ default 144
+ help
+ Set the maximum size of all ACPI tables in KiB.
diff --git a/src/arch/arm64/tables.c b/src/arch/arm64/tables.c
index b97297c1b9a6..c66612b7f2c1 100644
--- a/src/arch/arm64/tables.c
+++ b/src/arch/arm64/tables.c
@@ -1,12 +1,27 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-#include <bootmem.h>
-#include <boot/tables.h>
+#include <acpi/acpi.h>
+#include <assert.h>
#include <boot/coreboot_tables.h>
+#include <boot/tables.h>
+#include <bootmem.h>
+#include <cbmem.h>
#include <symbols.h>
+static void write_acpi_table(void)
+{
+ const size_t max_acpi_size = CONFIG_MAX_ACPI_TABLE_SIZE_KB * KiB;
+ const uintptr_t acpi_start = (uintptr_t)cbmem_add(CBMEM_ID_ACPI, max_acpi_size);
+ assert(IS_ALIGNED(acpi_start, 16));
+ const uintptr_t acpi_end = write_acpi_tables(acpi_start);
+ assert(acpi_end < acpi_start + max_acpi_size);
+ printk(BIOS_DEBUG, "ACPI tables: %ld bytes.\n", acpi_end - acpi_start);
+}
+
void arch_write_tables(uintptr_t coreboot_table)
{
+ if (CONFIG(HAVE_ACPI_TABLES))
+ write_acpi_table();
}
void bootmem_arch_add_ranges(void)
diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig
index ec1171b505b8..8676fad863de 100644
--- a/src/arch/x86/Kconfig
+++ b/src/arch/x86/Kconfig
@@ -298,12 +298,6 @@ config MAX_PIRQ_LINKS
table specifies links greater than 4, pirq_route_irqs will not
function properly, unless this variable is correctly set.
-config MAX_ACPI_TABLE_SIZE_KB
- int
- default 144
- help
- Set the maximum size of all ACPI tables in KiB.
-
config MEMLAYOUT_LD_FILE
string
default "src/arch/x86/memlayout.ld"