From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: Sean Christopherson <sean.j.christopherson@intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>,
Cezary Rojewski <cezary.rojewski@intel.com>,
linux-efi@vger.kernel.org, linux-ia64@vger.kernel.org,
Fenghua Yu <fenghua.yu@intel.com>,
Peter Zijlstra <peterz@infradead.org>,
Jie Yang <yang.jie@linux.intel.com>,
alsa-devel@alsa-project.org,
Liam Girdwood <liam.r.girdwood@linux.intel.com>,
Nadav Amit <namit@vmware.com>, Pavel Machek <pavel@ucw.cz>,
"H. Peter Anvin" <hpa@zytor.com>, Jiri Olsa <jolsa@redhat.com>,
Ard Biesheuvel <ardb@kernel.org>,
linux-acpi@vger.kernel.org, x86@kernel.org,
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
"VMware, Inc." <pv-drivers@vmware.com>,
Ingo Molnar <mingo@redhat.com>,
Darren Hart <dvhart@infradead.org>,
Len Brown <len.brown@intel.com>, Arnd Bergmann <arnd@arndb.de>,
linux-pm@vger.kernel.org,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Hans de Goede <hdegoede@redhat.com>,
Mark Brown <broonie@kernel.org>, Borislav Petkov <bp@alien8.de>,
Steven Rostedt <rostedt@goodmis.org>,
Namhyung Kim <namhyung@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
platform-driver-x86@vger.kernel.org,
Tony Luck <tony.luck@intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Takashi Iwai <tiwai@suse.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
linux-kernel@vger.kernel.org,
Andy Shevchenko <andy@infradead.org>
Subject: Re: [alsa-devel] [PATCH 12/12] x86/ACPI/sleep: Move acpi_wakeup_address() definition into sleep.c
Date: Wed, 20 Nov 2019 12:00:48 +0100 [thread overview]
Message-ID: <1707133.c5szpGgj5A@kreacher> (raw)
In-Reply-To: <20191119002121.4107-13-sean.j.christopherson@intel.com>
On Tuesday, November 19, 2019 1:21:21 AM CET Sean Christopherson wrote:
> Move the definition of acpi_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.
>
> Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> ---
> 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 57788ec6fa82..0cae3f773d44 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_wakeup_address(void)
> -{
> - return ((unsigned long)(real_mode_header->wakeup_start));
> -}
> +unsigned long acpi_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 ca13851f0570..44d3fb1a1de3 100644
> --- a/arch/x86/kernel/acpi/sleep.c
> +++ b/arch/x86/kernel/acpi/sleep.c
> @@ -26,6 +26,17 @@ unsigned long acpi_realmode_flags;
> static char temp_stack[4096];
> #endif
>
> +/**
> + * acpi_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_wakeup_address(void)
> +{
> + return ((unsigned long)(real_mode_header->wakeup_start));
> +}
> +
> /**
> * x86_acpi_enter_sleep_state - enter sleep state
> * @state: Sleep state to enter.
>
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
next prev parent reply other threads:[~2019-11-20 11:20 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-19 0:21 [alsa-devel] [PATCH 00/12] treewide: break dependencies on x86's RM header Sean Christopherson
2019-11-19 0:21 ` [alsa-devel] [PATCH 01/12] x86/efi: Explicitly include realmode.h to handle RM trampoline quirk Sean Christopherson
2019-11-19 0:21 ` [alsa-devel] [PATCH 02/12] x86/boot: Explicitly include realmode.h to handle RM reservations Sean Christopherson
2019-11-19 0:21 ` [alsa-devel] [PATCH 03/12] x86/ftrace: Explicitly include vmalloc.h for set_vm_flush_reset_perms() Sean Christopherson
2019-11-22 2:11 ` Steven Rostedt
2019-11-19 0:21 ` [alsa-devel] [PATCH 04/12] x86/kprobes: " Sean Christopherson
2019-11-22 2:12 ` Steven Rostedt
2019-11-19 0:21 ` [alsa-devel] [PATCH 05/12] perf/x86/intel: Explicitly include asm/io.h to use virt_to_phys() Sean Christopherson
2019-11-19 0:21 ` [alsa-devel] [PATCH 06/12] efi/capsule-loader: Explicitly include linux/io.h for page_to_phys() Sean Christopherson
2019-11-19 0:21 ` [alsa-devel] [PATCH 07/12] virt: vbox: Explicitly include linux/io.h to pick up various defs Sean Christopherson
2019-11-19 0:21 ` [alsa-devel] [PATCH 08/12] vmw_balloon: Explicitly include linux/io.h for virt_to_phys() Sean Christopherson
2019-11-19 0:21 ` [alsa-devel] [PATCH 09/12] ASoC: Intel: Skylake: " Sean Christopherson
2019-11-19 12:00 ` Mark Brown
2019-11-19 0:21 ` [alsa-devel] [PATCH 10/12] x86/ACPI/sleep: Remove an unnecessary include of asm/realmode.h Sean Christopherson
2019-11-20 10:59 ` Rafael J. Wysocki
2019-11-19 0:21 ` [alsa-devel] [PATCH 11/12] ACPI/sleep: Convert acpi_wakeup_address into a function Sean Christopherson
2019-11-20 10:58 ` Rafael J. Wysocki
2019-11-25 10:48 ` Pavel Machek
2019-11-25 17:00 ` Sean Christopherson
2019-11-26 11:16 ` Ingo Molnar
2019-11-26 11:25 ` Ingo Molnar
2019-11-19 0:21 ` [alsa-devel] [PATCH 12/12] x86/ACPI/sleep: Move acpi_wakeup_address() definition into sleep.c Sean Christopherson
2019-11-20 11:00 ` Rafael J. Wysocki [this message]
2019-11-19 11:10 ` [alsa-devel] [PATCH 00/12] treewide: break dependencies on x86's RM header Ingo Molnar
2019-11-19 12:06 ` [alsa-devel] [PATCH] x86/platform/intel/quark: Explicitly include linux/io.h for virt_to_phys() Ingo Molnar
2019-11-19 12:38 ` Andy Shevchenko
2019-11-19 12:09 ` [alsa-devel] [PATCH 00/12] treewide: break dependencies on x86's RM header Ard Biesheuvel
2019-11-19 12:22 ` Ingo Molnar
2019-11-19 12:33 ` Ard Biesheuvel
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=1707133.c5szpGgj5A@kreacher \
--to=rjw@rjwysocki.net \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=andy@infradead.org \
--cc=ardb@kernel.org \
--cc=arnd@arndb.de \
--cc=bp@alien8.de \
--cc=broonie@kernel.org \
--cc=cezary.rojewski@intel.com \
--cc=dvhart@infradead.org \
--cc=fenghua.yu@intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=hdegoede@redhat.com \
--cc=hpa@zytor.com \
--cc=jolsa@redhat.com \
--cc=len.brown@intel.com \
--cc=liam.r.girdwood@linux.intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-efi@vger.kernel.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=namit@vmware.com \
--cc=pavel@ucw.cz \
--cc=peterz@infradead.org \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=platform-driver-x86@vger.kernel.org \
--cc=pv-drivers@vmware.com \
--cc=rostedt@goodmis.org \
--cc=sean.j.christopherson@intel.com \
--cc=tglx@linutronix.de \
--cc=tiwai@suse.com \
--cc=tony.luck@intel.com \
--cc=x86@kernel.org \
--cc=yang.jie@linux.intel.com \
/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;
as well as URLs for NNTP newsgroup(s).