From: "tip-bot2 for Sean Christopherson" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Sean Christopherson <sean.j.christopherson@intel.com>,
Ingo Molnar <mingo@kernel.org>, x86 <x86@kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: [tip: core/headers] x86/ACPI/sleep: Move acpi_get_wakeup_address() into sleep.c, remove <asm/realmode.h> from <asm/acpi.h>
Date: Sun, 19 Jan 2020 10:40:44 -0000 [thread overview]
Message-ID: <157943044462.396.13192528326198737540.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20191126165417.22423-13-sean.j.christopherson@intel.com>
The following commit has been merged into the core/headers branch of tip:
Commit-ID: 960786422fe90a86e81131f5dbd902cb5ebf8760
Gitweb: https://git.kernel.org/tip/960786422fe90a86e81131f5dbd902cb5ebf8760
Author: Sean Christopherson <sean.j.christopherson@intel.com>
AuthorDate: Tue, 26 Nov 2019 08:54:17 -08:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Tue, 10 Dec 2019 10:15:48 +01:00
x86/ACPI/sleep: Move acpi_get_wakeup_address() into sleep.c, remove <asm/realmode.h> from <asm/acpi.h>
Move the definition of acpi_get_wakeup_address() into sleep.c to break
linux/acpi.h's dependency (by way of asm/acpi.h) on asm/realmode.h.
Everyone and their mother includes linux/acpi.h, i.e. modifying
realmode.h results in a full kernel rebuild, which makes the already
inscrutable real mode boot code even more difficult to understand and is
positively rage inducing when trying to make changes to x86's boot flow.
No functional change intended.
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Link: https://lkml.kernel.org/r/20191126165417.22423-13-sean.j.christopherson@intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/include/asm/acpi.h | 6 +-----
arch/x86/kernel/acpi/sleep.c | 11 +++++++++++
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h
index 23ffafd..ca09764 100644
--- a/arch/x86/include/asm/acpi.h
+++ b/arch/x86/include/asm/acpi.h
@@ -13,7 +13,6 @@
#include <asm/processor.h>
#include <asm/mmu.h>
#include <asm/mpspec.h>
-#include <asm/realmode.h>
#include <asm/x86_init.h>
#ifdef CONFIG_ACPI_APEI
@@ -62,10 +61,7 @@ static inline void acpi_disable_pci(void)
extern int (*acpi_suspend_lowlevel)(void);
/* Physical address to resume after wakeup */
-static inline unsigned long acpi_get_wakeup_address(void)
-{
- return ((unsigned long)(real_mode_header->wakeup_start));
-}
+unsigned long acpi_get_wakeup_address(void);
/*
* Check if the CPU can handle C2 and deeper
diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
index ca13851..26b7256 100644
--- a/arch/x86/kernel/acpi/sleep.c
+++ b/arch/x86/kernel/acpi/sleep.c
@@ -27,6 +27,17 @@ static char temp_stack[4096];
#endif
/**
+ * acpi_get_wakeup_address - provide physical address for S3 wakeup
+ *
+ * Returns the physical address where the kernel should be resumed after the
+ * system awakes from S3, e.g. for programming into the firmware waking vector.
+ */
+unsigned long acpi_get_wakeup_address(void)
+{
+ return ((unsigned long)(real_mode_header->wakeup_start));
+}
+
+/**
* x86_acpi_enter_sleep_state - enter sleep state
* @state: Sleep state to enter.
*
next prev parent reply other threads:[~2020-01-19 10:41 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-26 16:54 [PATCH v2 00/12] treewide: break dependencies on x86's RM header Sean Christopherson
2019-11-26 16:54 ` [PATCH v2 01/12] x86/efi: Explicitly include realmode.h to handle RM trampoline quirk Sean Christopherson
2020-01-19 10:40 ` [tip: core/headers] " tip-bot2 for Sean Christopherson
2019-11-26 16:54 ` [PATCH v2 02/12] x86/boot: Explicitly include realmode.h to handle RM reservations Sean Christopherson
2020-01-19 10:40 ` [tip: core/headers] " tip-bot2 for Sean Christopherson
2019-11-26 16:54 ` [PATCH v2 03/12] x86/ftrace: Explicitly include vmalloc.h for set_vm_flush_reset_perms() Sean Christopherson
2020-01-19 10:40 ` [tip: core/headers] " tip-bot2 for Sean Christopherson
2019-11-26 16:54 ` [PATCH v2 04/12] x86/kprobes: " Sean Christopherson
2020-01-19 10:40 ` [tip: core/headers] " tip-bot2 for Sean Christopherson
2019-11-26 16:54 ` [PATCH v2 05/12] perf/x86/intel: Explicitly include asm/io.h to use virt_to_phys() Sean Christopherson
2020-01-19 10:40 ` [tip: core/headers] " tip-bot2 for Sean Christopherson
2019-11-26 16:54 ` [PATCH v2 06/12] efi/capsule-loader: Explicitly include linux/io.h for page_to_phys() Sean Christopherson
2020-01-19 10:40 ` [tip: core/headers] " tip-bot2 for Sean Christopherson
2019-11-26 16:54 ` [PATCH v2 07/12] virt: vbox: Explicitly include linux/io.h to pick up various defs Sean Christopherson
2020-01-19 10:40 ` [tip: core/headers] " tip-bot2 for Sean Christopherson
2019-11-26 16:54 ` [PATCH v2 08/12] vmw_balloon: Explicitly include linux/io.h for virt_to_phys() Sean Christopherson
2020-01-19 10:40 ` [tip: core/headers] " tip-bot2 for Sean Christopherson
2019-11-26 16:54 ` [PATCH v2 09/12] ASoC: Intel: Skylake: " Sean Christopherson
2020-01-19 10:40 ` [tip: core/headers] " tip-bot2 for Sean Christopherson
2019-11-26 16:54 ` [PATCH v2 10/12] x86/ACPI/sleep: Remove an unnecessary include of asm/realmode.h Sean Christopherson
2020-01-19 10:40 ` [tip: core/headers] " tip-bot2 for Sean Christopherson
2019-11-26 16:54 ` [PATCH v2 11/12] ACPI/sleep: Convert acpi_wakeup_address into a function Sean Christopherson
2019-11-27 21:30 ` Pavel Machek
2020-01-19 10:40 ` [tip: core/headers] " tip-bot2 for Sean Christopherson
2019-11-26 16:54 ` [PATCH v2 12/12] x86/ACPI/sleep: Move acpi_get_wakeup_address() into sleep.c, remove <asm/realmode.h> from <asm/acpi.h> Sean Christopherson
2020-01-19 10:40 ` tip-bot2 for Sean Christopherson [this message]
2019-11-27 7:20 ` [PATCH v2 00/12] treewide: break dependencies on x86's RM header Ingo Molnar
2019-11-27 14:47 ` Sean Christopherson
2019-11-27 17:25 ` Ingo Molnar
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=157943044462.396.13192528326198737540.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=sean.j.christopherson@intel.com \
--cc=x86@kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®