x86, efi: Make "noefi" really disable EFI runtime serivces
Subsystems (3)
PATCH 1/1 x86, efi: Make "noefi" really disable EFI runtime serivces
From: Matt Fleming <[email protected]>
commit 1de63d60cd5b ("efi: Clear EFI_RUNTIME_SERVICES rather than EFI_BOOT by "noefi" boot parameter") attempted to make "noefi" true to its documentation and disable EFI runtime services to prevent the bricking bug described in commit e0094244e41c ("samsung-laptop:
Disable on EFI hardware"). However, it's not possible to clear EFI_RUNTIME_SERVICES from an early param function because EFI_RUNTIME_SERVICES is set in efi_init() *after* parse_early_param().
This resulted in "noefi" effectively becoming a no-op and no longer providing users with a way to disable EFI, which is bad for those users that have buggy machines.
--- arch/x86/platform/efi/efi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
arch/x86/platform/efi/efi.c +3 -2
@@ -85,9 +85,10 @@ int efi_enabled(int facility) }EXPORT_SYMBOL (efi_enabled); +static bool disable_runtime = false;static int __init setup_noefi (char *arg) { -clear_bit (EFI_RUNTIME_SERVICES , &x86_efi_facility); + disable_runtime = true;return 0 ; }early_param ("noefi" , setup_noefi);
@@ -734,7 +735,7 @@ void __init efi_init(void)if (!efi_is_native ())pr_info ("No EFI runtime due to 32/64-bit mismatch with kernel\n" );else { -if (efi_runtime_init ()) +if (disable_runtime ||efi_runtime_init ())return ;set_bit (EFI_RUNTIME_SERVICES , &x86_efi_facility); }
Signature · 1 line
1.7.11.7
tip-bot for Matt Fleming
merge botx86, efi: Make "noefi" really disable EFI runtime serivces
Commit-ID: fb834c7acc5e140cf4f9e86da93a66de8c0514da Gitweb: http://git.kernel.org/tip/fb834c7acc5e140cf4f9e86da93a66de8c0514da Author: Matt Fleming <[email protected]> AuthorDate: Wed, 20 Feb 2013 20:36:12 +0000 Committer: H. Peter Anvin <[email protected]> CommitDate: Wed, 20 Feb 2013 13:18:36 -0800
x86, efi: Make "noefi" really disable EFI runtime serivces
commit 1de63d60cd5b ("efi: Clear EFI_RUNTIME_SERVICES rather than EFI_BOOT by "noefi" boot parameter") attempted to make "noefi" true to its documentation and disable EFI runtime services to prevent the bricking bug described in commit e0094244e41c ("samsung-laptop:
Disable on EFI hardware"). However, it's not possible to clear EFI_RUNTIME_SERVICES from an early param function because EFI_RUNTIME_SERVICES is set in efi_init() *after* parse_early_param().
This resulted in "noefi" effectively becoming a no-op and no longer providing users with a way to disable EFI, which is bad for those users that have buggy machines.
--- arch/x86/platform/efi/efi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
arch/x86/platform/efi/efi.c +3 -2
@@ -85,9 +85,10 @@ int efi_enabled(int facility) }EXPORT_SYMBOL (efi_enabled); +static bool disable_runtime = false;static int __init setup_noefi (char *arg) { -clear_bit (EFI_RUNTIME_SERVICES , &x86_efi_facility); + disable_runtime = true;return 0 ; }early_param ("noefi" , setup_noefi);
@@ -734,7 +735,7 @@ void __init efi_init(void)if (!efi_is_native ())pr_info ("No EFI runtime due to 32/64-bit mismatch with kernel\n" );else { -if (efi_runtime_init ()) +if (disable_runtime ||efi_runtime_init ())return ;set_bit (EFI_RUNTIME_SERVICES , &x86_efi_facility); }
Quoted 36 lines · tip-bot for Matt Fleming
Commit-ID: fb834c7acc5e140cf4f9e86da93a66de8c0514da Gitweb: http://git.kernel.org/tip/fb834c7acc5e140cf4f9e86da93a66de8c0514da Author: Matt Fleming <[email protected]> AuthorDate: Wed, 20 Feb 2013 20:36:12 +0000 Committer: H. Peter Anvin <[email protected]> CommitDate: Wed, 20 Feb 2013 13:18:36 -0800x86, efi: Make "noefi" really disable EFI runtime serivces
commit
1de63d60cd5b("efi: ClearEFI_RUNTIME_SERVICESrather thanEFI_BOOTby "noefi" boot parameter") attempted to make "noefi" true to its documentation and disable EFI runtime services to prevent the bricking bug described in commite0094244e41c("samsung-laptop:
Disable on EFI hardware"). However, it's not possible to clearEFI_RUNTIME_SERVICESfrom an early param function becauseEFI_RUNTIME_SERVICESis set inefi_init()*after*parse_early_param().This resulted in "noefi" effectively becoming a no-op and no longer providing users with a way to disable EFI, which is bad for those users that have buggy machines.
Reported-by Walt Nelson Jr <[email protected]>Cc Satoru Takeuchi <[email protected]>Cc <[email protected]>Signed-off-by Matt Fleming <[email protected]>Signed-off-by H. Peter Anvin <[email protected]>--- arch/x86/platform/efi/efi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)arch/x86/platform/efi/efi.c +0
-0
arch/x86/platform/efi/efi.c int efi_enabled(int facility) · line 88
Quoted 4 lines
arch/x86/platform/efi/efi.c +1
-0@@ -85,9 +85,10 @@ int efi_enabled(int facility) }EXPORT_SYMBOL (efi_enabled); +static bool disable_runtime = false;
__initdata please.
Quoted 21 lines
arch/x86/platform/efi/efi.c +2
-3static int __init setup_noefi (char *arg) { -clear_bit (EFI_RUNTIME_SERVICES , &x86_efi_facility); + disable_runtime = true;return 0 ; }early_param ("noefi" , setup_noefi);@@ -734,7 +735,7 @@ void __init efi_init(void)if (!efi_is_native ())pr_info ("No EFI runtime due to 32/64-bit mismatch with kernel\n" );else { -if (efi_runtime_init ()) +if (disable_runtime ||efi_runtime_init ())return ;set_bit (EFI_RUNTIME_SERVICES , &x86_efi_facility); } --To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Quoted 11 lines · Yinghai Lu
arch/x86/platform/efi/efi.c int efi_enabled(int facility) · line 88
Quoted 9 lines
arch/x86/platform/efi/efi.c +1
-0@@ -85,9 +85,10 @@ int efi_enabled(int facility) }EXPORT_SYMBOL (efi_enabled); +static bool disable_runtime = false;
__initdataplease.
Sure. Peter, please drop this. I'll submit a v2.
Quoted 9 lines · Matt Fleming
Quoted 8 lines · Yinghai Lu
Quoted 8 lines
arch/x86/platform/efi/efi.c +0
-0@@ -85,9 +85,10 @@ int efi_enabled(int facility) }EXPORT_SYMBOL (efi_enabled);
Quoted 6 lines
Quoted 3 lines
arch/x86/platform/efi/efi.c int efi_enabled(int facility) · line 88
Quoted 1 line
arch/x86/platform/efi/efi.c +1
-0+static bool disable_runtime = false;
__initdataplease.Sure. Peter, please drop this. I'll submit a v2.
Just do an incremental, please.
-hpa
Hi Matt,
Quoted 10 lines · Matt Fleming
From: Matt Fleming <[email protected]>
commit
1de63d60cd5b("efi: ClearEFI_RUNTIME_SERVICESrather thanEFI_BOOTby "noefi" boot parameter") attempted to make "noefi" true to its documentation and disable EFI runtime services to prevent the bricking bug described in commite0094244e41c("samsung-laptop:
Disable on EFI hardware"). However, it's not possible to clearEFI_RUNTIME_SERVICESfrom an early param function becauseEFI_RUNTIME_SERVICESis set inefi_init()*after*parse_early_param().
Quoted 3 lines
This resulted in "noefi" effectively becoming a no-op and no longer providing users with a way to disable EFI, which is bad for those users that have buggy machines.
Sorry, my patch was imperfect. This patch looks good to me.
Thanks,
Satoru
Quoted 36 lines
Reported-by Walt Nelson Jr <[email protected]>Cc Satoru Takeuchi <[email protected]>Cc H. Peter Anvin <hpa-VuQAYsv1563Yd54FQh9/[email protected]>Cc <[email protected]>Signed-off-by Matt Fleming <[email protected]>--- arch/x86/platform/efi/efi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)arch/x86/platform/efi/efi.c +3
-2@@ -85,9 +85,10 @@ int efi_enabled(int facility) }EXPORT_SYMBOL (efi_enabled); +static bool disable_runtime = false;static int __init setup_noefi (char *arg) { -clear_bit (EFI_RUNTIME_SERVICES , &x86_efi_facility); + disable_runtime = true;return 0 ; }early_param ("noefi" , setup_noefi);@@ -734,7 +735,7 @@ void __init efi_init(void)if (!efi_is_native ())pr_info ("No EFI runtime due to 32/64-bit mismatch with kernel\n" );else { -if (efi_runtime_init ()) +if (disable_runtime ||efi_runtime_init ())return ;set_bit (EFI_RUNTIME_SERVICES , &x86_efi_facility); }
Quoted 3 lines · Satoru Takeuchi
Sorry, my patch was imperfect. This patch looks good to me.
Perfection is something very rarely achieved. That's why we work with gradual improvements.
-hpa