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] ACPI/sleep: Convert acpi_wakeup_address into a function
Date: Sun, 19 Jan 2020 10:40:45 -0000 [thread overview]
Message-ID: <157943044502.396.15306490913678776890.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20191126165417.22423-12-sean.j.christopherson@intel.com>
The following commit has been merged into the core/headers branch of tip:
Commit-ID: 8c53b318b222eff55d2900b554094a099b1a30f6
Gitweb: https://git.kernel.org/tip/8c53b318b222eff55d2900b554094a099b1a30f6
Author: Sean Christopherson <sean.j.christopherson@intel.com>
AuthorDate: Tue, 26 Nov 2019 08:54:16 -08:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Tue, 10 Dec 2019 10:15:48 +01:00
ACPI/sleep: Convert acpi_wakeup_address into a function
Convert acpi_wakeup_address from a raw variable into a function so that
x86 can wrap its dereference of the real mode boot header in a function
instead of broadcasting it to the world via a #define. This sets the
stage for a future patch to move x86's definition of the new function,
acpi_get_wakeup_address(), out of asm/acpi.h and thus break acpi.h's
dependency on asm/realmode.h.
No functional change intended.
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Link: https://lkml.kernel.org/r/20191126165417.22423-12-sean.j.christopherson@intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/ia64/include/asm/acpi.h | 5 ++++-
arch/ia64/kernel/acpi.c | 2 --
arch/x86/include/asm/acpi.h | 5 ++++-
drivers/acpi/sleep.c | 3 +++
4 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/arch/ia64/include/asm/acpi.h b/arch/ia64/include/asm/acpi.h
index f886d4d..b66ba90 100644
--- a/arch/ia64/include/asm/acpi.h
+++ b/arch/ia64/include/asm/acpi.h
@@ -38,7 +38,10 @@ int acpi_gsi_to_irq (u32 gsi, unsigned int *irq);
/* Low-level suspend routine. */
extern int acpi_suspend_lowlevel(void);
-extern unsigned long acpi_wakeup_address;
+static inline unsigned long acpi_get_wakeup_address(void)
+{
+ return 0;
+}
/*
* Record the cpei override flag and current logical cpu. This is
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index 70d1587..a563652 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -42,8 +42,6 @@ int acpi_lapic;
unsigned int acpi_cpei_override;
unsigned int acpi_cpei_phys_cpuid;
-unsigned long acpi_wakeup_address = 0;
-
#define ACPI_MAX_PLATFORM_INTERRUPTS 256
/* Array to record platform interrupt vectors for generic interrupt routing. */
diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h
index bc9693c..23ffafd 100644
--- a/arch/x86/include/asm/acpi.h
+++ b/arch/x86/include/asm/acpi.h
@@ -62,7 +62,10 @@ static inline void acpi_disable_pci(void)
extern int (*acpi_suspend_lowlevel)(void);
/* Physical address to resume after wakeup */
-#define acpi_wakeup_address ((unsigned long)(real_mode_header->wakeup_start))
+static inline unsigned long acpi_get_wakeup_address(void)
+{
+ return ((unsigned long)(real_mode_header->wakeup_start));
+}
/*
* Check if the CPU can handle C2 and deeper
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 6747a27..4398806 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -61,8 +61,11 @@ static struct notifier_block tts_notifier = {
static int acpi_sleep_prepare(u32 acpi_state)
{
#ifdef CONFIG_ACPI_SLEEP
+ unsigned long acpi_wakeup_address;
+
/* do we have a wakeup address for S2 and S3? */
if (acpi_state == ACPI_STATE_S3) {
+ acpi_wakeup_address = acpi_get_wakeup_address();
if (!acpi_wakeup_address)
return -EFAULT;
acpi_set_waking_vector(acpi_wakeup_address);
next prev parent reply other threads:[~2020-01-19 10:41 UTC|newest]
Thread overview: 30+ 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-bot2 for Sean Christopherson [this message]
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: core/headers] " tip-bot2 for Sean Christopherson
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
-- strict thread matches above, loose matches on Subject: below --
2019-11-19 0:21 [PATCH 11/12] ACPI/sleep: Convert acpi_wakeup_address into a function Sean Christopherson
2019-11-26 8:00 ` [tip: core/headers] " tip-bot2 for Sean Christopherson
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=157943044502.396.15306490913678776890.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®