From patchwork Fri Oct 24 00:16:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Franz X-Patchwork-Id: 39398 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f198.google.com (mail-lb0-f198.google.com [209.85.217.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3F01324022 for ; Fri, 24 Oct 2014 00:19:02 +0000 (UTC) Received: by mail-lb0-f198.google.com with SMTP id 10sf1179104lbg.1 for ; Thu, 23 Oct 2014 17:19:00 -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: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=dQiJcZ0Q9kriq1ls27bys336H42pe/6EFnweoov40Xg=; b=O4h17Qn6FXVKn7v0PTvG/WfiVACzfE/FfKVcim3s/gu0Ej2n26y+GRWUHzgTRwFVXY 4LEYup7vQfBR8MJKgKV9kkX54z3Rg5YpIrzXnwXgrgrROfX8EezdwYeq6rReyKWbv+6w qcBJlyjJOBjzZejQuDcsi2N86xSP5d1IV9giNDrW94v1Lu+4Ey8luV39iroG5BznECtB qgwT4xQn1Xr1Ou9XrNTlgiql0zoixdYujZl7XaZWuAa+yp9I2+x3C4yGR1ETnBwVWJtM T4E2zbfKBEAejzFkBqXqiaKdTQoLTY1ErVxu6sc/yFDveTYRkGbhqA98QUTn4yuk3fUL 70qg== X-Gm-Message-State: ALoCoQkUCzLP0qBWcMqj78r9CGUAA61GwzRXJzK4MjNEisqjtMrv3SBIalg+w9kRr7aXDFnwoxIm X-Received: by 10.152.1.133 with SMTP id 5mr198919lam.8.1414109939694; Thu, 23 Oct 2014 17:18:59 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.18.202 with SMTP id y10ls383828lad.51.gmail; Thu, 23 Oct 2014 17:18:59 -0700 (PDT) X-Received: by 10.152.8.12 with SMTP id n12mr777291laa.51.1414109939507; Thu, 23 Oct 2014 17:18:59 -0700 (PDT) Received: from mail-la0-f52.google.com (mail-la0-f52.google.com. [209.85.215.52]) by mx.google.com with ESMTPS id j15si4776820lbg.30.2014.10.23.17.18.59 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 23 Oct 2014 17:18:59 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.52 as permitted sender) client-ip=209.85.215.52; Received: by mail-la0-f52.google.com with SMTP id hz20so1755587lab.39 for ; Thu, 23 Oct 2014 17:18:59 -0700 (PDT) X-Received: by 10.112.147.225 with SMTP id tn1mr792195lbb.37.1414109938916; Thu, 23 Oct 2014 17:18:58 -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.84.229 with SMTP id c5csp346374lbz; Thu, 23 Oct 2014 17:18:58 -0700 (PDT) X-Received: by 10.224.32.65 with SMTP id b1mr1447217qad.30.1414109937703; Thu, 23 Oct 2014 17:18:57 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id cz6si5414063qcb.41.2014.10.23.17.18.57 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 23 Oct 2014 17:18:57 -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 1XhSYg-0004N6-06; Fri, 24 Oct 2014 00:16:46 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XhSYe-0004N1-J9 for xen-devel@lists.xen.org; Fri, 24 Oct 2014 00:16:44 +0000 Received: from [193.109.254.147:63066] by server-2.bemta-14.messagelabs.com id 95/6D-07861-B6A99445; Fri, 24 Oct 2014 00:16:43 +0000 X-Env-Sender: roy.franz@linaro.org X-Msg-Ref: server-2.tower-27.messagelabs.com!1414109801!12149365!1 X-Originating-IP: [209.85.192.173] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29598 invoked from network); 24 Oct 2014 00:16:43 -0000 Received: from mail-pd0-f173.google.com (HELO mail-pd0-f173.google.com) (209.85.192.173) by server-2.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 24 Oct 2014 00:16:43 -0000 Received: by mail-pd0-f173.google.com with SMTP id v10so415019pde.4 for ; Thu, 23 Oct 2014 17:16:41 -0700 (PDT) X-Received: by 10.68.220.133 with SMTP id pw5mr788421pbc.129.1414109801045; Thu, 23 Oct 2014 17:16:41 -0700 (PDT) Received: from rfranz-i7.local (c-24-10-97-91.hsd1.ca.comcast.net. [24.10.97.91]) by mx.google.com with ESMTPSA id r1sm2447777pdp.95.2014.10.23.17.16.39 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Oct 2014 17:16:40 -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 Date: Thu, 23 Oct 2014 17:16:22 -0700 Message-Id: <1414109782-22961-1-git-send-email-roy.franz@linaro.org> X-Mailer: git-send-email 1.9.1 Cc: Roy Franz , fu.wei@linaro.org Subject: [Xen-devel] [PATCH for-4.5] EFI: Always use EFI command line 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.215.52 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: This patch changes the ARM EFI boot code to always use the EFI commandline, even when loaded by GRUB, which makes it consistent with Linux EFI booting. The code previously incorrectly skipped processing of the EFI command line when modules are present in the loader supplied FDT and the config file is not used. There is no change in behavior for x86 since it unconditionally uses the config file. Signed-off-by: Roy Franz --- xen/common/efi/boot.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 4257341..c0d6768 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -702,7 +702,7 @@ 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; - union string section = { NULL }, name; + union string section = { NULL }, name, cfg_options = { NULL }; bool_t base_video = 0; char *option_str; @@ -904,8 +904,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) efi_bs->FreePool(name.w); } - name.s = get_value(&cfg, section.s, "options"); - efi_arch_handle_cmdline(argc ? *argv : NULL, options, name.s); + cfg_options.s = get_value(&cfg, section.s, "options"); if ( !base_video ) { @@ -930,8 +929,8 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) cfg.addr = 0; dir_handle->Close(dir_handle); - } + efi_arch_handle_cmdline(argc ? *argv : NULL, options, cfg_options.s); if ( gop && !base_video ) {