From patchwork Mon Oct 12 13:56:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Fleming X-Patchwork-Id: 54758 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by patches.linaro.org (Postfix) with ESMTPS id 2993B22DB6 for ; Mon, 12 Oct 2015 13:56:32 +0000 (UTC) Received: by lbcao8 with SMTP id ao8sf69871575lbc.1 for ; Mon, 12 Oct 2015 06:56:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=gKOOZl83IjJeaisjYl4smgFZWZ3w4xQTGo8ZctfMDjU=; b=IDxiZ3HEc5SyDf0gv3ceKQNZbSXEqWxSo7GLZU8sx3ZKMtdoxOK3HsRIYq7al84IgL eDVo+tKLcXKr28ha+WyebmgVhTvj2HyqRXlDfYR5kLI0x5lCtTKvSeMYec8VmSJJHVS3 ZvKz8f2MsY//fHGt3V8tCgTEq4+hQ9Ro2NzUlzCtDrFvC9Hmol1Fux3+TeOyLLiQupmc HLn9oO5RlUGUxPOjOA2Hp9gXpDugCHqhDUhEacTa41vbmejJB4LVeRCRDM0e9Uc1ATBx +wnBHGYVKkS9/jKMNNvvqFz6mY4Jr8HR4p9n9tl4iI4MVq3f6l+ARzhPmpu9WBg58hcN 66Tw== X-Gm-Message-State: ALoCoQkGSVd91ZHL0ba/4z99QtbyKISfzaT7ur5hc2+rKPisSd7I7CKsotG6kZwwwxUn+IaTaBk3 X-Received: by 10.180.105.98 with SMTP id gl2mr2919936wib.0.1444658191095; Mon, 12 Oct 2015 06:56:31 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.18.90 with SMTP id h87ls259539lfi.9.gmail; Mon, 12 Oct 2015 06:56:30 -0700 (PDT) X-Received: by 10.25.162.21 with SMTP id l21mr8325646lfe.70.1444658190900; Mon, 12 Oct 2015 06:56:30 -0700 (PDT) Received: from mail-lb0-f172.google.com (mail-lb0-f172.google.com. [209.85.217.172]) by mx.google.com with ESMTPS id vs4si4213292lbb.2.2015.10.12.06.56.30 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Oct 2015 06:56:30 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.172 as permitted sender) client-ip=209.85.217.172; Received: by lbbk10 with SMTP id k10so31597531lbb.0 for ; Mon, 12 Oct 2015 06:56:30 -0700 (PDT) X-Received: by 10.112.199.170 with SMTP id jl10mr7017551lbc.88.1444658190770; Mon, 12 Oct 2015 06:56:30 -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.59.35 with SMTP id w3csp1563807lbq; Mon, 12 Oct 2015 06:56:29 -0700 (PDT) X-Received: by 10.50.30.7 with SMTP id o7mr9263636igh.90.1444658189817; Mon, 12 Oct 2015 06:56:29 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y143si10975063iod.53.2015.10.12.06.56.29; Mon, 12 Oct 2015 06:56:29 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752253AbbJLN40 (ORCPT + 30 others); Mon, 12 Oct 2015 09:56:26 -0400 Received: from mail-wi0-f175.google.com ([209.85.212.175]:34064 "EHLO mail-wi0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751657AbbJLN4V (ORCPT ); Mon, 12 Oct 2015 09:56:21 -0400 Received: by wicgb1 with SMTP id gb1so51484717wic.1 for ; Mon, 12 Oct 2015 06:56:20 -0700 (PDT) X-Received: by 10.194.57.242 with SMTP id l18mr29753686wjq.34.1444658179511; Mon, 12 Oct 2015 06:56:19 -0700 (PDT) Received: from localhost ([90.203.240.153]) by smtp.gmail.com with ESMTPSA id mc20sm10999877wic.16.2015.10.12.06.56.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Oct 2015 06:56:19 -0700 (PDT) From: Matt Fleming To: Ingo Molnar , Thomas Gleixner , "H. Peter Anvin" Cc: Leif Lindholm , linux-kernel@vger.kernel.org, linux-efi@vger.kernel.org, Mark Salter , Borislav Petkov , Matt Fleming , Ard Biesheuvel Subject: [PATCH 02/11] efi/x86: Move efi=debug option parsing to core Date: Mon, 12 Oct 2015 14:56:05 +0100 Message-Id: <1444658174-23378-3-git-send-email-matt@codeblueprint.co.uk> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1444658174-23378-1-git-send-email-matt@codeblueprint.co.uk> References: <1444658174-23378-1-git-send-email-matt@codeblueprint.co.uk> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: matt@codeblueprint.co.uk 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.172 as permitted sender) smtp.mailfrom=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-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Leif Lindholm fed6cefe3b6e ("x86/efi: Add a "debug" option to the efi= cmdline") adds the DBG flag, but does so for x86 only. Move this early param parsing to core code. Signed-off-by: Leif Lindholm Acked-by: Ard Biesheuvel Tested-by: Ard Biesheuvel Cc: Mark Salter Cc: Borislav Petkov Signed-off-by: Matt Fleming --- arch/x86/platform/efi/efi.c | 2 -- drivers/firmware/efi/efi.c | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c index 2f61fcddcddb..4d0ff0f27a99 100644 --- a/arch/x86/platform/efi/efi.c +++ b/arch/x86/platform/efi/efi.c @@ -961,8 +961,6 @@ static int __init arch_parse_efi_cmdline(char *str) if (parse_option_str(str, "old_map")) set_bit(EFI_OLD_MEMMAP, &efi.flags); - if (parse_option_str(str, "debug")) - set_bit(EFI_DBG, &efi.flags); return 0; } diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c index 16c4928e36af..f0372a022c86 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -63,6 +63,9 @@ static int __init parse_efi_cmdline(char *str) return -EINVAL; } + if (parse_option_str(str, "debug")) + set_bit(EFI_DBG, &efi.flags); + if (parse_option_str(str, "noruntime")) disable_runtime = true;