From: "tip-bot for Luis R. Rodriguez" <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: dvlasenk@redhat.com, bp@alien8.de, peterz@infradead.org,
hpa@zytor.com, brgerst@gmail.com, mcgrof@kernel.org,
torvalds@linux-foundation.org, tglx@linutronix.de,
mingo@kernel.org, linux-kernel@vger.kernel.org,
luto@amacapital.net
Subject: [tip:x86/boot] x86/init: Use a platform legacy quirk for EBDA
Date: Fri, 22 Apr 2016 02:51:06 -0700 [thread overview]
Message-ID: <tip-1330e3bc544a1951d81b7f3c7d4cecf77d906f67@git.kernel.org> (raw)
In-Reply-To: <1460592286-300-7-git-send-email-mcgrof@kernel.org>
Commit-ID: 1330e3bc544a1951d81b7f3c7d4cecf77d906f67
Gitweb: http://git.kernel.org/tip/1330e3bc544a1951d81b7f3c7d4cecf77d906f67
Author: Luis R. Rodriguez <mcgrof@kernel.org>
AuthorDate: Wed, 13 Apr 2016 17:04:36 -0700
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Fri, 22 Apr 2016 10:29:02 +0200
x86/init: Use a platform legacy quirk for EBDA
This replaces the paravirt_enabled() check with a
proper x86 legacy platform quirk.
As per 0-day, this bumps the vmlinux size using i386-tinyconfig as
follows:
TOTAL TEXT init.text x86_early_init_platform_quirks()
+39 +35 +35 +25
That's a 4 byte total overhead, the rest is all cleared out
upon init as its all __init text.
v2: document 0-day vmlinux size impact
Signed-off-by: Luis R. Rodriguez <mcgrof@kernel.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: andrew.cooper3@citrix.com
Cc: andriy.shevchenko@linux.intel.com
Cc: bigeasy@linutronix.de
Cc: boris.ostrovsky@oracle.com
Cc: david.vrabel@citrix.com
Cc: ffainelli@freebox.fr
Cc: george.dunlap@citrix.com
Cc: glin@suse.com
Cc: jgross@suse.com
Cc: jlee@suse.com
Cc: josh@joshtriplett.org
Cc: julien.grall@linaro.org
Cc: konrad.wilk@oracle.com
Cc: kozerkov@parallels.com
Cc: lenb@kernel.org
Cc: lguest@lists.ozlabs.org
Cc: linux-acpi@vger.kernel.org
Cc: lv.zheng@intel.com
Cc: matt@codeblueprint.co.uk
Cc: mbizon@freebox.fr
Cc: rjw@rjwysocki.net
Cc: robert.moore@intel.com
Cc: rusty@rustcorp.com.au
Cc: tiwai@suse.de
Cc: toshi.kani@hp.com
Cc: xen-devel@lists.xensource.com
Link: http://lkml.kernel.org/r/1460592286-300-7-git-send-email-mcgrof@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/include/asm/x86_init.h | 3 +++
arch/x86/kernel/head.c | 2 +-
arch/x86/kernel/platform-quirks.c | 4 ++++
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
index 8bb8c1a..89d9d57 100644
--- a/arch/x86/include/asm/x86_init.h
+++ b/arch/x86/include/asm/x86_init.h
@@ -145,9 +145,12 @@ struct timespec;
* struct x86_legacy_features - legacy x86 features
*
* @rtc: this device has a CMOS real-time clock present
+ * @ebda_search: it's safe to search for the EBDA signature in the hardware's
+ * low RAM
*/
struct x86_legacy_features {
int rtc;
+ int ebda_search;
};
/**
diff --git a/arch/x86/kernel/head.c b/arch/x86/kernel/head.c
index 992f442..afe65df 100644
--- a/arch/x86/kernel/head.c
+++ b/arch/x86/kernel/head.c
@@ -38,7 +38,7 @@ void __init reserve_ebda_region(void)
* that the paravirt case can handle memory setup
* correctly, without our help.
*/
- if (paravirt_enabled())
+ if (!x86_platform.legacy.ebda_search)
return;
/* end of low (conventional) memory */
diff --git a/arch/x86/kernel/platform-quirks.c b/arch/x86/kernel/platform-quirks.c
index 021a5f9..01b1597 100644
--- a/arch/x86/kernel/platform-quirks.c
+++ b/arch/x86/kernel/platform-quirks.c
@@ -7,8 +7,12 @@
void __init x86_early_init_platform_quirks(void)
{
x86_platform.legacy.rtc = 1;
+ x86_platform.legacy.ebda_search = 0;
switch (boot_params.hdr.hardware_subarch) {
+ case X86_SUBARCH_PC:
+ x86_platform.legacy.ebda_search = 1;
+ break;
case X86_SUBARCH_XEN:
case X86_SUBARCH_LGUEST:
case X86_SUBARCH_INTEL_MID:
next prev parent reply other threads:[~2016-04-22 9:52 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-14 0:04 [PATCH v6 00/16] x86: remove paravirt_enabled() Luis R. Rodriguez
2016-04-14 0:04 ` [PATCH v6 01/16] x86/boot: enumerate documentation for the x86 hardware_subarch Luis R. Rodriguez
2016-04-22 9:49 ` [tip:x86/boot] x86/boot: Enumerate " tip-bot for Luis R. Rodriguez
2016-04-14 0:04 ` [PATCH v6 02/16] x86/xen: use X86_SUBARCH_XEN for PV guest boots Luis R. Rodriguez
2016-04-22 9:49 ` [tip:x86/boot] x86/xen: Use " tip-bot for Luis R. Rodriguez
2016-04-14 0:04 ` [PATCH v6 03/16] tools/lguest: make lguest launcher use X86_SUBARCH_LGUEST explicitly Luis R. Rodriguez
2016-04-22 9:49 ` [tip:x86/boot] tools/lguest: Make " tip-bot for Luis R. Rodriguez
2016-04-14 0:04 ` [PATCH v6 04/16] x86/rtc: replace paravirt rtc check with platform legacy quirk Luis R. Rodriguez
2016-04-14 4:28 ` Juergen Gross
2016-04-22 9:50 ` [tip:x86/boot] x86/rtc: Replace " tip-bot for Luis R. Rodriguez
2024-04-03 15:34 ` [tip: x86/cleanups] x86/rtc: Remove unused intel-mid.h tip-bot2 for Andy Shevchenko
2016-04-14 0:04 ` [PATCH v6 05/16] x86, ACPI: move ACPI_FADT_NO_CMOS_RTC check to ACPI boot code Luis R. Rodriguez
2016-04-22 9:50 ` [tip:x86/boot] x86/ACPI: Move " tip-bot for Luis R. Rodriguez
2016-04-14 0:04 ` [PATCH v6 06/16] x86/init: use a platform legacy quirk for ebda Luis R. Rodriguez
2016-04-22 9:51 ` tip-bot for Luis R. Rodriguez [this message]
2016-04-14 0:04 ` [PATCH v6 07/16] tools/lguest: force disable tboot and apm Luis R. Rodriguez
2016-04-22 9:51 ` [tip:x86/boot] tools/lguest: Force disable tboot and APM tip-bot for Luis R. Rodriguez
2016-04-14 0:04 ` [PATCH v6 08/16] apm32: remove paravirt_enabled() use Luis R. Rodriguez
2016-04-22 9:51 ` [tip:x86/boot] x86/apm32: Remove " tip-bot for Luis R. Rodriguez
2016-04-14 0:04 ` [PATCH v6 09/16] x86/tboot: remove paravirt_enabled() Luis R. Rodriguez
2016-04-22 9:52 ` [tip:x86/boot] x86/tboot: Remove paravirt_enabled() use tip-bot for Luis R. Rodriguez
2016-04-14 0:04 ` [PATCH v6 10/16] x86/cpu/intel: remove not needed paravirt_enabled() for f00f work around Luis R. Rodriguez
2016-04-22 9:52 ` [tip:x86/boot] x86/cpu/intel: Remove not needed paravirt_enabled() use for F00F " tip-bot for Luis R. Rodriguez
2016-04-14 0:04 ` [PATCH v6 11/16] pnpbios: replace paravirt_enabled() check with legacy device check Luis R. Rodriguez
2016-04-22 9:53 ` [tip:x86/boot] x86, drivers/pnpbios: Replace " tip-bot for Luis R. Rodriguez
2016-04-14 0:04 ` [PATCH v6 12/16] x86, ACPI: parse ACPI_FADT_LEGACY_DEVICES Luis R. Rodriguez
2016-04-22 9:53 ` [tip:x86/boot] x86/ACPI: Parse ACPI_FADT_LEGACY_DEVICES tip-bot for Luis R. Rodriguez
2016-04-14 0:04 ` [PATCH v6 13/16] x86/init: rename ebda code file Luis R. Rodriguez
2016-04-22 9:53 ` [tip:x86/boot] x86/init: Rename EBDA " tip-bot for Luis R. Rodriguez
2016-04-14 0:04 ` [PATCH v6 14/16] x86/paravirt: remove paravirt_enabled() Luis R. Rodriguez
2016-04-22 9:54 ` [tip:x86/boot] x86/paravirt: Remove paravirt_enabled() tip-bot for Luis R. Rodriguez
2016-04-14 0:04 ` [PATCH v6 15/16] x86/init: disable pnpbios for X86_SUBARCH_INTEL_MID Luis R. Rodriguez
2016-04-22 9:54 ` [tip:x86/boot] x86/init: Disable " tip-bot for Luis R. Rodriguez
2016-04-14 0:04 ` [PATCH v6 16/16] x86/init: disable pnpbios and rtc for X86_SUBARCH_CE4100 Luis R. Rodriguez
2016-04-22 9:54 ` [tip:x86/boot] x86/init: Disable " tip-bot for Luis R. Rodriguez
2016-04-14 0:13 ` [PATCH v6 05/16] x86, ACPI: move ACPI_FADT_NO_CMOS_RTC check to ACPI boot code Luis R. Rodriguez
2016-04-14 0:13 ` [PATCH v6 07/16] tools/lguest: force disable tboot and apm Luis R. Rodriguez
2016-04-14 0:13 ` [PATCH v6 12/16] x86, ACPI: parse ACPI_FADT_LEGACY_DEVICES Luis R. Rodriguez
2016-04-14 0:17 ` [PATCH v6 05/16] x86, ACPI: move ACPI_FADT_NO_CMOS_RTC check to ACPI boot code Luis R. Rodriguez
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-1330e3bc544a1951d81b7f3c7d4cecf77d906f67@git.kernel.org \
--to=tipbot@zytor.com \
--cc=bp@alien8.de \
--cc=brgerst@gmail.com \
--cc=dvlasenk@redhat.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=mcgrof@kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome