From patchwork Thu Sep 18 22:50:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Franz X-Patchwork-Id: 37618 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1D1E520C9D for ; Thu, 18 Sep 2014 22:52:26 +0000 (UTC) Received: by mail-wi0-f199.google.com with SMTP id cc10sf571217wib.6 for ; Thu, 18 Sep 2014 15:52:25 -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=zDKIbMRlndi3vs3rPbfDBrmeY2an0T/60W+fuojbCTo=; b=gNfRW2Oq2rU+ND2YYu2yxvb/xND1WL6nc2wIoavy+oVbOTJl53U8BJWOslIJTMloFe cey3H+Pu8rSdLGe4gF6KeQ/oikbLOjvYc8xD5SkaV+xAs3gm1m+YaAplxUaa+Uw3+8OR PokGWOS9NbG8RYflh5Ex0BD7P9mVMv2dqLv2GHn5uW6glO3g0WAjNlGgN5txLNjx5YAn Nn44rWC/mwclwLSVufA/J26OKx106LXnMJA8r2EIexJYbuIaluL+CF4OjO6a/R+4w3Qa KHqQO3HDicwCC+X3nygG87um9wD6Syy9zWPdyHQmntJPB80X7FZdutrawVdf26rTyBFG f8Zg== X-Gm-Message-State: ALoCoQnByyNECOvwPFgLe4y9AjUv/N++Chqn9b21cSwIoK5uo/cxWlyJP44YWLyxJg7zmKgdwBtE X-Received: by 10.180.12.148 with SMTP id y20mr1357679wib.7.1411080745267; Thu, 18 Sep 2014 15:52:25 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.19.5 with SMTP id a5ls279024lae.19.gmail; Thu, 18 Sep 2014 15:52:24 -0700 (PDT) X-Received: by 10.152.30.100 with SMTP id r4mr2506217lah.87.1411080744976; Thu, 18 Sep 2014 15:52:24 -0700 (PDT) Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com [209.85.217.181]) by mx.google.com with ESMTPS id kf3si135571lbc.68.2014.09.18.15.52.24 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 18 Sep 2014 15:52:24 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.181 as permitted sender) client-ip=209.85.217.181; Received: by mail-lb0-f181.google.com with SMTP id z11so2066799lbi.40 for ; Thu, 18 Sep 2014 15:52:24 -0700 (PDT) X-Received: by 10.112.210.197 with SMTP id mw5mr2774759lbc.20.1411080744878; Thu, 18 Sep 2014 15:52:24 -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.112.130.169 with SMTP id of9csp843146lbb; Thu, 18 Sep 2014 15:52:24 -0700 (PDT) X-Received: by 10.52.89.198 with SMTP id bq6mr1387490vdb.41.1411080742578; Thu, 18 Sep 2014 15:52:22 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id y9si48863vdy.86.2014.09.18.15.52.22 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 18 Sep 2014 15:52:22 -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 1XUkX3-0006OA-VB; Thu, 18 Sep 2014 22:50:33 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUkX1-0006Mj-Kg for xen-devel@lists.xen.org; Thu, 18 Sep 2014 22:50:31 +0000 Received: from [85.158.143.35:7264] by server-3.bemta-4.messagelabs.com id 48/9F-06192-7B16B145; Thu, 18 Sep 2014 22:50:31 +0000 X-Env-Sender: roy.franz@linaro.org X-Msg-Ref: server-4.tower-21.messagelabs.com!1411080628!14760661!1 X-Originating-IP: [209.85.192.179] 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 18701 invoked from network); 18 Sep 2014 22:50:29 -0000 Received: from mail-pd0-f179.google.com (HELO mail-pd0-f179.google.com) (209.85.192.179) by server-4.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 18 Sep 2014 22:50:29 -0000 Received: by mail-pd0-f179.google.com with SMTP id g10so2354219pdj.10 for ; Thu, 18 Sep 2014 15:50:28 -0700 (PDT) X-Received: by 10.67.24.70 with SMTP id ig6mr9804304pad.99.1411080627952; Thu, 18 Sep 2014 15:50:27 -0700 (PDT) Received: from rfranz-t520.swisscom.com (70-35-38-154.static.wiline.com. [70.35.38.154]) by mx.google.com with ESMTPSA id ig4sm66332pbb.55.2014.09.18.15.50.26 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 18 Sep 2014 15:50:27 -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: Thu, 18 Sep 2014 15:50:01 -0700 Message-Id: <1411080607-32365-11-git-send-email-roy.franz@linaro.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1411080607-32365-1-git-send-email-roy.franz@linaro.org> References: <1411080607-32365-1-git-send-email-roy.franz@linaro.org> Cc: Roy Franz , fu.wei@linaro.org Subject: [Xen-devel] [PATCH V5 10/15] Add arch specific module handling to read_file() 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.217.181 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: Each architecture tracks modules differently internally, so add efi_arch_handle_module() routine to enable the common code to invoke the proper handling of modules as the are loaded. Signed-off-by: Roy Franz --- xen/common/efi/boot.c | 102 ++++++++++++++++++++++++----------------- xen/include/asm-x86/efi-boot.h | 32 ++++++++++++- 2 files changed, 91 insertions(+), 43 deletions(-) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 38177bf..4acab40 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -56,12 +56,13 @@ static void noreturn blexit(const CHAR16 *str); static void PrintErrMesg(const CHAR16 *mesg, EFI_STATUS ErrCode); static char *get_value(const struct file *cfg, const char *section, const char *item); -static void split_value(char *s); +static char *split_string(char *s); static CHAR16 *s2w(union string *str); static char *w2s(const union string *str); -static bool_t read_file(EFI_FILE_HANDLE dir_handle, CHAR16 *name, - struct file *file); +static size_t wstrlen(const CHAR16 * s); static int set_color(u32 mask, int bpp, u8 *pos, u8 *sz); +static bool_t read_file(EFI_FILE_HANDLE dir_handle, struct file *file, + CHAR16 *filename, char *options); static EFI_BOOT_SERVICES *__initdata efi_bs; static EFI_HANDLE __initdata efi_ih; @@ -115,6 +116,15 @@ static void __init DisplayUint(UINT64 Val, INTN Width) PrintStr(PrintString); } +static size_t __init wstrlen(const CHAR16 * s) +{ + const CHAR16 *sc; + + for (sc = s; *sc != L'\0'; ++sc) + /* nothing */; + return sc - s; +} + static CHAR16 *__init wstrcpy(CHAR16 *d, const CHAR16 *s) { CHAR16 *r = d; @@ -404,18 +414,33 @@ static CHAR16 *__init point_tail(CHAR16 *fn) break; } } +/* + * Truncate string at first space, and return pointer + * to remainder of string. + */ +static char * __init split_string(char *s) +{ + while ( *s && !isspace(*s) ) + ++s; + if ( *s ) + { + *s = 0; + return(s + 1); + } + return NULL; +} -static bool_t __init read_file(EFI_FILE_HANDLE dir_handle, CHAR16 *name, - struct file *file) +static bool_t __init read_file(EFI_FILE_HANDLE dir_handle, struct file *file, + CHAR16 *filename, char *options) { EFI_FILE_HANDLE FileHandle = NULL; UINT64 size; EFI_STATUS ret; CHAR16 *what = NULL; - if ( !name ) + if ( !filename ) PrintErrMesg(L"No filename", EFI_OUT_OF_RESOURCES); - ret = dir_handle->Open(dir_handle, &FileHandle, name, + ret = dir_handle->Open(dir_handle, &FileHandle, filename, EFI_FILE_MODE_READ, 0); if ( file == &cfg && ret == EFI_NOT_FOUND ) return 0; @@ -447,20 +472,18 @@ static bool_t __init read_file(EFI_FILE_HANDLE dir_handle, CHAR16 *name, } else { + file->size = size; if ( file != &cfg ) { - PrintStr(name); + PrintStr(filename); PrintStr(L": "); DisplayUint(file->addr, 2 * sizeof(file->addr)); PrintStr(L"-"); DisplayUint(file->addr + size, 2 * sizeof(file->addr)); PrintStr(newline); - mb_modules[mbi.mods_count].mod_start = file->addr >> PAGE_SHIFT; - mb_modules[mbi.mods_count].mod_end = size; - ++mbi.mods_count; + efi_arch_handle_module(file, filename, options); } - file->size = size; ret = FileHandle->Read(FileHandle, &file->size, file->ptr); if ( !EFI_ERROR(ret) && file->size != size ) ret = EFI_ABORTED; @@ -475,7 +498,7 @@ static bool_t __init read_file(EFI_FILE_HANDLE dir_handle, CHAR16 *name, { PrintErr(what); PrintErr(L" failed for "); - PrintErrMesg(name, ret); + PrintErrMesg(filename, ret); } return 1; @@ -531,7 +554,13 @@ static char *__init get_value(const struct file *cfg, const char *section, break; default: if ( match && strncmp(ptr, item, ilen) == 0 && ptr[ilen] == '=' ) - return ptr + ilen + 1; + { + ptr += ilen + 1; + /* strip off any leading spaces */ + while ( *ptr && isspace(*ptr) ) + ptr++; + return ptr; + } break; } ptr += strlen(ptr); @@ -539,16 +568,6 @@ static char *__init get_value(const struct file *cfg, const char *section, return NULL; } -static void __init split_value(char *s) -{ - while ( *s && isspace(*s) ) - ++s; - place_string(&mb_modules[mbi.mods_count].string, s); - while ( *s && !isspace(*s) ) - ++s; - *s = 0; -} - static void __init setup_efi_pci(void) { EFI_STATUS status; @@ -659,18 +678,19 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) EFI_LOADED_IMAGE *loaded_image; EFI_STATUS status; unsigned int i, argc; - CHAR16 **argv, *file_name, *cfg_file_name = NULL, *options = NULL; + CHAR16 **argv, *options = NULL; 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; + union string section = { NULL }, name, file_name, cfg_file_name = {NULL}; bool_t base_video = 0; UINT32 mmap_desc_ver = 0; UINTN mmap_size, mmap_desc_size, mmap_key = 0; void *mmap; + char *option_str; efi_ih = ImageHandle; efi_bs = SystemTable->BootServices; @@ -697,7 +717,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) trampoline_xen_phys_start = xen_phys_start; /* Get the file system interface. */ - dir_handle = get_parent_handle(loaded_image, &file_name); + dir_handle = get_parent_handle(loaded_image, &file_name.w); argc = get_argv(0, NULL, loaded_image->LoadOptions, loaded_image->LoadOptionsSize, &options); @@ -721,9 +741,9 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) if ( wstrcmp(ptr + 1, L"basevideo") == 0 ) base_video = 1; else if ( wstrncmp(ptr + 1, L"cfg=", 4) == 0 ) - cfg_file_name = ptr + 5; + cfg_file_name.w = ptr + 5; else if ( i + 1 < argc && wstrcmp(ptr + 1, L"cfg") == 0 ) - cfg_file_name = argv[++i]; + cfg_file_name.w = argv[++i]; else if ( wstrcmp(ptr + 1, L"help") == 0 || (ptr[1] == L'?' && !ptr[2]) ) { @@ -795,24 +815,24 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) gop = NULL; /* Read and parse the config file. */ - if ( !cfg_file_name ) + if ( !cfg_file_name.w ) { CHAR16 *tail; - while ( (tail = point_tail(file_name)) != NULL ) + while ( (tail = point_tail(file_name.w)) != NULL ) { wstrcpy(tail, L".cfg"); - if ( read_file(dir_handle, file_name, &cfg) ) + if ( read_file(dir_handle, &cfg, file_name.w, NULL) ) break; *tail = 0; } if ( !tail ) blexit(L"No configuration file found."); PrintStr(L"Using configuration file '"); - PrintStr(file_name); + PrintStr(file_name.w); PrintStr(L"'\r\n"); } - else if ( !read_file(dir_handle, cfg_file_name, &cfg) ) + else if ( !read_file(dir_handle, &cfg, cfg_file_name.w, NULL) ) blexit(L"Configuration file not found."); pre_parse(&cfg); @@ -831,7 +851,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) break; efi_bs->FreePages(cfg.addr, PFN_UP(cfg.size)); cfg.addr = 0; - if ( !read_file(dir_handle, s2w(&name), &cfg) ) + if ( !read_file(dir_handle, &cfg, s2w(&name), NULL) ) { PrintStr(L"Chained configuration file '"); PrintStr(name.w); @@ -846,8 +866,8 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) efi_arch_cfg_file_early(dir_handle, section.s); - split_value(name.s); - read_file(dir_handle, s2w(&name), &kernel); + option_str = split_string(name.s); + read_file(dir_handle, &kernel, s2w(&name), option_str); efi_bs->FreePool(name.w); if ( !EFI_ERROR(efi_bs->LocateProtocol(&shim_lock_guid, NULL, @@ -858,16 +878,16 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) name.s = get_value(&cfg, section.s, "ramdisk"); if ( name.s ) { - split_value(name.s); - read_file(dir_handle, s2w(&name), &ramdisk); + option_str = split_string(name.s); + read_file(dir_handle, &ramdisk, s2w(&name), option_str); efi_bs->FreePool(name.w); } name.s = get_value(&cfg, section.s, "xsm"); if ( name.s ) { - split_value(name.s); - read_file(dir_handle, s2w(&name), &xsm); + option_str = split_string(name.s); + read_file(dir_handle, &xsm, s2w(&name), option_str); efi_bs->FreePool(name.w); } diff --git a/xen/include/asm-x86/efi-boot.h b/xen/include/asm-x86/efi-boot.h index 2902970..3902b6c 100644 --- a/xen/include/asm-x86/efi-boot.h +++ b/xen/include/asm-x86/efi-boot.h @@ -267,6 +267,7 @@ static void __init efi_arch_cfg_file_early(EFI_FILE_HANDLE dir_handle, char *sec static void __init efi_arch_cfg_file_late(EFI_FILE_HANDLE dir_handle, char *section) { union string name; + char *options; name.s = get_value(&cfg, section, "ucode"); if ( !name.s ) @@ -274,8 +275,8 @@ static void __init efi_arch_cfg_file_late(EFI_FILE_HANDLE dir_handle, char *sect if ( name.s ) { microcode_set_module(mbi.mods_count); - split_value(name.s); - read_file(dir_handle, s2w(&name), &ucode); + options = split_string(name.s); + read_file(dir_handle, &ucode, s2w(&name), options); efi_bs->FreePool(name.w); } } @@ -575,3 +576,30 @@ static void __init efi_arch_memory(void) l3_bootmap[l3_table_offset(xen_phys_start + (8 << L2_PAGETABLE_SHIFT) - 1)] = l3e_from_paddr((UINTN)l2_bootmap, __PAGE_HYPERVISOR); } + +static void __init efi_arch_handle_module(struct file *file, const CHAR16 *name, + char *options) +{ + union string local_name; + void *ptr; + + /* + * Make a copy, as conversion is destructive, and caller still wants + * wide string available after this call returns. + */ + if ( efi_bs->AllocatePool(EfiLoaderData, (wstrlen(name) + 1) * sizeof(*name), + &ptr) != EFI_SUCCESS ) + blexit(L"ERROR Unable to allocate string buffer\r\n"); + + local_name.w = ptr; + wstrcpy(local_name.w, name); + w2s(&local_name); + + place_string(&mb_modules[mbi.mods_count].string, options); + place_string(&mb_modules[mbi.mods_count].string, ""); + place_string(&mb_modules[mbi.mods_count].string, local_name.s); + mb_modules[mbi.mods_count].mod_start = file->addr >> PAGE_SHIFT; + mb_modules[mbi.mods_count].mod_end = file->size; + ++mbi.mods_count; + efi_bs->FreePool(ptr); +}