Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1372963
| From | "Luis R. Rodriguez" <mcgrof@kernel.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v4 06/14] x86/init: use a platform legacy quirk for ebda |
| Date | 2016-04-07 02:10 +0200 |
| Message-ID | <rl5Gi-3Ao-5@gated-at.bofh.it> (permalink) |
| References | <rl5Gh-3Ao-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
This replaces the paravirt_enabled() check with a
proper x86 legacy platform quirk.
Signed-off-by: Luis R. Rodriguez <mcgrof@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 27d5c3fe5198..f3f81122ae3b 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 992f442ca155..afe65dffee80 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 1b114ac5996f..a871b6b0e35f 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:
--
2.7.2
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v4 00/14] x86: remove paravirt_enabled "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-07 02:10 +0200
[PATCH v4 06/14] x86/init: use a platform legacy quirk for ebda "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-07 02:10 +0200
Re: [Xen-devel] [PATCH v4 06/14] x86/init: use a platform legacy quirk for ebda David Vrabel <david.vrabel@citrix.com> - 2016-04-07 11:50 +0200
Re: [Xen-devel] [PATCH v4 06/14] x86/init: use a platform legacy quirk for ebda "Luis R. Rodriguez" <mcgrof@suse.com> - 2016-04-07 23:10 +0200
[PATCH v4 10/14] x86/cpu/intel: remove not needed paravirt_enabled() for f00f work around "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-07 02:10 +0200
[PATCH v4 14/14] x86/paravirt: remove paravirt_enabled() "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-07 02:10 +0200
[PATCH v4 13/14] x86/init: rename ebda code file "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-07 02:10 +0200
[PATCH v4 04/14] x86/rtc: replace paravirt rtc check with platform legacy quirk "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-07 02:10 +0200
Re: [Xen-devel] [PATCH v4 04/14] x86/rtc: replace paravirt rtc check with platform legacy quirk David Vrabel <david.vrabel@citrix.com> - 2016-04-07 11:50 +0200
Re: [Xen-devel] [PATCH v4 04/14] x86/rtc: replace paravirt rtc check with platform legacy quirk "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-14 01:10 +0200
Re: [PATCH v4 04/14] x86/rtc: replace paravirt rtc check with platform legacy quirk Boris Ostrovsky <boris.ostrovsky@oracle.com> - 2016-04-07 15:00 +0200
Re: [PATCH v4 04/14] x86/rtc: replace paravirt rtc check with platform legacy quirk "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-08 02:40 +0200
Re: [PATCH v4 04/14] x86/rtc: replace paravirt rtc check with platform legacy quirk Juergen Gross <jgross@suse.com> - 2016-04-08 07:20 +0200
Re: [PATCH v4 04/14] x86/rtc: replace paravirt rtc check with platform legacy quirk Juergen Gross <jgross@suse.com> - 2016-04-08 08:40 +0200
Re: [PATCH v4 04/14] x86/rtc: replace paravirt rtc check with platform legacy quirk "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-08 09:00 +0200
Re: [PATCH v4 04/14] x86/rtc: replace paravirt rtc check with platform legacy quirk Juergen Gross <jgross@suse.com> - 2016-04-08 09:20 +0200
Re: [PATCH v4 04/14] x86/rtc: replace paravirt rtc check with platform legacy quirk "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-08 09:40 +0200
Re: [PATCH v4 04/14] x86/rtc: replace paravirt rtc check with platform legacy quirk Juergen Gross <jgross@suse.com> - 2016-04-08 10:10 +0200
Re: [PATCH v4 04/14] x86/rtc: replace paravirt rtc check with platform legacy quirk Boris Ostrovsky <boris.ostrovsky@oracle.com> - 2016-04-08 14:40 +0200
Re: [PATCH v4 04/14] x86/rtc: replace paravirt rtc check with platform legacy quirk "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-08 20:50 +0200
Re: [PATCH v4 04/14] x86/rtc: replace paravirt rtc check with platform legacy quirk "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-08 08:40 +0200
Re: [PATCH v4 04/14] x86/rtc: replace paravirt rtc check with platform legacy quirk Boris Ostrovsky <boris.ostrovsky@oracle.com> - 2016-04-08 14:30 +0200
[PATCH v4 07/14] tools/lguest: force disable tboot and apm "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-07 02:10 +0200
Re: [PATCH v4 07/14] tools/lguest: force disable tboot and apm Rusty Russell <rusty@rustcorp.com.au> - 2016-04-11 06:00 +0200
[PATCH v4 03/14] tools/lguest: make lguest launcher use X86_SUBARCH_LGUEST explicitly "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-07 02:10 +0200
[PATCH v4 08/14] apm32: remove paravirt_enabled() use "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-07 02:10 +0200
Re: [PATCH v4 08/14] apm32: remove paravirt_enabled() use Boris Ostrovsky <boris.ostrovsky@oracle.com> - 2016-04-07 15:10 +0200
Re: [PATCH v4 08/14] apm32: remove paravirt_enabled() use "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-08 00:40 +0200
[PATCH v4 12/14] x86, ACPI: parse ACPI_FADT_LEGACY_DEVICES "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-07 02:10 +0200
[PATCH v4 01/14] x86/boot: enumerate documentation for the x86 hardware_subarch "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-07 02:10 +0200
Re: [PATCH v4 01/14] x86/boot: enumerate documentation for the x86 hardware_subarch Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2016-04-07 13:30 +0200
Re: [PATCH v4 01/14] x86/boot: enumerate documentation for the x86 hardware_subarch "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-08 00:40 +0200
[PATCH v4 09/14] x86/tboot: remove paravirt_enabled() "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-07 02:10 +0200
[PATCH v4 02/14] x86/xen: use X86_SUBARCH_XEN for PV guest boots "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-07 02:20 +0200
Re: [Xen-devel] [PATCH v4 02/14] x86/xen: use X86_SUBARCH_XEN for PV guest boots David Vrabel <david.vrabel@citrix.com> - 2016-04-07 11:50 +0200
[PATCH v4 05/14] x86, ACPI: move ACPI_FADT_NO_CMOS_RTC check to ACPI boot code "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-07 02:20 +0200
Re: [Xen-devel] [PATCH v4 00/14] x86: remove paravirt_enabled Juergen Gross <jgross@suse.com> - 2016-04-07 15:30 +0200
[PATCH v4 13/14] x86/init: rename ebda code file "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-07 23:40 +0200
Re: [PATCH v4 00/14] x86: remove paravirt_enabled "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-08 03:20 +0200
Re: [PATCH v4 00/14] x86: remove paravirt_enabled Borislav Petkov <bp@alien8.de> - 2016-04-08 12:30 +0200
csiph-web