All of lore.kernel.org
 help / color / mirror / Atom feed
From: Roy Franz <roy.franz@linaro.org>
To: xen-devel@lists.xen.org, ian.campbell@citrix.com,
	stefano.stabellini@citrix.com, tim@xen.org, jbeulich@suse.com,
	keir@xen.org
Cc: Roy Franz <roy.franz@linaro.org>,
	fu.wei@linaro.org, linaro-uefi@lists.linaro.org
Subject: [PATCH V3 11/15] Add several misc. arch functions for EFI boot code.
Date: Sun,  7 Sep 2014 20:53:57 -0700	[thread overview]
Message-ID: <1410148441-18684-12-git-send-email-roy.franz@linaro.org> (raw)
In-Reply-To: <1410148441-18684-1-git-send-email-roy.franz@linaro.org>

Add efi_arch_blexit() for arch specific cleanup on error exit,
efi_arch_load_addr_check() to do the arch specific verifications
of where the UEFI firmware loaded XEN, and efi_arch_cpu() for
probing CPU features.

Signed-off-by: Roy Franz <roy.franz@linaro.org>
---
 xen/common/efi/boot.c          | 18 ++++--------------
 xen/include/asm-x86/efi-boot.h | 23 +++++++++++++++++++++++
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c
index 013597b..1630dde 100644
--- a/xen/common/efi/boot.c
+++ b/xen/common/efi/boot.c
@@ -192,11 +192,11 @@ static void __init noreturn blexit(const CHAR16 *str)
         efi_bs->FreePages(kernel.addr, PFN_UP(kernel.size));
     if ( ramdisk.addr )
         efi_bs->FreePages(ramdisk.addr, PFN_UP(ramdisk.size));
-    if ( ucode.addr )
-        efi_bs->FreePages(ucode.addr, PFN_UP(ucode.size));
     if ( xsm.addr )
         efi_bs->FreePages(xsm.addr, PFN_UP(xsm.size));
 
+    efi_arch_blexit();
+
     efi_bs->Exit(efi_ih, EFI_SUCCESS, 0, NULL);
     unreachable(); /* not reached */
 }
@@ -592,12 +592,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable)
     if ( status != EFI_SUCCESS )
         PrintErrMesg(L"No Loaded Image Protocol", status);
 
-    xen_phys_start = (UINTN)loaded_image->ImageBase;
-    if ( (xen_phys_start + loaded_image->ImageSize - 1) >> 32 )
-        blexit(L"Xen must be loaded below 4Gb.");
-    if ( xen_phys_start & ((1 << L2_PAGETABLE_SHIFT) - 1) )
-        blexit(L"Xen must be loaded at a 2Mb boundary.");
-    trampoline_xen_phys_start = xen_phys_start;
+    efi_arch_load_addr_check(loaded_image);
 
     /* Get the file system interface. */
     dir_handle = get_parent_handle(loaded_image, &file_name.w);
@@ -794,12 +789,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable)
     efi_arch_edd();
 
     /* XXX Collect EDID info. */
-
-    if ( cpuid_eax(0x80000000) > 0x80000000 )
-    {
-        cpuid_ext_features = cpuid_edx(0x80000001);
-        boot_cpu_data.x86_capability[1] = cpuid_ext_features;
-    }
+    efi_arch_cpu();
 
     efi_arch_runtime_setup(SystemTable);
 
diff --git a/xen/include/asm-x86/efi-boot.h b/xen/include/asm-x86/efi-boot.h
index f5b7dcd..d7c6abc 100644
--- a/xen/include/asm-x86/efi-boot.h
+++ b/xen/include/asm-x86/efi-boot.h
@@ -982,6 +982,14 @@ static void __init efi_arch_handle_module(struct file *file, char *name,
     ++mbi.mods_count;
 }
 
+static void __init efi_arch_cpu(void)
+{
+    if ( cpuid_eax(0x80000000) > 0x80000000 )
+    {
+        cpuid_ext_features = cpuid_edx(0x80000001);
+        boot_cpu_data.x86_capability[1] = cpuid_ext_features;
+    }
+}
 static void __init efi_arch_smbios(void)
 {
     if (efi.smbios != EFI_INVALID_TABLE_ADDR)
@@ -1035,3 +1043,18 @@ static void __init efi_arch_runtime_setup(EFI_SYSTEM_TABLE *SystemTable)
         PrintStr(newline);
     }
 }
+static void __init efi_arch_blexit(void)
+{
+    if ( ucode.addr )
+        efi_bs->FreePages(ucode.addr, PFN_UP(ucode.size));
+}
+
+static void __init efi_arch_load_addr_check(EFI_LOADED_IMAGE *loaded_image)
+{
+    xen_phys_start = (UINTN)loaded_image->ImageBase;
+    if ( (xen_phys_start + loaded_image->ImageSize - 1) >> 32 )
+        blexit(L"Xen must be loaded below 4Gb.");
+    if ( xen_phys_start & ((1 << L2_PAGETABLE_SHIFT) - 1) )
+        blexit(L"Xen must be loaded at a 2Mb boundary.");
+    trampoline_xen_phys_start = xen_phys_start;
+}
-- 
2.1.0.rc1

  parent reply	other threads:[~2014-09-08  3:53 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-08  3:53 [PATCH V3 00/15] arm64 EFI stub Roy Franz
2014-09-08  3:53 ` [PATCH V3 01/15] move x86 EFI boot code to common/efi Roy Franz
2014-09-08 15:23   ` Ian Campbell
2014-09-08 15:33     ` Jan Beulich
2014-09-08 21:00       ` Roy Franz
2014-09-08  3:53 ` [PATCH V3 02/15] Move x86 specific funtions/variables to arch header Roy Franz
2014-09-08  3:53 ` [PATCH V3 03/15] create arch functions to get and process EFI memory map Roy Franz
2014-09-08  3:53 ` [PATCH V3 04/15] Add architecture functions for pre/post ExitBootServices Roy Franz
2014-09-08  3:53 ` [PATCH V3 05/15] Add efi_arch_cfg_file() to handle arch specific cfg file fields Roy Franz
2014-09-08  3:53 ` [PATCH V3 06/15] Add efi_arch_handle_cmdline() for processing commandline Roy Franz
2014-09-08  3:53 ` [PATCH V3 07/15] Move x86 specific video and disk probing code Roy Franz
2014-09-08  3:53 ` [PATCH V3 08/15] Add efi_arch_memory() for arch specific memory setup Roy Franz
2014-09-08  3:53 ` [PATCH V3 09/15] Add arch specific module handling to read_file() Roy Franz
2014-09-08  3:53 ` [PATCH V3 10/15] Add SMBIOS and runtime services setup arch functions Roy Franz
2014-09-08  3:53 ` Roy Franz [this message]
2014-09-08  3:53 ` [PATCH V3 12/15] Add efi_arch_use_config_file() function to control use of config file Roy Franz
2014-09-08  3:53 ` [PATCH V3 13/15] add arm64 cache flushing code from linux v3.16 Roy Franz
2014-09-08 15:52   ` Ian Campbell
2014-09-08  3:54 ` [PATCH V3 14/15] Update libfdt to v1.4.0 Roy Franz
2014-09-08 15:54   ` Ian Campbell
2014-09-08 19:08     ` Roy Franz
2014-09-09  9:23       ` Ian Campbell
2014-09-08  3:54 ` [PATCH V3 15/15] Add ARM EFI boot support Roy Franz
2014-09-08 16:12   ` Ian Campbell
2014-09-08 21:18     ` Roy Franz
2014-09-09  9:24       ` Ian Campbell
2014-09-09  9:53         ` Jan Beulich
2014-09-09 17:10           ` Roy Franz

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=1410148441-18684-12-git-send-email-roy.franz@linaro.org \
    --to=roy.franz@linaro.org \
    --cc=fu.wei@linaro.org \
    --cc=ian.campbell@citrix.com \
    --cc=jbeulich@suse.com \
    --cc=keir@xen.org \
    --cc=linaro-uefi@lists.linaro.org \
    --cc=stefano.stabellini@citrix.com \
    --cc=tim@xen.org \
    --cc=xen-devel@lists.xen.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 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.