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: fenghua.yu@intel.com, jeremy@goop.org, matt.fleming@intel.com,
ian.campbell@citrix.com, andrew.cooper3@citrix.com,
stefano.stabellini@eu.citrix.com, tony.luck@intel.com,
mjg59@srcf.ucam.org, mingo@redhat.com, david.vrabel@citrix.com,
jbeulich@suse.com, hpa@zytor.com, boris.ostrovsky@oracle.com,
tglx@linutronix.de, eshelton@pobox.com
Subject: [PATCH v7 03/10] arch/x86: Do not access EFI memory map if it is not available
Date: Mon, 30 Jun 2014 19:52:57 +0200 [thread overview]
Message-ID: <1404150784-27921-4-git-send-email-daniel.kiper@oracle.com> (raw)
In-Reply-To: <1404150784-27921-1-git-send-email-daniel.kiper@oracle.com>
Do not access EFI memory map if it is not available. At least
Xen dom0 EFI implementation does not have an access to it.
Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
---
v6 - suggestions/fixes:
- create this separate patch from main EFI_PARAVIRT patch
(suggested by Matt Fleming).
---
arch/x86/platform/efi/efi.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index 0ee1f46..d2d3c41 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -1220,6 +1220,9 @@ u64 efi_mem_attributes(unsigned long phys_addr)
efi_memory_desc_t *md;
void *p;
+ if (!efi_enabled(EFI_MEMMAP))
+ return 0;
+
for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) {
md = p;
if ((md->phys_addr <= phys_addr) &&
--
1.7.10.4
next prev parent reply other threads:[~2014-06-30 17:52 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-30 17:52 [PATCH v7 00/10] xen: Add EFI support Daniel Kiper
2014-06-30 17:52 ` [PATCH v7 01/10] arch/ia64: Define early_memunmap() Daniel Kiper
[not found] ` <1404150784-27921-2-git-send-email-daniel.kiper-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
2014-07-07 14:50 ` Matt Fleming
2014-06-30 17:52 ` [PATCH v7 02/10] efi: Use early_mem*() instead of early_io*() Daniel Kiper
2014-06-30 17:52 ` Daniel Kiper [this message]
2014-06-30 17:52 ` [PATCH v7 04/10] efi: Introduce EFI_PARAVIRT flag Daniel Kiper
2014-06-30 17:52 ` [PATCH v7 05/10] arch/x86: Remove redundant set_bit(EFI_SYSTEM_TABLES) call Daniel Kiper
2014-06-30 17:53 ` [PATCH v7 06/10] arch/x86: Remove redundant set_bit(EFI_MEMMAP) call Daniel Kiper
2014-06-30 17:53 ` [PATCH v7 07/10] xen: Define EFI related stuff Daniel Kiper
2014-07-02 14:02 ` Stefano Stabellini
2014-06-30 17:53 ` [PATCH v7 08/10] xen: Put EFI machinery in place Daniel Kiper
2014-07-02 14:01 ` Stefano Stabellini
2014-06-30 17:53 ` [PATCH v7 09/10] arch/x86: Replace plain strings with constants Daniel Kiper
2014-06-30 17:53 ` [PATCH v7 10/10] arch/x86: Remove efi_set_rtc_mmss() Daniel Kiper
2014-07-01 13:13 ` [PATCH v7 00/10] xen: Add EFI support David Vrabel
2014-07-01 13:24 ` Daniel Kiper
2014-07-07 19:49 ` Matt Fleming
2014-07-08 20:52 ` Daniel Kiper
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=1404150784-27921-4-git-send-email-daniel.kiper@oracle.com \
--to=daniel.kiper@oracle.com \
--cc=andrew.cooper3@citrix.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=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=mjg59@srcf.ucam.org \
--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