From: tip-bot for David Howells <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: tglx@linutronix.de, torvalds@linux-foundation.org, hpa@zytor.com,
linux-kernel@vger.kernel.org, ard.biesheuvel@linaro.org,
matt@codeblueprint.co.uk, dhowells@redhat.com, mingo@kernel.org,
peterz@infradead.org
Subject: [tip:efi/core] efi: Print the secure boot status in x86 setup_arch()
Date: Tue, 7 Feb 2017 01:48:33 -0800 [thread overview]
Message-ID: <tip-9661b332041dab63ba2e5222b40a9f916c1368a9@git.kernel.org> (raw)
In-Reply-To: <1486380166-31868-7-git-send-email-ard.biesheuvel@linaro.org>
Commit-ID: 9661b332041dab63ba2e5222b40a9f916c1368a9
Gitweb: http://git.kernel.org/tip/9661b332041dab63ba2e5222b40a9f916c1368a9
Author: David Howells <dhowells@redhat.com>
AuthorDate: Mon, 6 Feb 2017 11:22:45 +0000
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 7 Feb 2017 10:42:10 +0100
efi: Print the secure boot status in x86 setup_arch()
Print the secure boot status in the x86 setup_arch() function, but otherwise do
nothing more for now. More functionality will be added later, but this at
least allows for testing.
Signed-off-by: David Howells <dhowells@redhat.com>
[ Use efi_enabled() instead of IS_ENABLED(CONFIG_EFI). ]
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Matt Fleming <matt@codeblueprint.co.uk>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-efi@vger.kernel.org
Link: http://lkml.kernel.org/r/1486380166-31868-7-git-send-email-ard.biesheuvel@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/kernel/setup.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 4cfba94..69780ed 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -1176,6 +1176,20 @@ void __init setup_arch(char **cmdline_p)
/* Allocate bigger log buffer */
setup_log_buf(1);
+ if (efi_enabled(EFI_BOOT)) {
+ switch (boot_params.secure_boot) {
+ case efi_secureboot_mode_disabled:
+ pr_info("Secure boot disabled\n");
+ break;
+ case efi_secureboot_mode_enabled:
+ pr_info("Secure boot enabled\n");
+ break;
+ default:
+ pr_info("Secure boot could not be determined\n");
+ break;
+ }
+ }
+
reserve_initrd();
acpi_table_upgrade();
next prev parent reply other threads:[~2017-02-07 9:49 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-06 11:22 [GIT PULL 0/7] EFI updates for v4.11 part 2 Ard Biesheuvel
2017-02-06 11:22 ` [PATCH 1/7] x86/efi: Allow invocation of arbitrary runtime services Ard Biesheuvel
2017-02-07 9:45 ` [tip:efi/core] " tip-bot for David Howells
2017-02-06 11:22 ` [PATCH 2/7] arm/efi: " Ard Biesheuvel
2017-02-07 9:46 ` [tip:efi/core] " tip-bot for David Howells
2017-02-06 11:22 ` [PATCH 3/7] efi: Add SHIM and image security database GUID definitions Ard Biesheuvel
2017-02-07 7:52 ` Ingo Molnar
2017-02-07 8:07 ` Ard Biesheuvel
2017-02-07 9:23 ` David Howells
2017-02-07 9:42 ` Ingo Molnar
2017-02-07 9:46 ` [tip:efi/core] " tip-bot for Josh Boyer
2017-02-06 11:22 ` [PATCH 4/7] efi: Get the secure boot status Ard Biesheuvel
2017-02-07 9:47 ` [tip:efi/core] efi: Get and store " tip-bot for David Howells
2017-02-06 11:22 ` [PATCH 5/7] efi: Disable secure boot if shim is in insecure mode Ard Biesheuvel
2017-02-07 9:48 ` [tip:efi/core] " tip-bot for Josh Boyer
2017-02-06 11:22 ` [PATCH 6/7] efi: Print the secure boot status in x86 setup_arch() Ard Biesheuvel
2017-02-07 9:48 ` tip-bot for David Howells [this message]
2017-02-06 11:22 ` [PATCH 7/7] efi: libstub: Make file I/O chunking x86-specific Ard Biesheuvel
2017-02-07 9:49 ` [tip:efi/core] efi/libstub: " tip-bot for Ard Biesheuvel
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-9661b332041dab63ba2e5222b40a9f916c1368a9@git.kernel.org \
--to=tipbot@zytor.com \
--cc=ard.biesheuvel@linaro.org \
--cc=dhowells@redhat.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=matt@codeblueprint.co.uk \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).