42d2805
From 04e65e01058ed6357b932e64b19e4bf762f04970 Mon Sep 17 00:00:00 2001
6a91557
From: Josh Boyer <jwboyer@fedoraproject.org>
6a91557
Date: Tue, 27 Aug 2013 13:33:03 -0400
42d2805
Subject: [PATCH 2/9] efi: Add EFI_SECURE_BOOT bit
6a91557
6a91557
UEFI machines can be booted in Secure Boot mode.  Add a EFI_SECURE_BOOT bit
6a91557
for use with efi_enabled.
6a91557
6a91557
Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
6a91557
---
6a91557
 arch/x86/kernel/setup.c | 2 ++
6a91557
 include/linux/efi.h     | 1 +
6a91557
 2 files changed, 3 insertions(+)
6a91557
6a91557
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
42d2805
index bdb9881c7afd..a666b6c29c77 100644
6a91557
--- a/arch/x86/kernel/setup.c
6a91557
+++ b/arch/x86/kernel/setup.c
42d2805
@@ -1154,7 +1154,9 @@ void __init setup_arch(char **cmdline_p)
6a91557
 
6a91557
 #ifdef CONFIG_EFI_SECURE_BOOT_SIG_ENFORCE
6a91557
 	if (boot_params.secure_boot) {
6a91557
+		set_bit(EFI_SECURE_BOOT, &efi.flags);
6a91557
 		enforce_signed_modules();
6a91557
+		pr_info("Secure boot enabled\n");
6a91557
 	}
6a91557
 #endif
6a91557
 
6a91557
diff --git a/include/linux/efi.h b/include/linux/efi.h
42d2805
index c2db3ca22217..8cb38cfcba74 100644
6a91557
--- a/include/linux/efi.h
6a91557
+++ b/include/linux/efi.h
42d2805
@@ -1062,6 +1062,7 @@ extern int __init efi_setup_pcdp_console(char *);
6a91557
 #define EFI_ARCH_1		7	/* First arch-specific bit */
b18e6e7
 #define EFI_DBG			8	/* Print additional debug info at runtime */
7c1bce7
 #define EFI_NX_PE_DATA		9	/* Can runtime data regions be mapped non-executable? */
7c1bce7
+#define EFI_SECURE_BOOT		10	/* Are we in Secure Boot mode? */
6a91557
 
6a91557
 #ifdef CONFIG_EFI
6a91557
 /*
18c8249
-- 
42d2805
2.5.5
18c8249