From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755125AbcDGAJa (ORCPT ); Wed, 6 Apr 2016 20:09:30 -0400 Received: from mail.kernel.org ([198.145.29.136]:55574 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754801AbcDGAHC (ORCPT ); Wed, 6 Apr 2016 20:07:02 -0400 From: "Luis R. Rodriguez" 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" Subject: [PATCH v4 06/14] x86/init: use a platform legacy quirk for ebda Date: Wed, 6 Apr 2016 17:06:26 -0700 Message-Id: <1459987594-5434-7-git-send-email-mcgrof@kernel.org> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1459987594-5434-1-git-send-email-mcgrof@kernel.org> References: <1459987594-5434-1-git-send-email-mcgrof@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This replaces the paravirt_enabled() check with a proper x86 legacy platform quirk. Signed-off-by: Luis R. Rodriguez --- 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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Luis R. Rodriguez" Subject: [PATCH v4 06/14] x86/init: use a platform legacy quirk for ebda Date: Wed, 6 Apr 2016 17:06:26 -0700 Message-ID: <1459987594-5434-7-git-send-email-mcgrof@kernel.org> References: <1459987594-5434-1-git-send-email-mcgrof@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1459987594-5434-1-git-send-email-mcgrof@kernel.org> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" 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" , lguest@lists.ozlabs.org, glin@suse.com, david.vrabel@citrix.com, boris.ostrovsky@oracle.com, andriy.shevchenko@linux.intel.com List-Id: xen-devel@lists.xenproject.org VGhpcyByZXBsYWNlcyB0aGUgcGFyYXZpcnRfZW5hYmxlZCgpIGNoZWNrIHdpdGggYQpwcm9wZXIg eDg2IGxlZ2FjeSBwbGF0Zm9ybSBxdWlyay4KClNpZ25lZC1vZmYtYnk6IEx1aXMgUi4gUm9kcmln dWV6IDxtY2dyb2ZAa2VybmVsLm9yZz4KLS0tCiBhcmNoL3g4Ni9pbmNsdWRlL2FzbS94ODZfaW5p dC5oICAgfCAzICsrKwogYXJjaC94ODYva2VybmVsL2hlYWQuYyAgICAgICAgICAgIHwgMiArLQog YXJjaC94ODYva2VybmVsL3BsYXRmb3JtLXF1aXJrcy5jIHwgNCArKysrCiAzIGZpbGVzIGNoYW5n ZWQsIDggaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigtKQoKZGlmZiAtLWdpdCBhL2FyY2gveDg2 L2luY2x1ZGUvYXNtL3g4Nl9pbml0LmggYi9hcmNoL3g4Ni9pbmNsdWRlL2FzbS94ODZfaW5pdC5o CmluZGV4IDI3ZDVjM2ZlNTE5OC4uZjNmODExMjJhZTNiIDEwMDY0NAotLS0gYS9hcmNoL3g4Ni9p bmNsdWRlL2FzbS94ODZfaW5pdC5oCisrKyBiL2FyY2gveDg2L2luY2x1ZGUvYXNtL3g4Nl9pbml0 LmgKQEAgLTE0NSw5ICsxNDUsMTIgQEAgc3RydWN0IHRpbWVzcGVjOwogICogc3RydWN0IHg4Nl9s ZWdhY3lfZmVhdHVyZXMgLSBsZWdhY3kgeDg2IGZlYXR1cmVzCiAgKgogICogQHJ0YzogdGhpcyBk ZXZpY2UgaGFzIGEgQ01PUyByZWFsLXRpbWUgY2xvY2sgcHJlc2VudAorICogQGViZGFfc2VhcmNo OiBpdCdzIHNhZmUgdG8gc2VhcmNoIGZvciB0aGUgRUJEQSBzaWduYXR1cmUgaW4gdGhlIGhhcmR3 YXJlJ3MKKyAqIAlsb3cgUkFNCiAgKi8KIHN0cnVjdCB4ODZfbGVnYWN5X2ZlYXR1cmVzIHsKIAlp bnQgcnRjOworCWludCBlYmRhX3NlYXJjaDsKIH07CiAKIC8qKgpkaWZmIC0tZ2l0IGEvYXJjaC94 ODYva2VybmVsL2hlYWQuYyBiL2FyY2gveDg2L2tlcm5lbC9oZWFkLmMKaW5kZXggOTkyZjQ0MmNh MTU1Li5hZmU2NWRmZmVlODAgMTAwNjQ0Ci0tLSBhL2FyY2gveDg2L2tlcm5lbC9oZWFkLmMKKysr IGIvYXJjaC94ODYva2VybmVsL2hlYWQuYwpAQCAtMzgsNyArMzgsNyBAQCB2b2lkIF9faW5pdCBy ZXNlcnZlX2ViZGFfcmVnaW9uKHZvaWQpCiAJICogdGhhdCB0aGUgcGFyYXZpcnQgY2FzZSBjYW4g aGFuZGxlIG1lbW9yeSBzZXR1cAogCSAqIGNvcnJlY3RseSwgd2l0aG91dCBvdXIgaGVscC4KIAkg Ki8KLQlpZiAocGFyYXZpcnRfZW5hYmxlZCgpKQorCWlmICgheDg2X3BsYXRmb3JtLmxlZ2FjeS5l YmRhX3NlYXJjaCkKIAkJcmV0dXJuOwogCiAJLyogZW5kIG9mIGxvdyAoY29udmVudGlvbmFsKSBt ZW1vcnkgKi8KZGlmZiAtLWdpdCBhL2FyY2gveDg2L2tlcm5lbC9wbGF0Zm9ybS1xdWlya3MuYyBi L2FyY2gveDg2L2tlcm5lbC9wbGF0Zm9ybS1xdWlya3MuYwppbmRleCAxYjExNGFjNTk5NmYuLmE4 NzFiNmIwZTM1ZiAxMDA2NDQKLS0tIGEvYXJjaC94ODYva2VybmVsL3BsYXRmb3JtLXF1aXJrcy5j CisrKyBiL2FyY2gveDg2L2tlcm5lbC9wbGF0Zm9ybS1xdWlya3MuYwpAQCAtNyw4ICs3LDEyIEBA CiB2b2lkIF9faW5pdCB4ODZfZWFybHlfaW5pdF9wbGF0Zm9ybV9xdWlya3Modm9pZCkKIHsKIAl4 ODZfcGxhdGZvcm0ubGVnYWN5LnJ0YyA9IDE7CisJeDg2X3BsYXRmb3JtLmxlZ2FjeS5lYmRhX3Nl YXJjaCA9IDA7CiAKIAlzd2l0Y2ggKGJvb3RfcGFyYW1zLmhkci5oYXJkd2FyZV9zdWJhcmNoKSB7 CisJY2FzZSBYODZfU1VCQVJDSF9QQzoKKwkJeDg2X3BsYXRmb3JtLmxlZ2FjeS5lYmRhX3NlYXJj aCA9IDE7CisJCWJyZWFrOwogCWNhc2UgWDg2X1NVQkFSQ0hfWEVOOgogCWNhc2UgWDg2X1NVQkFS Q0hfTEdVRVNUOgogCWNhc2UgWDg2X1NVQkFSQ0hfSU5URUxfTUlEOgotLSAKMi43LjIKCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFp bGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHA6Ly9saXN0cy54ZW4ub3JnL3hl bi1kZXZlbAo=