Skip to content

Commit dfc9327

Browse files
jgross1Ingo Molnar
authored andcommitted
acpi: Introduce acpi_arch_get_root_pointer() for getting rsdp address
Add an architecture specific function to get the address of the RSDP table. Per default it will just return 0 indicating falling back to the current mechanism. Signed-off-by: Juergen Gross <[email protected]> Reviewed-by: Andy Shevchenko <[email protected]> Acked-by: Thomas Gleixner <[email protected]> Acked-by: Rafael J. Wysocki <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: Eric Biederman <[email protected]> Cc: H. Peter Anvin <[email protected]> Cc: Kees Cook <[email protected]> Cc: Kirill A. Shutemov <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
1 parent 3f7df3e commit dfc9327

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

drivers/acpi/osl.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,12 +189,15 @@ early_param("acpi_rsdp", setup_acpi_rsdp);
189189

190190
acpi_physical_address __init acpi_os_get_root_pointer(void)
191191
{
192-
acpi_physical_address pa = 0;
192+
acpi_physical_address pa;
193193

194194
#ifdef CONFIG_KEXEC
195195
if (acpi_rsdp)
196196
return acpi_rsdp;
197197
#endif
198+
pa = acpi_arch_get_root_pointer();
199+
if (pa)
200+
return pa;
198201

199202
if (efi_enabled(EFI_CONFIG_TABLES)) {
200203
if (efi.acpi20 != EFI_INVALID_TABLE_ADDR)

include/linux/acpi.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -623,6 +623,13 @@ bool acpi_gtdt_c3stop(int type);
623623
int acpi_arch_timer_mem_init(struct arch_timer_mem *timer_mem, int *timer_count);
624624
#endif
625625

626+
#ifndef ACPI_HAVE_ARCH_GET_ROOT_POINTER
627+
static inline u64 acpi_arch_get_root_pointer(void)
628+
{
629+
return 0;
630+
}
631+
#endif
632+
626633
#else /* !CONFIG_ACPI */
627634

628635
#define acpi_disabled 1

0 commit comments

Comments
 (0)