aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur Heymans <arthur@aheymans.xyz>2022-03-03 22:59:23 +0100
committerFelix Held <felix-coreboot@felixheld.de>2022-03-30 00:03:28 +0000
commitcddba4528d062b676d3766d1bb83504de00042cb (patch)
tree979d6115de49bc083c6a0e107b137931913ba12a
parent4a3331d93cc6296c1c5d966b8e914608b865819f (diff)
libpayload: Parse the ACPI RSDP table entry
Change-Id: I583cda63c3f0b58f8d198ed5ecea7c4619c7a897 Signed-off-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-on: https://review.coreboot.org/c/coreboot/+/62576 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
-rw-r--r--payloads/libpayload/include/coreboot_tables.h11
-rw-r--r--payloads/libpayload/include/sysinfo.h1
-rw-r--r--payloads/libpayload/libc/coreboot.c9
3 files changed, 21 insertions, 0 deletions
diff --git a/payloads/libpayload/include/coreboot_tables.h b/payloads/libpayload/include/coreboot_tables.h
index 3fd3fc85e1..bd23d34c83 100644
--- a/payloads/libpayload/include/coreboot_tables.h
+++ b/payloads/libpayload/include/coreboot_tables.h
@@ -83,6 +83,7 @@ enum {
CB_TAG_BOARD_CONFIG = 0x0040,
CB_TAG_ACPI_CNVS = 0x0041,
CB_TAG_TYPE_C_INFO = 0x0042,
+ CB_TAG_ACPI_RSDP = 0x0043,
CB_TAG_CMOS_OPTION_TABLE = 0x00c8,
CB_TAG_OPTION = 0x00c9,
CB_TAG_OPTION_ENUM = 0x00ca,
@@ -422,6 +423,16 @@ struct cb_cmos_checksum {
u32 type;
};
+/*
+ * Handoff the ACPI RSDP
+ */
+struct cb_acpi_rsdp {
+ uint32_t tag;
+ uint32_t size;
+ struct cbuint64 rsdp_pointer; /* Address of the ACPI RSDP */
+};
+
+
/* Helpful inlines */
static inline u64 cb_unpack64(struct cbuint64 val)
diff --git a/payloads/libpayload/include/sysinfo.h b/payloads/libpayload/include/sysinfo.h
index eba4b89227..c8c10524f4 100644
--- a/payloads/libpayload/include/sysinfo.h
+++ b/payloads/libpayload/include/sysinfo.h
@@ -111,6 +111,7 @@ struct sysinfo_t {
uintptr_t mrc_cache;
uintptr_t acpi_gnvs;
uintptr_t acpi_cnvs;
+ uintptr_t acpi_rsdp;
#define UNDEFINED_STRAPPING_ID (~0)
#define UNDEFINED_FW_CONFIG ~((uint64_t)0)
diff --git a/payloads/libpayload/libc/coreboot.c b/payloads/libpayload/libc/coreboot.c
index f5695d62dd..2474df96fa 100644
--- a/payloads/libpayload/libc/coreboot.c
+++ b/payloads/libpayload/libc/coreboot.c
@@ -268,6 +268,12 @@ static void cb_parse_cbmem_entry(void *ptr, struct sysinfo_t *info)
}
}
+static void cb_parse_rsdp(void *ptr, struct sysinfo_t *info)
+{
+ const struct cb_acpi_rsdp *cb_acpi_rsdp = ptr;
+ info->acpi_rsdp = cb_unpack64(cb_acpi_rsdp->rsdp_pointer);
+}
+
int cb_parse_header(void *addr, int len, struct sysinfo_t *info)
{
struct cb_header *header;
@@ -408,6 +414,9 @@ int cb_parse_header(void *addr, int len, struct sysinfo_t *info)
cb_parse_tsc_info(ptr, info);
break;
#endif
+ case CB_TAG_ACPI_RSDP:
+ cb_parse_rsdp(ptr, info);
+ break;
default:
cb_parse_arch_specific(rec, info);
break;