[PATCH] acpi: move acpi_get_rsdp_addr() to acpi/acpi_table.h

Heinrich Schuchardt heinrich.schuchardt at canonical.com
Thu Nov 9 18:23:02 CET 2023


Function acpi_get_rsdp_addr() is needed on all architectures which
write ACPI tables. Move the definition from the x86 include to an
architecture independent one.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt at canonical.com>
---
 arch/x86/include/asm/acpi_table.h | 9 ---------
 drivers/misc/qfw.c                | 1 +
 include/acpi/acpi_table.h         | 9 +++++++++
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/arch/x86/include/asm/acpi_table.h b/arch/x86/include/asm/acpi_table.h
index 226753b65d..57e41654ce 100644
--- a/arch/x86/include/asm/acpi_table.h
+++ b/arch/x86/include/asm/acpi_table.h
@@ -64,15 +64,6 @@ int acpi_write_dbg2_pci_uart(struct acpi_ctx *ctx, struct udevice *dev,
  */
 int acpi_create_gnvs(struct acpi_global_nvs *gnvs);
 
-/**
- * acpi_get_rsdp_addr() - get ACPI RSDP table address
- *
- * This routine returns the ACPI RSDP table address in the system memory.
- *
- * @return:	ACPI RSDP table address
- */
-ulong acpi_get_rsdp_addr(void);
-
 /**
  * arch_read_sci_irq_select() - Read the system-control interrupt number
  *
diff --git a/drivers/misc/qfw.c b/drivers/misc/qfw.c
index 7c01bf23d5..e3b6b4cd74 100644
--- a/drivers/misc/qfw.c
+++ b/drivers/misc/qfw.c
@@ -7,6 +7,7 @@
 #define LOG_CATEGORY UCLASS_QFW
 
 #include <common.h>
+#include <acpi/acpi_table.h>
 #include <bootdev.h>
 #include <bootflow.h>
 #include <bootmeth.h>
diff --git a/include/acpi/acpi_table.h b/include/acpi/acpi_table.h
index 1f85de091d..a3b67259e6 100644
--- a/include/acpi/acpi_table.h
+++ b/include/acpi/acpi_table.h
@@ -920,6 +920,15 @@ void acpi_fill_header(struct acpi_table_header *header, char *signature);
  */
 int acpi_fill_csrt(struct acpi_ctx *ctx);
 
+/**
+ * acpi_get_rsdp_addr() - get ACPI RSDP table address
+ *
+ * This routine returns the ACPI RSDP table address in the system memory.
+ *
+ * @return:	ACPI RSDP table address
+ */
+ulong acpi_get_rsdp_addr(void);
+
 /**
  * write_acpi_tables() - Write out the ACPI tables
  *
-- 
2.40.1



More information about the U-Boot mailing list