From a07b09ab71d04b870b9413b7e075a2369f59fd0a Mon Sep 17 00:00:00 2001
From: Arthur Heymans <arthur@aheymans.xyz>
Date: Wed, 5 Jul 2023 12:53:10 +0200
Subject: acpi.c: Find FACS using 64bit address fields
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Change-Id: I406b9b470d6e76867e47cfda427b199e20cc9b32
Reviewed-on: https://review.coreboot.org/c/coreboot/+/76293
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Lean Sheng Tan <sheng.tan@9elements.com>
Reviewed-by: Tim Wawrzynczak <inforichland@gmail.com>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
---
 src/acpi/acpi.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/acpi')

diff --git a/src/acpi/acpi.c b/src/acpi/acpi.c
index 07ca408634..c385b5865f 100644
--- a/src/acpi/acpi.c
+++ b/src/acpi/acpi.c
@@ -1599,7 +1599,8 @@ void *acpi_find_wakeup_vector(void)
 	}
 
 	printk(BIOS_DEBUG, "FADT found at %p\n", fadt);
-	facs = (acpi_facs_t *)(uintptr_t)fadt->firmware_ctrl;
+	facs = (acpi_facs_t *)(uintptr_t)((uint64_t)fadt->x_firmware_ctl_l
+			       | (uint64_t)fadt->x_firmware_ctl_h << 32);
 
 	if (facs == NULL) {
 		printk(BIOS_ALERT,
-- 
cgit v1.2.3