From patchwork Wed Aug 26 13:24:56 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 7077151 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5AD88C05AD for ; Wed, 26 Aug 2015 13:27:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 943452092F for ; Wed, 26 Aug 2015 13:27:10 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B459D2092B for ; Wed, 26 Aug 2015 13:27:09 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZUahr-0004hS-AR; Wed, 26 Aug 2015 13:25:35 +0000 Received: from mail-wi0-f181.google.com ([209.85.212.181]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZUahj-0004X0-Dz for linux-arm-kernel@lists.infradead.org; Wed, 26 Aug 2015 13:25:27 +0000 Received: by wicja10 with SMTP id ja10so44609605wic.1 for ; Wed, 26 Aug 2015 06:25:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=5rypC7Og+2JDnmRkh7WfB1nzqJFc5p243gX5MJhlROs=; b=ANRyRWJsN7S8HBaep8uSVgRaQU7T6B1tRe9HZXFiXzGeEsV5OnXggTeZG//i2Blt7x pG8STBxNy6Pz/BZpttQFATb54I+2uQMkKPx3FlC/0dtQNxa68p1jnnksRioeO3ESMA23 MdHdfciHckgTqLrXuZB2NXdcLXAjO6GNlxfm5ni9khLCNg6bwiQkTTWnNEaUmy4A1IIh TU3OeIeggC5lk+4KwCIe79wn0wRY8KdsFLMoAfQgXeOSX0DjKnm8i6joRA3ZYTUlsrBu R2nP9oZ/7/oI0g7xIFQf7thceVBISyZw9t5UtNy/L0DoimKqEIsSuinX4i6nkcuMu4ZK pWLw== X-Gm-Message-State: ALoCoQmDIzjZosGTvNUd72Qv+W2Whkt7v3/24OKJgVW1l5FU0+xd0t/y11UZZ7du2sKhPaeyH6Jr X-Received: by 10.194.236.161 with SMTP id uv1mr60328112wjc.158.1440595504720; Wed, 26 Aug 2015 06:25:04 -0700 (PDT) Received: from mohikan.mushroom.smurfnet.nu (cpc4-cmbg17-2-0-cust71.5-4.cable.virginm.net. [86.14.224.72]) by smtp.gmail.com with ESMTPSA id fs8sm7636540wib.0.2015.08.26.06.25.03 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 26 Aug 2015 06:25:04 -0700 (PDT) From: Leif Lindholm To: linux-efi@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/3] efi/x86: move efi=debug option parsing to core Date: Wed, 26 Aug 2015 14:24:56 +0100 Message-Id: <1440595498-30630-2-git-send-email-leif.lindholm@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1440595498-30630-1-git-send-email-leif.lindholm@linaro.org> References: <1440595498-30630-1-git-send-email-leif.lindholm@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150826_062527_623245_E146F7A9 X-CRM114-Status: GOOD ( 12.26 ) X-Spam-Score: -2.6 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: msalter@redhat.com, matt.fleming@intel.com, linux-kernel@vger.kernel.org, ard.biesheuvel@linaro.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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 e4308fe..9757b79 100644 --- a/arch/x86/platform/efi/efi.c +++ b/arch/x86/platform/efi/efi.c @@ -979,8 +979,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 d6144e3..78de0bd 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;