From: Daniel Kiper <daniel.kiper@oracle.com>
To: linux-efi@vger.kernel.org, linux-ia64@vger.kernel.org,
linux-kernel@vger.kernel.org, x86@kernel.org,
xen-devel@lists.xenproject.org
Cc: boris.ostrovsky@oracle.com, david.vrabel@citrix.com,
eshelton@pobox.com, fenghua.yu@intel.com, hpa@zytor.com,
ian.campbell@citrix.com, jbeulich@suse.com, jeremy@goop.org,
konrad.wilk@oracle.com, matt.fleming@intel.com, mingo@redhat.com,
stefano.stabellini@eu.citrix.com, tglx@linutronix.de,
tony.luck@intel.com, Daniel Kiper <daniel.kiper@oracle.com>
Subject: [PATCH v3 3/5] x86: Call efi_memblock_x86_reserve_range() on native EFI platform only
Date: Tue, 25 Mar 2014 21:57:54 +0100 [thread overview]
Message-ID: <1395781076-12000-4-git-send-email-daniel.kiper@oracle.com> (raw)
In-Reply-To: <1395781076-12000-1-git-send-email-daniel.kiper@oracle.com>
Call efi_memblock_x86_reserve_range() on native EFI platform only.
This is not needed and even it should not be called on platforms
which wraps EFI infrastructure like Xen.
Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
---
arch/x86/kernel/setup.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index ce72964..992b67a 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -933,7 +933,7 @@ void __init setup_arch(char **cmdline_p)
set_bit(EFI_64BIT, &x86_efi_facility);
}
- if (efi_enabled(EFI_BOOT))
+ if (!strncmp((char *)&boot_params.efi_info.efi_loader_signature, "EL", 2))
efi_memblock_x86_reserve_range();
#endif
--
1.7.10.4
next prev parent reply other threads:[~2014-03-25 20:57 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-25 20:57 [PATCH v3 0/5] xen: Add EFI support Daniel Kiper
[not found] ` <1395781076-12000-1-git-send-email-daniel.kiper-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
2014-03-25 20:57 ` [PATCH v3 1/5] efi: Add efi_init_ops variable Daniel Kiper
[not found] ` <1395781076-12000-2-git-send-email-daniel.kiper-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
2014-03-26 12:56 ` Matt Fleming
2014-03-26 14:02 ` Daniel Kiper
2014-03-26 14:29 ` Matt Fleming
2014-03-25 20:57 ` [PATCH v3 2/5] efi: Export arch_tables variable Daniel Kiper
2014-03-26 13:21 ` Jan Beulich
[not found] ` <5332E25F020000780000255A-ce6RLXgGx+vWGUEhTRrCg1aTQe2KTcn/@public.gmane.org>
2014-03-26 14:08 ` Daniel Kiper
[not found] ` <20140326140800.GP3454-fJNZiO034lp9pOct4yEdx/3oZC3j2Omk@public.gmane.org>
2014-03-26 14:17 ` Jan Beulich
2014-03-26 14:18 ` Matt Fleming
2014-03-25 20:57 ` Daniel Kiper [this message]
[not found] ` <1395781076-12000-4-git-send-email-daniel.kiper-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
2014-03-26 13:00 ` [PATCH v3 3/5] x86: Call efi_memblock_x86_reserve_range() on native EFI platform only Matt Fleming
[not found] ` <20140326130009.GB24856-HNK1S37rvNbeXh+fF434Mdi2O/JbrIOy@public.gmane.org>
2014-03-26 13:22 ` Jan Beulich
[not found] ` <5332E2B9020000780000255D-ce6RLXgGx+vWGUEhTRrCg1aTQe2KTcn/@public.gmane.org>
2014-03-26 13:31 ` Matt Fleming
[not found] ` <20140326133119.GD24856-HNK1S37rvNbeXh+fF434Mdi2O/JbrIOy@public.gmane.org>
2014-03-26 13:39 ` Jan Beulich
2014-03-26 13:48 ` Daniel Kiper
[not found] ` <20140326134845.GN3454-fJNZiO034lp9pOct4yEdx/3oZC3j2Omk@public.gmane.org>
2014-03-26 13:57 ` Matt Fleming
2014-03-26 22:01 ` Daniel Kiper
2014-03-26 22:35 ` Andrew Cooper
2014-03-25 20:57 ` [PATCH v3 4/5] xen: Define EFI related stuff Daniel Kiper
2014-03-26 13:25 ` Jan Beulich
2014-03-26 14:58 ` Stefano Stabellini
2014-03-26 15:25 ` Jan Beulich
[not found] ` <5332FF6C02000078000027A5-ce6RLXgGx+vWGUEhTRrCg1aTQe2KTcn/@public.gmane.org>
2014-03-26 15:34 ` Stefano Stabellini
2014-03-25 20:57 ` [PATCH v3 5/5] xen: Put EFI machinery in place Daniel Kiper
[not found] ` <1395781076-12000-6-git-send-email-daniel.kiper-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
2014-03-26 13:12 ` Matt Fleming
[not found] ` <20140326131214.GC24856-HNK1S37rvNbeXh+fF434Mdi2O/JbrIOy@public.gmane.org>
2014-03-26 13:31 ` Jan Beulich
2014-03-26 13:46 ` Matt Fleming
[not found] ` <20140326134617.GE24856-HNK1S37rvNbeXh+fF434Mdi2O/JbrIOy@public.gmane.org>
2014-03-26 13:53 ` Matt Fleming
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=1395781076-12000-4-git-send-email-daniel.kiper@oracle.com \
--to=daniel.kiper@oracle.com \
--cc=boris.ostrovsky@oracle.com \
--cc=david.vrabel@citrix.com \
--cc=eshelton@pobox.com \
--cc=fenghua.yu@intel.com \
--cc=hpa@zytor.com \
--cc=ian.campbell@citrix.com \
--cc=jbeulich@suse.com \
--cc=jeremy@goop.org \
--cc=konrad.wilk@oracle.com \
--cc=linux-efi@vger.kernel.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=matt.fleming@intel.com \
--cc=mingo@redhat.com \
--cc=stefano.stabellini@eu.citrix.com \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--cc=x86@kernel.org \
--cc=xen-devel@lists.xenproject.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;
as well as URLs for NNTP newsgroup(s).