From: tip-bot for Juergen Gross <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, jgross@suse.com,
ebiederm@xmission.com, rafael.j.wysocki@intel.com, hpa@zytor.com,
bp@alien8.de, torvalds@linux-foundation.org, tglx@linutronix.de,
kirill.shutemov@linux.intel.com, keescook@chromium.org,
mingo@kernel.org, peterz@infradead.org,
andy.shevchenko@gmail.com
Subject: [tip:x86/boot] acpi: Introduce acpi_arch_get_root_pointer() for getting rsdp address
Date: Tue, 20 Feb 2018 02:24:08 -0800 [thread overview]
Message-ID: <tip-795e2963a1afef44ed9ec7e6d16c8052fcd8d886@git.kernel.org> (raw)
In-Reply-To: <20180219100906.14265-2-jgross@suse.com>
Commit-ID: 795e2963a1afef44ed9ec7e6d16c8052fcd8d886
Gitweb: https://git.kernel.org/tip/795e2963a1afef44ed9ec7e6d16c8052fcd8d886
Author: Juergen Gross <jgross@suse.com>
AuthorDate: Mon, 19 Feb 2018 11:09:04 +0100
Committer: Ingo Molnar <mingo@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 <jgross@suse.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Eric Biederman <ebiederm@xmission.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: boris.ostrovsky@oracle.com
Cc: lenb@kernel.org
Cc: linux-acpi@vger.kernel.org
Cc: xen-devel@lists.xenproject.org
Link: http://lkml.kernel.org/r/20180219100906.14265-2-jgross@suse.com
Signed-off-by: Ingo Molnar <mingo@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
next prev parent reply other threads:[~2018-02-20 10:36 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-19 10:09 [PATCH v3 0/3] xen: re-enable booting as Xen PVH guest Juergen Gross
2018-02-19 10:09 ` Juergen Gross
2018-02-19 10:09 ` [PATCH v3 1/3] acpi: introduce acpi_arch_get_root_pointer() for getting rsdp address Juergen Gross
2018-02-19 10:09 ` Juergen Gross
2018-02-20 10:24 ` tip-bot for Juergen Gross [this message]
2018-02-26 8:46 ` [tip:x86/mm] acpi: Introduce " tip-bot for Juergen Gross
2018-02-19 10:09 ` [PATCH v3 2/3] x86/acpi: add a new x86_init_acpi structure to x86_init_ops Juergen Gross
2018-02-19 10:09 ` Juergen Gross
2018-02-20 10:24 ` [tip:x86/boot] x86/acpi: Add " tip-bot for Juergen Gross
2018-02-26 8:46 ` [tip:x86/mm] " tip-bot for Juergen Gross
2018-02-19 10:09 ` [PATCH v3 3/3] x86/xen: add pvh specific rsdp address retrieval function Juergen Gross
2018-02-19 10:09 ` Juergen Gross
2018-02-20 10:25 ` [tip:x86/boot] x86/xen: Add " tip-bot for Juergen Gross
2018-02-26 8:47 ` [tip:x86/mm] " tip-bot for Juergen Gross
2018-02-19 10:27 ` [PATCH v3 0/3] xen: re-enable booting as Xen PVH guest Rafael J. Wysocki
2018-02-19 10:27 ` Rafael J. Wysocki
2018-02-19 13:43 ` Andy Shevchenko
2018-02-19 13:43 ` Andy Shevchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-795e2963a1afef44ed9ec7e6d16c8052fcd8d886@git.kernel.org \
--to=tipbot@zytor.com \
--cc=andy.shevchenko@gmail.com \
--cc=bp@alien8.de \
--cc=ebiederm@xmission.com \
--cc=hpa@zytor.com \
--cc=jgross@suse.com \
--cc=keescook@chromium.org \
--cc=kirill.shutemov@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=rafael.j.wysocki@intel.com \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.