From patchwork Thu Sep 25 01:42:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Franz X-Patchwork-Id: 37872 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f71.google.com (mail-wg0-f71.google.com [74.125.82.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E86DB20063 for ; Thu, 25 Sep 2014 01:44:16 +0000 (UTC) Received: by mail-wg0-f71.google.com with SMTP id y10sf4181462wgg.10 for ; Wed, 24 Sep 2014 18:44:16 -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=od2mgI69jHeKR40f1ZGgdKqT+7rQrmiWMmMKCnxZZOg=; b=HqYHTu04MFHQVJhgj5BN8VXIHPgVkVWEgdyxTdrpYN3ELi6F+WWqxe7Qh1S9FhCy60 aZjKP66Sed+QDgDOblD/QtNhsQVA0GB/E6wF0lb3ivhOXXI4dgLznVZl5EhQWmttNxo2 /tfPcA8qYQTu48r41nm9qK4lnY/T8InIVvgrkACB21/HFxfNKcJH6++Ga+6uNCXyPal3 tRMHtSH/g4LfefMd8lBtHOUNqwM7CEawwfSM55+cn8YveN+sIPiWimm8rrhWyKd0359U 7N/5ZgV7cr/pPkoOiaKAgTNEeOyCNhMrjCZqVeEGK7JgZcHBrzZTy7lN4UpaFPQO5pNV DwAQ== X-Gm-Message-State: ALoCoQlmJmszJqL+R6nUQKQ+P5Ro9kGBiH7qGIjvEpdBhyzkERZCv505q3wnJ3wlwYd9tGsdIro6 X-Received: by 10.180.74.14 with SMTP id p14mr4601112wiv.6.1411609456190; Wed, 24 Sep 2014 18:44:16 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.30.40 with SMTP id p8ls192757lah.106.gmail; Wed, 24 Sep 2014 18:44:16 -0700 (PDT) X-Received: by 10.152.170.194 with SMTP id ao2mr9795485lac.78.1411609455997; Wed, 24 Sep 2014 18:44:15 -0700 (PDT) Received: from mail-lb0-f182.google.com (mail-lb0-f182.google.com [209.85.217.182]) by mx.google.com with ESMTPS id j14si953104laa.71.2014.09.24.18.44.15 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 24 Sep 2014 18:44:15 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.182 as permitted sender) client-ip=209.85.217.182; Received: by mail-lb0-f182.google.com with SMTP id z11so2568lbi.13 for ; Wed, 24 Sep 2014 18:44:15 -0700 (PDT) X-Received: by 10.112.128.135 with SMTP id no7mr8952883lbb.74.1411609455879; Wed, 24 Sep 2014 18:44:15 -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 of9csp678182lbb; Wed, 24 Sep 2014 18:44:15 -0700 (PDT) X-Received: by 10.140.37.9 with SMTP id q9mr15054728qgq.40.1411609453302; Wed, 24 Sep 2014 18:44:13 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id n6si1036462qas.50.2014.09.24.18.44.12 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 24 Sep 2014 18:44:13 -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 1XWy5L-0001H2-4n; Thu, 25 Sep 2014 01:43:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWy5J-0001DX-5F for xen-devel@lists.xen.org; Thu, 25 Sep 2014 01:43:05 +0000 Received: from [85.158.139.211:49845] by server-15.bemta-5.messagelabs.com id DD/79-12002-82373245; Thu, 25 Sep 2014 01:43:04 +0000 X-Env-Sender: roy.franz@linaro.org X-Msg-Ref: server-8.tower-206.messagelabs.com!1411609382!11874338!1 X-Originating-IP: [209.85.213.173] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32558 invoked from network); 25 Sep 2014 01:43:03 -0000 Received: from mail-ig0-f173.google.com (HELO mail-ig0-f173.google.com) (209.85.213.173) by server-8.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 25 Sep 2014 01:43:03 -0000 Received: by mail-ig0-f173.google.com with SMTP id l13so7641088iga.6 for ; Wed, 24 Sep 2014 18:43:01 -0700 (PDT) X-Received: by 10.43.82.66 with SMTP id ab2mr15516922icc.56.1411609381839; Wed, 24 Sep 2014 18:43:01 -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 x9sm5829238igl.10.2014.09.24.18.43.00 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Sep 2014 18:43:01 -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: Wed, 24 Sep 2014 18:42:31 -0700 Message-Id: <1411609352-24549-14-git-send-email-roy.franz@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1411609352-24549-1-git-send-email-roy.franz@linaro.org> References: <1411609352-24549-1-git-send-email-roy.franz@linaro.org> Cc: Roy Franz , fu.wei@linaro.org Subject: [Xen-devel] [PATCH for-4.5 V7 13/14] Add efi_arch_use_config_file() function to control use of config 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.182 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 x86 EFI build of Xen always uses a configuration file to load modules, but the ARM version can either use a config file to specify the modules, or be loaded by GRUB in which case GRUB loads the modules and adds them to the DTB that is passed to Xen. Add the efi_arch_use_config_file() to indicate if a configuration file is required. For x86, this will always be true. ARM will examine the DTB passed via EFI configuration table (if any), and if it contains module information will use that that not use the configuration file at all. Add Emacs footer to efi-boot.h and boot.c Signed-off-by: Roy Franz Acked-by: Jan Beulich --- xen/arch/x86/efi/efi-boot.h | 14 ++++ xen/common/efi/boot.c | 179 +++++++++++++++++++++++--------------------- 2 files changed, 107 insertions(+), 86 deletions(-) diff --git a/xen/arch/x86/efi/efi-boot.h b/xen/arch/x86/efi/efi-boot.h index 5c79341..6663c34 100644 --- a/xen/arch/x86/efi/efi-boot.h +++ b/xen/arch/x86/efi/efi-boot.h @@ -616,3 +616,17 @@ static void __init efi_arch_load_addr_check(EFI_LOADED_IMAGE *loaded_image) blexit(L"Xen must be loaded at a 2Mb boundary."); trampoline_xen_phys_start = xen_phys_start; } + +static bool_t __init efi_arch_use_config_file(EFI_SYSTEM_TABLE *SystemTable) +{ + return 1; /* x86 always uses a config file */ +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 5c50243..432d3c2 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -691,7 +691,6 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) 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; bool_t base_video = 0; char *option_str; @@ -715,9 +714,6 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) efi_arch_load_addr_check(loaded_image); - /* Get the file system interface. */ - dir_handle = get_parent_handle(loaded_image, &file_name); - argc = get_argv(0, NULL, loaded_image->LoadOptions, loaded_image->LoadOptionsSize, NULL); if ( argc > 0 && @@ -813,109 +809,120 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) if ( EFI_ERROR(status) ) gop = NULL; - /* Read and parse the config file. */ - if ( !cfg_file_name ) + cols = rows = depth = 0; + if ( efi_arch_use_config_file(SystemTable) ) { - CHAR16 *tail; + EFI_FILE_HANDLE dir_handle; - while ( (tail = point_tail(file_name)) != NULL ) + /* Get the file system interface. */ + dir_handle = get_parent_handle(loaded_image, &file_name); + + /* Read and parse the config file. */ + if ( !cfg_file_name ) { - wstrcpy(tail, L".cfg"); - if ( read_file(dir_handle, file_name, &cfg, NULL) ) - break; - *tail = 0; + CHAR16 *tail; + + while ( (tail = point_tail(file_name)) != NULL ) + { + wstrcpy(tail, L".cfg"); + if ( read_file(dir_handle, file_name, &cfg, NULL) ) + break; + *tail = 0; + } + if ( !tail ) + blexit(L"No configuration file found."); + PrintStr(L"Using configuration file '"); + PrintStr(file_name); + PrintStr(L"'\r\n"); } - if ( !tail ) - blexit(L"No configuration file found."); - PrintStr(L"Using configuration file '"); - PrintStr(file_name); - PrintStr(L"'\r\n"); - } - else if ( !read_file(dir_handle, cfg_file_name, &cfg, NULL) ) - blexit(L"Configuration file not found."); - pre_parse(&cfg); + else if ( !read_file(dir_handle, cfg_file_name, &cfg, NULL) ) + blexit(L"Configuration file not found."); + pre_parse(&cfg); - if ( section.w ) - w2s(§ion); - else - section.s = get_value(&cfg, "global", "default"); + if ( section.w ) + w2s(§ion); + else + section.s = get_value(&cfg, "global", "default"); - for ( ; ; ) - { - name.s = get_value(&cfg, section.s, "kernel"); - if ( name.s ) - break; - name.s = get_value(&cfg, "global", "chain"); - if ( !name.s ) - break; - efi_bs->FreePages(cfg.addr, PFN_UP(cfg.size)); - cfg.addr = 0; - if ( !read_file(dir_handle, s2w(&name), &cfg, NULL) ) + for ( ; ; ) { - PrintStr(L"Chained configuration file '"); - PrintStr(name.w); + name.s = get_value(&cfg, section.s, "kernel"); + if ( name.s ) + break; + name.s = get_value(&cfg, "global", "chain"); + if ( !name.s ) + break; + efi_bs->FreePages(cfg.addr, PFN_UP(cfg.size)); + cfg.addr = 0; + if ( !read_file(dir_handle, s2w(&name), &cfg, NULL) ) + { + PrintStr(L"Chained configuration file '"); + PrintStr(name.w); + efi_bs->FreePool(name.w); + blexit(L"'not found."); + } + pre_parse(&cfg); efi_bs->FreePool(name.w); - blexit(L"'not found."); } - pre_parse(&cfg); - efi_bs->FreePool(name.w); - } - if ( !name.s ) - blexit(L"No Dom0 kernel image specified."); - - efi_arch_cfg_file_early(dir_handle, section.s); - option_str = split_string(name.s); - read_file(dir_handle, s2w(&name), &kernel, option_str); - efi_bs->FreePool(name.w); + if ( !name.s ) + blexit(L"No Dom0 kernel image specified."); - if ( !EFI_ERROR(efi_bs->LocateProtocol(&shim_lock_guid, NULL, - (void **)&shim_lock)) && - (status = shim_lock->Verify(kernel.ptr, kernel.size)) != EFI_SUCCESS ) - PrintErrMesg(L"Dom0 kernel image could not be verified", status); + efi_arch_cfg_file_early(dir_handle, section.s); - name.s = get_value(&cfg, section.s, "ramdisk"); - if ( name.s ) - { option_str = split_string(name.s); - read_file(dir_handle, s2w(&name), &ramdisk, option_str); + read_file(dir_handle, s2w(&name), &kernel, option_str); efi_bs->FreePool(name.w); - } - name.s = get_value(&cfg, section.s, "xsm"); - if ( name.s ) - { - option_str = split_string(name.s); - read_file(dir_handle, s2w(&name), &xsm, option_str); - efi_bs->FreePool(name.w); - } + if ( !EFI_ERROR(efi_bs->LocateProtocol(&shim_lock_guid, NULL, + (void **)&shim_lock)) && + (status = shim_lock->Verify(kernel.ptr, kernel.size)) != EFI_SUCCESS ) + PrintErrMesg(L"Dom0 kernel image could not be verified", status); - name.s = get_value(&cfg, section.s, "options"); - efi_arch_handle_cmdline(argc ? *argv : NULL, options, name.s); + name.s = get_value(&cfg, section.s, "ramdisk"); + if ( name.s ) + { + option_str = split_string(name.s); + read_file(dir_handle, s2w(&name), &ramdisk, option_str); + efi_bs->FreePool(name.w); + } - cols = rows = depth = 0; - if ( !base_video ) - { - name.cs = get_value(&cfg, section.s, "video"); - if ( !name.cs ) - name.cs = get_value(&cfg, "global", "video"); - if ( name.cs && !strncmp(name.cs, "gfx-", 4) ) + name.s = get_value(&cfg, section.s, "xsm"); + if ( name.s ) { - cols = simple_strtoul(name.cs + 4, &name.cs, 10); - if ( *name.cs == 'x' ) - rows = simple_strtoul(name.cs + 1, &name.cs, 10); - if ( *name.cs == 'x' ) - depth = simple_strtoul(name.cs + 1, &name.cs, 10); - if ( *name.cs ) - cols = rows = depth = 0; + option_str = split_string(name.s); + read_file(dir_handle, s2w(&name), &xsm, option_str); + efi_bs->FreePool(name.w); + } + + name.s = get_value(&cfg, section.s, "options"); + efi_arch_handle_cmdline(argc ? *argv : NULL, options, name.s); + + if ( !base_video ) + { + name.cs = get_value(&cfg, section.s, "video"); + if ( !name.cs ) + name.cs = get_value(&cfg, "global", "video"); + if ( name.cs && !strncmp(name.cs, "gfx-", 4) ) + { + cols = simple_strtoul(name.cs + 4, &name.cs, 10); + if ( *name.cs == 'x' ) + rows = simple_strtoul(name.cs + 1, &name.cs, 10); + if ( *name.cs == 'x' ) + depth = simple_strtoul(name.cs + 1, &name.cs, 10); + if ( *name.cs ) + cols = rows = depth = 0; + } } - } - efi_arch_cfg_file_late(dir_handle, section.s); - efi_bs->FreePages(cfg.addr, PFN_UP(cfg.size)); - cfg.addr = 0; + efi_arch_cfg_file_late(dir_handle, section.s); - dir_handle->Close(dir_handle); + efi_bs->FreePages(cfg.addr, PFN_UP(cfg.size)); + cfg.addr = 0; + + dir_handle->Close(dir_handle); + + } if ( gop && !base_video ) {