LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: tip-bot for Borislav Petkov <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: dyoung@redhat.com, lersek@redhat.com, hpa@zytor.com, bp@suse.de,
	matt.fleming@intel.com, mingo@kernel.org,
	linux-kernel@vger.kernel.org, tglx@linutronix.de
Subject: [tip:core/efi] x86/efi: Add a "debug" option to the efi= cmdline
Date: Thu, 2 Apr 2015 05:27:01 -0700	[thread overview]
Message-ID: <tip-fed6cefe3b6e862dcc74d07324478caa07e84eaf@git.kernel.org> (raw)
In-Reply-To: <20141209095843.GA3990@pd.tnic>

Commit-ID:  fed6cefe3b6e862dcc74d07324478caa07e84eaf
Gitweb:     http://git.kernel.org/tip/fed6cefe3b6e862dcc74d07324478caa07e84eaf
Author:     Borislav Petkov <bp@suse.de>
AuthorDate: Thu, 5 Feb 2015 11:44:41 +0100
Committer:  Matt Fleming <matt.fleming@intel.com>
CommitDate: Wed, 1 Apr 2015 12:46:22 +0100

x86/efi: Add a "debug" option to the efi= cmdline

... and hide the memory regions dump behind it. Make it default-off.

Signed-off-by: Borislav Petkov <bp@suse.de>
Link: http://lkml.kernel.org/r/20141209095843.GA3990@pd.tnic
Acked-by: Laszlo Ersek <lersek@redhat.com>
Acked-by: Dave Young <dyoung@redhat.com>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
---
 Documentation/kernel-parameters.txt | 3 ++-
 arch/x86/platform/efi/efi.c         | 5 ++++-
 include/linux/efi.h                 | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index bfcb1a6..01aa47d 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1036,7 +1036,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 			Format: {"off" | "on" | "skip[mbr]"}
 
 	efi=		[EFI]
-			Format: { "old_map", "nochunk", "noruntime" }
+			Format: { "old_map", "nochunk", "noruntime", "debug" }
 			old_map [X86-64]: switch to the old ioremap-based EFI
 			runtime services mapping. 32-bit still uses this one by
 			default.
@@ -1044,6 +1044,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 			boot stub, as chunking can cause problems with some
 			firmware implementations.
 			noruntime : disable EFI runtime services support
+			debug: enable misc debug output
 
 	efi_no_storage_paranoia [EFI; X86]
 			Using this parameter you can use more than 50% of
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index dbc8627..e859d56 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -491,7 +491,8 @@ void __init efi_init(void)
 	if (efi_memmap_init())
 		return;
 
-	print_efi_memmap();
+	if (efi_enabled(EFI_DBG))
+		print_efi_memmap();
 }
 
 void __init efi_late_init(void)
@@ -939,6 +940,8 @@ 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/include/linux/efi.h b/include/linux/efi.h
index cf7e431..af5be03 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -942,6 +942,7 @@ extern int __init efi_setup_pcdp_console(char *);
 #define EFI_64BIT		5	/* Is the firmware 64-bit? */
 #define EFI_PARAVIRT		6	/* Access is via a paravirt interface */
 #define EFI_ARCH_1		7	/* First arch-specific bit */
+#define EFI_DBG			8	/* Print additional debug info at runtime */
 
 #ifdef CONFIG_EFI
 /*

      parent reply	other threads:[~2015-04-02 12:27 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-12-09  9:58 Shorten efi regions output Borislav Petkov
2014-12-09 12:42 ` Ard Biesheuvel
2014-12-09 12:48   ` Borislav Petkov
2014-12-09 15:35 ` Laszlo Ersek
2014-12-09 16:45   ` Borislav Petkov
2014-12-10  2:17 ` Dave Young
2014-12-10 10:46   ` Borislav Petkov
2015-01-05 14:03     ` Matt Fleming
2015-01-05 15:00       ` Laszlo Ersek
2015-01-21  5:48         ` Jon Masters
2015-01-21 10:06           ` Borislav Petkov
2015-01-26 10:49             ` Matt Fleming
2015-01-30 16:43               ` [PATCH] efi, x86: Add a "debug" option to the efi= cmdline Borislav Petkov
2015-01-30 16:58                 ` Laszlo Ersek
2015-01-30 18:06                 ` Randy Dunlap
2015-01-30 21:17                   ` Borislav Petkov
2015-02-04 12:18                   ` Parmeshwr Prasad
2015-02-05  3:18                 ` Dave Young
2015-02-05  8:11                   ` Borislav Petkov
2015-02-05  8:41                     ` Dave Young
2015-02-05 10:44                       ` [PATCH v2] " Borislav Petkov
2015-02-05 12:45                         ` Parmeshwr Prasad
2015-02-05 14:28                           ` Borislav Petkov
2015-02-06  6:00                             ` Parmeshwr Prasad
2015-02-06 10:49                               ` Borislav Petkov
2015-02-24 22:33                         ` Matt Fleming
2015-04-02 12:27 ` tip-bot for Borislav Petkov [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tip-fed6cefe3b6e862dcc74d07324478caa07e84eaf@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=bp@suse.de \
    --cc=dyoung@redhat.com \
    --cc=hpa@zytor.com \
    --cc=lersek@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=matt.fleming@intel.com \
    --cc=mingo@kernel.org \
    --cc=tglx@linutronix.de \
    --subject='Re: [tip:core/efi] x86/efi: Add a "debug" option to the efi= cmdline' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).