Commit-ID: 795e2963a1afef44ed9ec7e6d16c8052fcd8d886 Gitweb: https://git.kernel.org/tip/795e2963a1afef44ed9ec7e6d16c8052fcd8d886 Author: Juergen Gross <jgr...@suse.com> AuthorDate: Mon, 19 Feb 2018 11:09:04 +0100 Committer: Ingo Molnar <mi...@kernel.org> CommitDate: Tue, 20 Feb 2018 09:00:55 +0100
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 <jgr...@suse.com> Reviewed-by: Andy Shevchenko <andy.shevche...@gmail.com> Acked-by: Thomas Gleixner <t...@linutronix.de> Acked-by: Rafael J. Wysocki <rafael.j.wyso...@intel.com> Cc: Borislav Petkov <b...@alien8.de> Cc: Eric Biederman <ebied...@xmission.com> Cc: H. Peter Anvin <h...@zytor.com> Cc: Kees Cook <keesc...@chromium.org> Cc: Kirill A. Shutemov <kirill.shute...@linux.intel.com> Cc: Linus Torvalds <torva...@linux-foundation.org> Cc: Peter Zijlstra <pet...@infradead.org> Cc: boris.ostrov...@oracle.com Cc: l...@kernel.org Cc: linux-a...@vger.kernel.org Cc: xen-de...@lists.xenproject.org Link: http://lkml.kernel.org/r/20180219100906.14265-2-jgr...@suse.com Signed-off-by: Ingo Molnar <mi...@kernel.org> --- drivers/acpi/osl.c | 5 ++++- include/linux/acpi.h | 7 +++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 3bb46cb..7ca41bf 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -189,12 +189,15 @@ early_param("acpi_rsdp", setup_acpi_rsdp); acpi_physical_address __init acpi_os_get_root_pointer(void) { - acpi_physical_address pa = 0; + acpi_physical_address pa; #ifdef CONFIG_KEXEC if (acpi_rsdp) return acpi_rsdp; #endif + pa = acpi_arch_get_root_pointer(); + if (pa) + return pa; if (efi_enabled(EFI_CONFIG_TABLES)) { if (efi.acpi20 != EFI_INVALID_TABLE_ADDR) diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 968173e..15bfb15 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -623,6 +623,13 @@ bool acpi_gtdt_c3stop(int type); int acpi_arch_timer_mem_init(struct arch_timer_mem *timer_mem, int *timer_count); #endif +#ifndef ACPI_HAVE_ARCH_GET_ROOT_POINTER +static inline u64 acpi_arch_get_root_pointer(void) +{ + return 0; +} +#endif + #else /* !CONFIG_ACPI */ #define acpi_disabled 1
