From: "Luis R. Rodriguez" <mcgrof@kernel.org> To: bp@alien8.de, hpa@zytor.com, tglx@linutronix.de, mingo@redhat.com, rusty@rustcorp.com.au Cc: x86@kernel.org, linux-kernel@vger.kernel.org, luto@amacapital.net, boris.ostrovsky@oracle.com, david.vrabel@citrix.com, konrad.wilk@oracle.com, xen-devel@lists.xensource.com, lguest@lists.ozlabs.org, andriy.shevchenko@linux.intel.com, jlee@suse.com, glin@suse.com, matt@codeblueprint.co.uk, andrew.cooper3@citrix.com, "Luis R. Rodriguez" <mcgrof@kernel.org> Subject: [PATCH v4 06/14] x86/init: use a platform legacy quirk for ebda Date: Wed, 6 Apr 2016 17:06:26 -0700 [thread overview] Message-ID: <1459987594-5434-7-git-send-email-mcgrof@kernel.org> (raw) In-Reply-To: <1459987594-5434-1-git-send-email-mcgrof@kernel.org> 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
WARNING: multiple messages have this Message-ID (diff)
From: "Luis R. Rodriguez" <mcgrof@kernel.org> To: bp@alien8.de, hpa@zytor.com, tglx@linutronix.de, mingo@redhat.com, rusty@rustcorp.com.au Cc: xen-devel@lists.xensource.com, matt@codeblueprint.co.uk, andrew.cooper3@citrix.com, x86@kernel.org, linux-kernel@vger.kernel.org, luto@amacapital.net, jlee@suse.com, "Luis R. Rodriguez" <mcgrof@kernel.org>, lguest@lists.ozlabs.org, glin@suse.com, david.vrabel@citrix.com, boris.ostrovsky@oracle.com, andriy.shevchenko@linux.intel.com Subject: [PATCH v4 06/14] x86/init: use a platform legacy quirk for ebda Date: Wed, 6 Apr 2016 17:06:26 -0700 [thread overview] Message-ID: <1459987594-5434-7-git-send-email-mcgrof@kernel.org> (raw) In-Reply-To: <1459987594-5434-1-git-send-email-mcgrof@kernel.org> 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 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-04-07 0:09 UTC|newest] Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-04-07 0:06 [PATCH v4 00/14] x86: remove paravirt_enabled Luis R. Rodriguez 2016-04-07 0:06 ` [PATCH v4 01/14] x86/boot: enumerate documentation for the x86 hardware_subarch Luis R. Rodriguez 2016-04-07 11:25 ` Andy Shevchenko 2016-04-07 22:36 ` Luis R. Rodriguez 2016-04-07 22:36 ` Luis R. Rodriguez 2016-04-07 0:06 ` [PATCH v4 02/14] x86/xen: use X86_SUBARCH_XEN for PV guest boots Luis R. Rodriguez 2016-04-07 0:06 ` Luis R. Rodriguez 2016-04-07 9:41 ` [Xen-devel] " David Vrabel 2016-04-07 9:41 ` David Vrabel 2016-04-07 0:06 ` [PATCH v4 03/14] tools/lguest: make lguest launcher use X86_SUBARCH_LGUEST explicitly Luis R. Rodriguez 2016-04-07 0:06 ` [PATCH v4 04/14] x86/rtc: replace paravirt rtc check with platform legacy quirk Luis R. Rodriguez 2016-04-07 0:06 ` Luis R. Rodriguez 2016-04-07 9:42 ` [Xen-devel] " David Vrabel 2016-04-07 9:42 ` David Vrabel 2016-04-13 23:08 ` Luis R. Rodriguez 2016-04-07 12:55 ` Boris Ostrovsky 2016-04-07 12:55 ` Boris Ostrovsky 2016-04-08 0:32 ` Luis R. Rodriguez 2016-04-08 5:18 ` Juergen Gross 2016-04-08 6:29 ` Luis R. Rodriguez 2016-04-08 6:29 ` Luis R. Rodriguez 2016-04-08 6:38 ` Juergen Gross 2016-04-08 6:38 ` Juergen Gross 2016-04-08 6:56 ` Luis R. Rodriguez 2016-04-08 6:56 ` Luis R. Rodriguez 2016-04-08 7:13 ` Juergen Gross 2016-04-08 7:13 ` Juergen Gross 2016-04-08 7:36 ` Luis R. Rodriguez 2016-04-08 7:36 ` Luis R. Rodriguez 2016-04-08 7:59 ` Juergen Gross 2016-04-08 7:59 ` Juergen Gross 2016-04-08 12:37 ` Boris Ostrovsky 2016-04-08 12:37 ` Boris Ostrovsky 2016-04-08 18:45 ` Luis R. Rodriguez 2016-04-08 18:45 ` Luis R. Rodriguez 2016-04-08 12:25 ` Boris Ostrovsky 2016-04-08 12:25 ` Boris Ostrovsky 2016-04-07 0:06 ` [PATCH v4 05/14] x86, ACPI: move ACPI_FADT_NO_CMOS_RTC check to ACPI boot code Luis R. Rodriguez 2016-04-07 0:06 ` Luis R. Rodriguez 2016-04-07 0:06 ` Luis R. Rodriguez [this message] 2016-04-07 0:06 ` [PATCH v4 06/14] x86/init: use a platform legacy quirk for ebda Luis R. Rodriguez 2016-04-07 9:44 ` [Xen-devel] " David Vrabel 2016-04-07 9:44 ` David Vrabel 2016-04-07 21:07 ` Luis R. Rodriguez 2016-04-07 0:06 ` [PATCH v4 07/14] tools/lguest: force disable tboot and apm Luis R. Rodriguez 2016-04-11 3:32 ` Rusty Russell 2016-04-11 3:32 ` Rusty Russell 2016-04-07 0:06 ` [PATCH v4 08/14] apm32: remove paravirt_enabled() use Luis R. Rodriguez 2016-04-07 0:06 ` Luis R. Rodriguez 2016-04-07 13:08 ` Boris Ostrovsky 2016-04-07 22:31 ` Luis R. Rodriguez 2016-04-07 0:06 ` [PATCH v4 09/14] x86/tboot: remove paravirt_enabled() Luis R. Rodriguez 2016-04-07 0:06 ` [PATCH v4 10/14] x86/cpu/intel: remove not needed paravirt_enabled() for f00f work around Luis R. Rodriguez 2016-04-07 0:06 ` Luis R. Rodriguez 2016-04-07 0:06 ` [PATCH v4 11/14] pnpbios: replace paravirt_enabled() check with legacy device check Luis R. Rodriguez 2016-04-07 9:46 ` [Xen-devel] " David Vrabel 2016-04-07 9:46 ` David Vrabel 2016-04-07 21:42 ` Luis R. Rodriguez 2016-04-07 0:06 ` [PATCH v4 12/14] x86, ACPI: parse ACPI_FADT_LEGACY_DEVICES Luis R. Rodriguez 2016-04-07 0:06 ` [PATCH v4 13/14] x86/init: rename ebda code file Luis R. Rodriguez 2016-04-07 0:06 ` Luis R. Rodriguez 2016-04-07 0:06 ` [PATCH v4 14/14] x86/paravirt: remove paravirt_enabled() Luis R. Rodriguez 2016-04-07 13:24 ` [Xen-devel] [PATCH v4 00/14] x86: remove paravirt_enabled Juergen Gross 2016-04-07 21:31 ` [PATCH v4 13/14] x86/init: rename ebda code file Luis R. Rodriguez 2016-04-08 1:14 ` [PATCH v4 00/14] x86: remove paravirt_enabled Luis R. Rodriguez 2016-04-08 10:23 ` Borislav Petkov
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=1459987594-5434-7-git-send-email-mcgrof@kernel.org \ --to=mcgrof@kernel.org \ --cc=andrew.cooper3@citrix.com \ --cc=andriy.shevchenko@linux.intel.com \ --cc=boris.ostrovsky@oracle.com \ --cc=bp@alien8.de \ --cc=david.vrabel@citrix.com \ --cc=glin@suse.com \ --cc=hpa@zytor.com \ --cc=jlee@suse.com \ --cc=konrad.wilk@oracle.com \ --cc=lguest@lists.ozlabs.org \ --cc=linux-kernel@vger.kernel.org \ --cc=luto@amacapital.net \ --cc=matt@codeblueprint.co.uk \ --cc=mingo@redhat.com \ --cc=rusty@rustcorp.com.au \ --cc=tglx@linutronix.de \ --cc=x86@kernel.org \ --cc=xen-devel@lists.xensource.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.