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
Subject: [PATCH V4 03/15] create arch functions to get and process EFI memory map.
Date: Tue, 9 Sep 2014 17:51:53 -0700 [thread overview]
Message-ID: <1410310325-4509-4-git-send-email-roy.franz@linaro.org> (raw)
In-Reply-To: <1410310325-4509-1-git-send-email-roy.franz@linaro.org>
The memory used to store the EFI memory map is allocated in an
architecture specific way, and the processing of the memory
map itself uses x86 specific data structures. This patch
adds architecture specific funtions so each architecture
can provide its own implementation.
Signed-off-by: Roy Franz <roy.franz@linaro.org>
---
xen/common/efi/boot.c | 75 +++++-------------------------------
xen/include/asm-x86/efi-boot.h | 86 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 95 insertions(+), 66 deletions(-)
diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c
index ca604be..16ffe35 100644
--- a/xen/common/efi/boot.c
+++ b/xen/common/efi/boot.c
@@ -56,8 +56,6 @@ static EFI_HANDLE __initdata efi_ih;
static SIMPLE_TEXT_OUTPUT_INTERFACE *__initdata StdOut;
static SIMPLE_TEXT_OUTPUT_INTERFACE *__initdata StdErr;
-static UINT32 __initdata mdesc_ver;
-
static struct file __initdata cfg;
static struct file __initdata kernel;
static struct file __initdata ramdisk;
@@ -566,16 +564,18 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable)
EFI_STATUS status;
unsigned int i, argc;
CHAR16 **argv, *file_name, *cfg_file_name = NULL;
- UINTN cols, rows, depth, size, map_key, info_size, gop_mode = ~0;
+ UINTN cols, rows, depth, size, info_size, gop_mode = ~0;
EFI_HANDLE *handles = NULL;
EFI_SHIM_LOCK_PROTOCOL *shim_lock;
EFI_GRAPHICS_OUTPUT_PROTOCOL *gop = NULL;
EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *mode_info;
EFI_FILE_HANDLE dir_handle;
union string section = { NULL }, name;
- struct e820entry *e;
u64 efer;
bool_t base_video = 0;
+ UINT32 mmap_desc_ver = 0;
+ UINTN mmap_size, mmap_desc_size, mmap_key = 0;
+ void *mmap;
efi_ih = ImageHandle;
efi_bs = SystemTable->BootServices;
@@ -875,8 +875,6 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable)
mbi.boot_loader_name = (long)"EFI";
mbi.mods_addr = (long)mb_modules;
- place_string(&mbi.mem_upper, NULL);
-
/* Collect EDD info. */
BUILD_BUG_ON(offsetof(struct edd_info, edd_device_params) != EDDEXTSIZE);
BUILD_BUG_ON(sizeof(struct edd_device_params) != EDDPARMSIZE);
@@ -1171,67 +1169,12 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable)
}
}
- efi_bs->GetMemoryMap(&efi_memmap_size, NULL, &map_key,
- &efi_mdesc_size, &mdesc_ver);
- mbi.mem_upper -= efi_memmap_size;
- mbi.mem_upper &= -__alignof__(EFI_MEMORY_DESCRIPTOR);
- if ( mbi.mem_upper < xen_phys_start )
- blexit(L"Out of static memory");
- efi_memmap = (void *)(long)mbi.mem_upper;
- status = efi_bs->GetMemoryMap(&efi_memmap_size, efi_memmap, &map_key,
- &efi_mdesc_size, &mdesc_ver);
- if ( EFI_ERROR(status) )
- PrintErrMesg(L"Cannot obtain memory map", status);
+ efi_arch_get_memory_map(&mmap_size, &mmap, &mmap_key,
+ &mmap_desc_size, &mmap_desc_ver);
- /* Populate E820 table and check trampoline area availability. */
- e = e820map - 1;
- for ( i = 0; i < efi_memmap_size; i += efi_mdesc_size )
- {
- EFI_MEMORY_DESCRIPTOR *desc = efi_memmap + i;
- u64 len = desc->NumberOfPages << EFI_PAGE_SHIFT;
- u32 type;
+ efi_arch_process_memory_map(SystemTable, mmap, mmap_size,
+ mmap_desc_size, mmap_desc_ver);
- switch ( desc->Type )
- {
- default:
- type = E820_RESERVED;
- break;
- case EfiConventionalMemory:
- case EfiBootServicesCode:
- case EfiBootServicesData:
- if ( !trampoline_phys && desc->PhysicalStart + len <= 0x100000 &&
- len >= cfg.size && desc->PhysicalStart + len > cfg.addr )
- cfg.addr = (desc->PhysicalStart + len - cfg.size) & PAGE_MASK;
- /* fall through */
- case EfiLoaderCode:
- case EfiLoaderData:
- if ( desc->Attribute & EFI_MEMORY_WB )
- type = E820_RAM;
- else
- case EfiUnusableMemory:
- type = E820_UNUSABLE;
- break;
- case EfiACPIReclaimMemory:
- type = E820_ACPI;
- break;
- case EfiACPIMemoryNVS:
- type = E820_NVS;
- break;
- }
- if ( e820nr && type == e->type &&
- desc->PhysicalStart == e->addr + e->size )
- e->size += len;
- else if ( !len || e820nr >= E820MAX )
- continue;
- else
- {
- ++e;
- e->addr = desc->PhysicalStart;
- e->size = len;
- e->type = type;
- ++e820nr;
- }
- }
if ( !trampoline_phys )
{
if ( !cfg.addr )
@@ -1239,7 +1182,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable)
relocate_trampoline(cfg.addr);
}
- status = efi_bs->ExitBootServices(ImageHandle, map_key);
+ status = efi_bs->ExitBootServices(ImageHandle, mmap_key);
if ( EFI_ERROR(status) )
PrintErrMesg(L"Cannot exit boot services", status);
diff --git a/xen/include/asm-x86/efi-boot.h b/xen/include/asm-x86/efi-boot.h
index 4ad83ca..3fe6747 100644
--- a/xen/include/asm-x86/efi-boot.h
+++ b/xen/include/asm-x86/efi-boot.h
@@ -449,3 +449,89 @@ static void __init place_string(u32 *addr, const char *s)
}
*addr = (long)alloc;
}
+
+static void __init efi_arch_process_memory_map(EFI_SYSTEM_TABLE *SystemTable,
+ void *map,
+ UINTN map_size,
+ UINTN desc_size,
+ UINT32 desc_ver)
+{
+ struct e820entry *e;
+ int i;
+
+ /* Set global EFI memory map variables */
+ efi_memmap_size = map_size;
+ efi_mdesc_size = desc_size;
+ efi_memmap = map;
+
+ /* Populate E820 table and check trampoline area availability. */
+ e = e820map - 1;
+ for ( i = 0; i < map_size; i += desc_size )
+ {
+ EFI_MEMORY_DESCRIPTOR *desc = map + i;
+ u64 len = desc->NumberOfPages << EFI_PAGE_SHIFT;
+ u32 type;
+
+ switch ( desc->Type )
+ {
+ default:
+ type = E820_RESERVED;
+ break;
+ case EfiConventionalMemory:
+ case EfiBootServicesCode:
+ case EfiBootServicesData:
+ if ( !trampoline_phys && desc->PhysicalStart + len <= 0x100000 &&
+ len >= cfg.size && desc->PhysicalStart + len > cfg.addr )
+ cfg.addr = (desc->PhysicalStart + len - cfg.size) & PAGE_MASK;
+ /* fall through */
+ case EfiLoaderCode:
+ case EfiLoaderData:
+ if ( desc->Attribute & EFI_MEMORY_WB )
+ type = E820_RAM;
+ else
+ case EfiUnusableMemory:
+ type = E820_UNUSABLE;
+ break;
+ case EfiACPIReclaimMemory:
+ type = E820_ACPI;
+ break;
+ case EfiACPIMemoryNVS:
+ type = E820_NVS;
+ break;
+ }
+ if ( e820nr && type == e->type &&
+ desc->PhysicalStart == e->addr + e->size )
+ e->size += len;
+ else if ( !len || e820nr >= E820MAX )
+ continue;
+ else
+ {
+ ++e;
+ e->addr = desc->PhysicalStart;
+ e->size = len;
+ e->type = type;
+ ++e820nr;
+ }
+ }
+
+}
+
+static void __init efi_arch_get_memory_map(UINTN *map_size,
+ void **map,
+ UINTN *map_key, UINTN *desc_size,
+ UINT32 *desc_ver)
+{
+ EFI_STATUS status;
+ efi_bs->GetMemoryMap(map_size, NULL, map_key,
+ desc_size, desc_ver);
+ place_string(&mbi.mem_upper, NULL);
+ mbi.mem_upper -= *map_size;
+ mbi.mem_upper &= -__alignof__(EFI_MEMORY_DESCRIPTOR);
+ if ( mbi.mem_upper < xen_phys_start )
+ blexit(L"Out of static memory");
+ *map = (void *)(long)mbi.mem_upper;
+ status = efi_bs->GetMemoryMap(map_size, *map, map_key,
+ desc_size, desc_ver);
+ if ( EFI_ERROR(status) )
+ PrintErrMesg(L"Cannot obtain memory map", status);
+}
--
2.1.0.rc1
next prev parent reply other threads:[~2014-09-10 0:51 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-10 0:51 [PATCH V4 00/15] arm64 EFI stub Roy Franz
2014-09-10 0:51 ` [PATCH V4 01/15] move x86 EFI boot code to common/efi Roy Franz
2014-09-11 13:50 ` Jan Beulich
2014-09-11 17:16 ` Roy Franz
2014-09-12 6:55 ` Jan Beulich
2014-09-10 0:51 ` [PATCH V4 02/15] Move x86 specific funtions/variables to arch header Roy Franz
2014-09-11 14:03 ` Jan Beulich
2014-09-11 17:33 ` Roy Franz
2014-09-12 7:04 ` Jan Beulich
2014-09-12 9:43 ` Ian Campbell
2014-09-12 9:53 ` Jan Beulich
2014-09-12 9:58 ` Ian Campbell
2014-09-12 16:52 ` Roy Franz
2014-09-10 0:51 ` Roy Franz [this message]
2014-09-11 14:11 ` [PATCH V4 03/15] create arch functions to get and process EFI memory map Jan Beulich
2014-09-11 17:40 ` Roy Franz
2014-09-12 7:07 ` Jan Beulich
2014-09-12 9:45 ` Ian Campbell
2014-09-12 9:56 ` Jan Beulich
2014-09-12 10:23 ` Ian Campbell
2014-09-12 10:35 ` Jan Beulich
2014-09-12 17:01 ` Roy Franz
2014-09-10 0:51 ` [PATCH V4 04/15] Add architecture functions for pre/post ExitBootServices Roy Franz
2014-09-11 14:13 ` Jan Beulich
2014-09-11 17:44 ` Roy Franz
2014-09-12 7:08 ` Jan Beulich
2014-09-12 9:46 ` Ian Campbell
2014-09-12 9:58 ` Jan Beulich
2014-09-12 16:57 ` Roy Franz
2014-09-15 8:47 ` Jan Beulich
2014-09-10 0:51 ` [PATCH V4 05/15] Add efi_arch_cfg_file() to handle arch specific cfg file fields Roy Franz
2014-09-11 14:16 ` Jan Beulich
2014-09-11 18:11 ` Roy Franz
2014-09-12 7:10 ` Jan Beulich
2014-09-10 0:51 ` [PATCH V4 06/15] Add efi_arch_handle_cmdline() for processing commandline Roy Franz
2014-09-11 14:22 ` Jan Beulich
2014-09-11 18:24 ` Roy Franz
2014-09-10 0:51 ` [PATCH V4 07/15] Move x86 specific video and disk probing code Roy Franz
2014-09-11 14:26 ` Jan Beulich
2014-09-11 18:30 ` Roy Franz
2014-09-12 7:12 ` Jan Beulich
2014-09-10 0:51 ` [PATCH V4 08/15] Add efi_arch_memory() for arch specific memory setup Roy Franz
2014-09-11 14:27 ` Jan Beulich
2014-09-10 0:51 ` [PATCH V4 09/15] Add arch specific module handling to read_file() Roy Franz
2014-09-11 14:40 ` Jan Beulich
2014-09-10 0:52 ` [PATCH V4 10/15] Add SMBIOS and runtime services setup arch functions Roy Franz
2014-09-11 14:44 ` Jan Beulich
2014-09-11 22:03 ` Roy Franz
2014-09-11 23:41 ` Stefano Stabellini
2014-09-12 7:14 ` Jan Beulich
2014-09-12 16:24 ` Roy Franz
2014-09-10 0:52 ` [PATCH V4 11/15] Add several misc. arch functions for EFI boot code Roy Franz
2014-09-11 14:45 ` Jan Beulich
2014-09-10 0:52 ` [PATCH V4 12/15] Add efi_arch_use_config_file() function to control use of config file Roy Franz
2014-09-11 14:49 ` Jan Beulich
2014-09-11 23:54 ` Stefano Stabellini
2014-09-12 7:15 ` Jan Beulich
2014-09-12 16:30 ` Roy Franz
2014-09-10 0:52 ` [PATCH V4 13/15] add arm64 cache flushing code from linux v3.16 Roy Franz
2014-09-10 0:52 ` [PATCH V4 14/15] Update libfdt to v1.4.0 Roy Franz
2014-09-10 0:52 ` [PATCH V4 15/15] Add ARM EFI boot support Roy Franz
2014-09-11 14:53 ` Jan Beulich
2014-09-11 22:26 ` Roy Franz
2014-09-12 7:17 ` Jan Beulich
2014-09-12 0:49 ` Stefano Stabellini
2014-09-12 3:21 ` Roy Franz
2014-09-12 17:41 ` Stefano Stabellini
2014-09-12 17:50 ` Roy Franz
2014-09-12 17:55 ` Stefano Stabellini
2014-09-22 11:13 ` Ian Campbell
2014-09-23 12:39 ` Stefano Stabellini
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=1410310325-4509-4-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=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 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).