From patchwork Wed Sep 10 00:51:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Franz X-Patchwork-Id: 37163 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f198.google.com (mail-vc0-f198.google.com [209.85.220.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7CE8020566 for ; Wed, 10 Sep 2014 00:54:26 +0000 (UTC) Received: by mail-vc0-f198.google.com with SMTP id id10sf49028168vcb.5 for ; Tue, 09 Sep 2014 17:54:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:cc:subject:precedence:list-id:list-unsubscribe:list-post :list-help:list-subscribe:mime-version:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list :list-archive:content-type:content-transfer-encoding; bh=bLK9c2GbxsbX6U7tHrNZ+m6FJ1CKAKrtgIQyNhE5+ZM=; b=YMuar4vTho8pgBiB2yC8PV4+kWubwS7Of+/mrP0A1ft2ZAUlr/ep2TKhhbZTawC9Th upnlksn89KE2m//nSaVVh+0z/hxRk3ebILgFnwM2IsCHMqIAea6ta0fzXI99GQRdaQRi TRmATiiUAs7xxb/JCj2DVxlos5Co5WS/IynL80XeKZRgSmDlQ/Se8F0amPBPQcYk8NJ9 a0tAMD7LOmDwpZNYoKjzcEOWg5VTN03jY+/6zYx+0EHrybVYXFMsaqeE4zp+I3K6SEQM k4V91g+IdHGzYu+H3zINzwpsupgp5RjMcDcEPiw03Oq3RoxTBMgZpRT/NW6Ral8R8SMu jEhA== X-Gm-Message-State: ALoCoQljH7zY6aodH1iAbFATayx3Ghk95hH4lLLix0nhiKdVhRi0MeXNq4UAX5MNsOHIvsVo34cO X-Received: by 10.236.124.161 with SMTP id x21mr10620676yhh.48.1410310466278; Tue, 09 Sep 2014 17:54:26 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.16.232 with SMTP id 95ls2516502qgb.94.gmail; Tue, 09 Sep 2014 17:54:26 -0700 (PDT) X-Received: by 10.220.144.207 with SMTP id a15mr3766100vcv.56.1410310466206; Tue, 09 Sep 2014 17:54:26 -0700 (PDT) Received: from mail-vc0-f170.google.com (mail-vc0-f170.google.com [209.85.220.170]) by mx.google.com with ESMTPS id ee2si6457489vdb.40.2014.09.09.17.54.26 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 09 Sep 2014 17:54:26 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.170 as permitted sender) client-ip=209.85.220.170; Received: by mail-vc0-f170.google.com with SMTP id hy4so3249309vcb.29 for ; Tue, 09 Sep 2014 17:54:26 -0700 (PDT) X-Received: by 10.52.185.168 with SMTP id fd8mr4070534vdc.58.1410310466122; Tue, 09 Sep 2014 17:54:26 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.45.67 with SMTP id uj3csp363870vcb; Tue, 9 Sep 2014 17:54:25 -0700 (PDT) X-Received: by 10.220.46.5 with SMTP id h5mr3812548vcf.55.1410310465391; Tue, 09 Sep 2014 17:54:25 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id vv5si5836079vcb.57.2014.09.09.17.54.25 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 09 Sep 2014 17:54:25 -0700 (PDT) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XRW93-0006Ct-Vi; Wed, 10 Sep 2014 00:52:25 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XRW91-0006BS-Tp for xen-devel@lists.xen.org; Wed, 10 Sep 2014 00:52:24 +0000 Received: from [85.158.139.211:58301] by server-14.bemta-5.messagelabs.com id 36/E7-12422-7C0AF045; Wed, 10 Sep 2014 00:52:23 +0000 X-Env-Sender: roy.franz@linaro.org X-Msg-Ref: server-2.tower-206.messagelabs.com!1410310339!13493462!1 X-Originating-IP: [209.85.213.180] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1005 invoked from network); 10 Sep 2014 00:52:20 -0000 Received: from mail-ig0-f180.google.com (HELO mail-ig0-f180.google.com) (209.85.213.180) by server-2.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 10 Sep 2014 00:52:20 -0000 Received: by mail-ig0-f180.google.com with SMTP id hn18so5539122igb.1 for ; Tue, 09 Sep 2014 17:52:19 -0700 (PDT) X-Received: by 10.42.247.137 with SMTP id mc9mr42227404icb.13.1410310339053; Tue, 09 Sep 2014 17:52:19 -0700 (PDT) Received: from rfranz-v430.caveonetworks.com (64.2.3.195.ptr.us.xo.net. [64.2.3.195]) by mx.google.com with ESMTPSA id dx10sm654825igb.4.2014.09.09.17.52.17 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Sep 2014 17:52:18 -0700 (PDT) From: Roy Franz To: xen-devel@lists.xen.org, ian.campbell@citrix.com, stefano.stabellini@citrix.com, tim@xen.org, jbeulich@suse.com, keir@xen.org Date: Tue, 9 Sep 2014 17:51:53 -0700 Message-Id: <1410310325-4509-4-git-send-email-roy.franz@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1410310325-4509-1-git-send-email-roy.franz@linaro.org> References: <1410310325-4509-1-git-send-email-roy.franz@linaro.org> Cc: Roy Franz , fu.wei@linaro.org Subject: [Xen-devel] [PATCH V4 03/15] create arch functions to get and process EFI memory map. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: roy.franz@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.170 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: 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 --- 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); +}