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: 52727 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-io0-f198.google.com (mail-io0-f198.google.com [209.85.223.198]) by patches.linaro.org (Postfix) with ESMTPS id 3A03E22E9E for ; Wed, 26 Aug 2015 13:26:03 +0000 (UTC) Received: by iofe124 with SMTP id e124sf31958515iof.2 for ; Wed, 26 Aug 2015 06:26:02 -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=NpbIl+aMRkTubDRxl/rLRWvvIJvLlJX9/N/GOZuHPOA=; b=JB5xw5r9qQNSyi4zizD7LAYPRyEzqzsnrZdFwSqlJiB9Kzoru1h767quVvC+Z0/+Dp sVW2WmbPcGm6871vQIW32c/1/jpvyOkKT35OBXPa9cpbQSJVokn0ePShxbHZz65AoEM7 nSmr6ADdXycd6qnR50TqtELSx1pXHupVy4BTHR1pM6h+rdMtc8CW6eMMmV3eSbzDSm5y rwzLQJ7dL290uo/8WA779A9O/9XZAnoVk+R8ity3DN7KU1DLAK7MqN6c7+i+2Ua7gID5 F0bAXcK2uWF8NLIqe9xGFDNd+maATXFkuaJY1M2HcLO9K8pvedzCiGvA/8eqtXPd+Bvi YtZg== X-Gm-Message-State: ALoCoQm/vJmd8mKV9dbVNDdgoKYNRws4aBmSTwXZjXp2pPNB3rQtFozZO4rr5JOjjbcImBi4/fK6 X-Received: by 10.182.50.170 with SMTP id d10mr33952361obo.48.1440595562671; Wed, 26 Aug 2015 06:26:02 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.182.63.17 with SMTP id c17ls4674050obs.14.gmail; Wed, 26 Aug 2015 06:26:02 -0700 (PDT) X-Received: by 10.170.130.130 with SMTP id w124mr6739876ykb.8.1440595562561; Wed, 26 Aug 2015 06:26:02 -0700 (PDT) Received: from mail-qk0-f176.google.com (mail-qk0-f176.google.com. [209.85.220.176]) by mx.google.com with ESMTPS id j64si32807046qgd.125.2015.08.26.06.26.02 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 Aug 2015 06:26:02 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.176 as permitted sender) client-ip=209.85.220.176; Received: by qkfh127 with SMTP id h127so119390294qkf.1 for ; Wed, 26 Aug 2015 06:26:02 -0700 (PDT) X-Received: by 10.55.19.31 with SMTP id d31mr13548901qkh.37.1440595562434; Wed, 26 Aug 2015 06:26:02 -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.55.75.207 with SMTP id y198csp1423785qka; Wed, 26 Aug 2015 06:26:01 -0700 (PDT) X-Received: by 10.68.134.169 with SMTP id pl9mr70137190pbb.164.1440595561358; Wed, 26 Aug 2015 06:26:01 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ta10si17072919pab.211.2015.08.26.06.26.00; Wed, 26 Aug 2015 06:26:01 -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 S1756736AbbHZNZ7 (ORCPT + 28 others); Wed, 26 Aug 2015 09:25:59 -0400 Received: from mail-wi0-f173.google.com ([209.85.212.173]:38194 "EHLO mail-wi0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755952AbbHZNZG (ORCPT ); Wed, 26 Aug 2015 09:25:06 -0400 Received: by wicja10 with SMTP id ja10so15327415wic.1 for ; Wed, 26 Aug 2015 06:25:05 -0700 (PDT) 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 Cc: linux-kernel@vger.kernel.org, matt.fleming@intel.com, ard.biesheuvel@linaro.org, msalter@redhat.com 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> 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: leif.lindholm@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.220.176 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: , 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;