| Message ID | 1407823822-23829-1-git-send-email-dyoung@redhat.com |
|---|---|
| State | Accepted |
| Headers | show |
On 08/11/14 23:10, Dave Young wrote: > noefi param can be used for arches other than X86 later, thus move it out of > x86 platform code. > > Signed-off-by: Dave Young <dyoung@redhat.com> > --- > arch/x86/platform/efi/efi.c | 10 +--------- > drivers/firmware/efi/efi.c | 13 +++++++++++++ > include/linux/efi.h | 1 + > 3 files changed, 15 insertions(+), 9 deletions(-) This line in Documentation/kernel-parameters.txt needs to be updated: noefi [X86] Disable EFI runtime services support. > diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c > index 850da94..dd7aaa1 100644 > --- a/arch/x86/platform/efi/efi.c > +++ b/arch/x86/platform/efi/efi.c > @@ -70,14 +70,6 @@ static efi_config_table_type_t arch_tables[] __initdata = { > > u64 efi_setup; /* efi setup_data physical address */ > > -static bool disable_runtime __initdata = false; > -static int __init setup_noefi(char *arg) > -{ > - disable_runtime = true; > - return 0; > -} > -early_param("noefi", setup_noefi); > - > int add_efi_memmap; > EXPORT_SYMBOL(add_efi_memmap); > > @@ -492,7 +484,7 @@ void __init efi_init(void) > if (!efi_runtime_supported()) > pr_info("No EFI runtime due to 32/64-bit mismatch with kernel\n"); > else { > - if (disable_runtime || efi_runtime_init()) > + if (efi_runtime_disabled() || efi_runtime_init()) > return; > } > if (efi_memmap_init()) > diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c > index 64ecbb5..c8f01a7 100644 > --- a/drivers/firmware/efi/efi.c > +++ b/drivers/firmware/efi/efi.c > @@ -41,6 +41,19 @@ struct efi __read_mostly efi = { > }; > EXPORT_SYMBOL(efi); > > +static bool disable_runtime; > +static int __init setup_noefi(char *arg) > +{ > + disable_runtime = true; > + return 0; > +} > +early_param("noefi", setup_noefi); > + > +bool efi_runtime_disabled(void) > +{ > + return disable_runtime; > +} > + > static struct kobject *efi_kobj; > static struct kobject *efivars_kobj; > > diff --git a/include/linux/efi.h b/include/linux/efi.h > index 45cb4ff..06d7c03 100644 > --- a/include/linux/efi.h > +++ b/include/linux/efi.h > @@ -1227,4 +1227,5 @@ efi_status_t handle_cmdline_files(efi_system_table_t *sys_table_arg, > unsigned long *load_addr, > unsigned long *load_size); > > +bool efi_runtime_disabled(void); > #endif /* _LINUX_EFI_H */ >
On 08/11/14 at 11:52pm, Randy Dunlap wrote: > On 08/11/14 23:10, Dave Young wrote: > > noefi param can be used for arches other than X86 later, thus move it out of > > x86 platform code. > > > > Signed-off-by: Dave Young <dyoung@redhat.com> > > --- > > arch/x86/platform/efi/efi.c | 10 +--------- > > drivers/firmware/efi/efi.c | 13 +++++++++++++ > > include/linux/efi.h | 1 + > > 3 files changed, 15 insertions(+), 9 deletions(-) > > This line in Documentation/kernel-parameters.txt needs to be updated: > > noefi [X86] Disable EFI runtime services support. Randy, thanks Will update the documentation. Dave
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c index 850da94..dd7aaa1 100644 --- a/arch/x86/platform/efi/efi.c +++ b/arch/x86/platform/efi/efi.c @@ -70,14 +70,6 @@ static efi_config_table_type_t arch_tables[] __initdata = { u64 efi_setup; /* efi setup_data physical address */ -static bool disable_runtime __initdata = false; -static int __init setup_noefi(char *arg) -{ - disable_runtime = true; - return 0; -} -early_param("noefi", setup_noefi); - int add_efi_memmap; EXPORT_SYMBOL(add_efi_memmap); @@ -492,7 +484,7 @@ void __init efi_init(void) if (!efi_runtime_supported()) pr_info("No EFI runtime due to 32/64-bit mismatch with kernel\n"); else { - if (disable_runtime || efi_runtime_init()) + if (efi_runtime_disabled() || efi_runtime_init()) return; } if (efi_memmap_init()) diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c index 64ecbb5..c8f01a7 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -41,6 +41,19 @@ struct efi __read_mostly efi = { }; EXPORT_SYMBOL(efi); +static bool disable_runtime; +static int __init setup_noefi(char *arg) +{ + disable_runtime = true; + return 0; +} +early_param("noefi", setup_noefi); + +bool efi_runtime_disabled(void) +{ + return disable_runtime; +} + static struct kobject *efi_kobj; static struct kobject *efivars_kobj; diff --git a/include/linux/efi.h b/include/linux/efi.h index 45cb4ff..06d7c03 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -1227,4 +1227,5 @@ efi_status_t handle_cmdline_files(efi_system_table_t *sys_table_arg, unsigned long *load_addr, unsigned long *load_size); +bool efi_runtime_disabled(void); #endif /* _LINUX_EFI_H */
noefi param can be used for arches other than X86 later, thus move it out of x86 platform code. Signed-off-by: Dave Young <dyoung@redhat.com> --- arch/x86/platform/efi/efi.c | 10 +--------- drivers/firmware/efi/efi.c | 13 +++++++++++++ include/linux/efi.h | 1 + 3 files changed, 15 insertions(+), 9 deletions(-)