From patchwork Wed Aug 26 13:24:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 7077161 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id AAE1A9F305 for ; Wed, 26 Aug 2015 13:27:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D38032092C for ; Wed, 26 Aug 2015 13:27:25 +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 0C8F92092B for ; Wed, 26 Aug 2015 13:27:25 +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 1ZUahz-0004kg-Ei; Wed, 26 Aug 2015 13:25:43 +0000 Received: from mail-wi0-f182.google.com ([209.85.212.182]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZUahj-0004Wz-E2 for linux-arm-kernel@lists.infradead.org; Wed, 26 Aug 2015 13:25:28 +0000 Received: by wicja10 with SMTP id ja10so44610136wic.1 for ; Wed, 26 Aug 2015 06:25:05 -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=sXEfB+m1Nyyi/7lKphUSQ+JOPFMF3aq/ipEhEYLbyAk=; b=B99cmJJLSDrgBUyuHJ/7RuRAS5PvEsuD/D55Fjr2jzy3Iw49bKObA8WutJKtgjJtVp HkAV0pedOqINWHmfCPuwUxgRs1cqn0gKKquDCNWFZ2Z42X+wEUXsPHhN9/n/fxiXqhGw dQUsZaQlzot7i9aE+eV5Jd+LJt5cl612Wz3mUhzJ/tymei3H4rIaDH3ebWB+HYmqM8Dk ucOWXxeT8E6I/KqDiNpCYk+/Y5/s1ThFBvknkUOZ05PLkCSAssyXP/WPjXGNudmFXxhs nj7LsU3c5rkrpsA4n9m6kzKX2weKM4Go95nfw7byHFLYNICHipAY18OvFLz18QzLC4bD 4QrQ== X-Gm-Message-State: ALoCoQlGAsd1UtUwl9+acpblnw4C0C/HxoVX/GJgtPM8GXffZMMAu+eQ5rTqi1uOD/YpchZM3pru X-Received: by 10.194.184.82 with SMTP id es18mr60288627wjc.79.1440595505683; Wed, 26 Aug 2015 06:25:05 -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.04 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 26 Aug 2015 06:25:05 -0700 (PDT) From: Leif Lindholm To: linux-efi@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/3] arm64: use core efi=debug instead of uefi_debug command line parameter Date: Wed, 26 Aug 2015 14:24:57 +0100 Message-Id: <1440595498-30630-3-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_626095_6FE86204 X-CRM114-Status: GOOD ( 14.43 ) 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 Now that we have an efi=debug command line option in the core code, use this instead of the arm64-specific uefi_debug option. Signed-off-by: Leif Lindholm --- Documentation/arm/uefi.txt | 2 -- arch/arm64/kernel/efi.c | 19 +++++-------------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/Documentation/arm/uefi.txt b/Documentation/arm/uefi.txt index d60030a..7b3fdfe 100644 --- a/Documentation/arm/uefi.txt +++ b/Documentation/arm/uefi.txt @@ -60,5 +60,3 @@ linux,uefi-mmap-desc-ver | 32-bit | Version of the mmap descriptor format. -------------------------------------------------------------------------------- linux,uefi-stub-kern-ver | string | Copy of linux_banner from build. -------------------------------------------------------------------------------- - -For verbose debug messages, specify 'uefi_debug' on the kernel command line. diff --git a/arch/arm64/kernel/efi.c b/arch/arm64/kernel/efi.c index e8ca6ea..612ad5e 100644 --- a/arch/arm64/kernel/efi.c +++ b/arch/arm64/kernel/efi.c @@ -51,15 +51,6 @@ static struct mm_struct efi_mm = { INIT_MM_CONTEXT(efi_mm) }; -static int uefi_debug __initdata; -static int __init uefi_debug_setup(char *str) -{ - uefi_debug = 1; - - return 0; -} -early_param("uefi_debug", uefi_debug_setup); - static int __init is_normal_ram(efi_memory_desc_t *md) { if (md->attribute & EFI_MEMORY_WB) @@ -171,14 +162,14 @@ static __init void reserve_regions(void) efi_memory_desc_t *md; u64 paddr, npages, size; - if (uefi_debug) + if (efi_enabled(EFI_DBG)) pr_info("Processing EFI memory map:\n"); for_each_efi_memory_desc(&memmap, md) { paddr = md->phys_addr; npages = md->num_pages; - if (uefi_debug) { + if (efi_enabled(EFI_DBG)) { char buf[64]; pr_info(" 0x%012llx-0x%012llx %s", @@ -194,11 +185,11 @@ static __init void reserve_regions(void) if (is_reserve_region(md)) { memblock_reserve(paddr, size); - if (uefi_debug) + if (efi_enabled(EFI_DBG)) pr_cont("*"); } - if (uefi_debug) + if (efi_enabled(EFI_DBG)) pr_cont("\n"); } @@ -210,7 +201,7 @@ void __init efi_init(void) struct efi_fdt_params params; /* Grab UEFI information placed in FDT by stub */ - if (!efi_get_fdt_params(¶ms, uefi_debug)) + if (!efi_get_fdt_params(¶ms, efi_enabled(EFI_DBG))) return; efi_system_table = params.system_table;