From patchwork Mon Oct 12 13:56:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Fleming X-Patchwork-Id: 54761 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by patches.linaro.org (Postfix) with ESMTPS id 039F522DB6 for ; Mon, 12 Oct 2015 13:58:57 +0000 (UTC) Received: by wicid10 with SMTP id id10sf10166532wic.2 for ; Mon, 12 Oct 2015 06:58:56 -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=V2C5qIfYOpS8dNJVgRW8La5b1lGCXd7FLAn+srWGAGY=; b=GX4hYv8W/Eoopojb/0ngBWMBtFQLSdsLhK+ixF7axOjnkY4moQEFXJ3mLHQLVKSRKD Gwo5uB/7nuO1h30R6IPIA4Hkn/r2CdTgv4s1lx2xcDTn5nYnowP6qRTW+hSvR+u+fB0O HgBKiys62t1Y11UJtxbc8Zk/ni4H6khlEVQBafIZs4PndZZl55jUJTDkUq3VvgLQcgDD LV3w2T9KM+SNAYb4x4bGUAXzbUP2zyPc9UAQXH2B6lLoHe9kxLYHHx0CZjViF0pyhLy4 sl5KBS42AbuJYN4P1TDgf2ATO1GI0d5DZKi61kpKmMPMzmdJ0i9BdDYQ2ymgN2X7tk6/ pjkw== X-Gm-Message-State: ALoCoQlNrq8TeZxqvS4P+ktg3NVql6LF4keWLUqS9t/NHeWqCwbMOoqbhGH5Y1NKaThJnsHUoPVR X-Received: by 10.112.190.74 with SMTP id go10mr2466808lbc.9.1444658335856; Mon, 12 Oct 2015 06:58:55 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.15.89 with SMTP id e86ls148811lfi.14.gmail; Mon, 12 Oct 2015 06:58:55 -0700 (PDT) X-Received: by 10.112.134.73 with SMTP id pi9mr12418006lbb.83.1444658335696; Mon, 12 Oct 2015 06:58:55 -0700 (PDT) Received: from mail-lb0-f169.google.com (mail-lb0-f169.google.com. [209.85.217.169]) by mx.google.com with ESMTPS id m7si11328727lbd.21.2015.10.12.06.58.55 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Oct 2015 06:58:55 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.169 as permitted sender) client-ip=209.85.217.169; Received: by lbcao8 with SMTP id ao8so144076431lbc.3 for ; Mon, 12 Oct 2015 06:58:55 -0700 (PDT) X-Received: by 10.112.180.230 with SMTP id dr6mr12581738lbc.72.1444658335543; Mon, 12 Oct 2015 06:58:55 -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 w3csp1564814lbq; Mon, 12 Oct 2015 06:58:54 -0700 (PDT) X-Received: by 10.107.132.144 with SMTP id o16mr27565237ioi.31.1444658334514; Mon, 12 Oct 2015 06:58:54 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l63si12111382ioi.153.2015.10.12.06.58.49; Mon, 12 Oct 2015 06:58:54 -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 S1752831AbbJLN6r (ORCPT + 30 others); Mon, 12 Oct 2015 09:58:47 -0400 Received: from mail-wi0-f169.google.com ([209.85.212.169]:35671 "EHLO mail-wi0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751842AbbJLN4W (ORCPT ); Mon, 12 Oct 2015 09:56:22 -0400 Received: by wicge5 with SMTP id ge5so151394171wic.0 for ; Mon, 12 Oct 2015 06:56:21 -0700 (PDT) X-Received: by 10.194.118.5 with SMTP id ki5mr29528735wjb.94.1444658180983; Mon, 12 Oct 2015 06:56:20 -0700 (PDT) Received: from localhost ([90.203.240.153]) by smtp.gmail.com with ESMTPSA id r4sm10980723wia.19.2015.10.12.06.56.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Oct 2015 06:56:20 -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 , Catalin Marinas , Will Deacon , Matt Fleming , Ard Biesheuvel Subject: [PATCH 03/11] arm64: Use core efi=debug instead of uefi_debug command line parameter Date: Mon, 12 Oct 2015 14:56:06 +0100 Message-Id: <1444658174-23378-4-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.169 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 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 Acked-by: Ard Biesheuvel Tested-by: Ard Biesheuvel Cc: Mark Salter Cc: Catalin Marinas Cc: Will Deacon Signed-off-by: Matt Fleming --- 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 d60030a1b909..7b3fdfe0f7ba 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 e8ca6eaedd02..612ad5ec1d2e 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;