| Message ID | 1431893048-5214-39-git-send-email-parth.dixit@linaro.org |
|---|---|
| State | New |
| Headers | show |
+shannon On 20 May 2015 at 21:57, Jan Beulich <JBeulich@suse.com> wrote: >>>> On 17.05.15 at 22:04, <parth.dixit@linaro.org> wrote: >> @@ -104,6 +105,7 @@ static void __init parse_acpi_param(char *s) >> else if ( !strcmp(s, "force") ) >> { >> acpi_disabled = 0; >> + efi_enabled = 1; > > What has "acpi=force" to do with EFI? > >> --- a/xen/include/xen/efi.h >> +++ b/xen/include/xen/efi.h >> @@ -5,7 +5,7 @@ >> #include <xen/types.h> >> #endif >> >> -extern const bool_t efi_enabled; >> +extern bool_t efi_enabled; > > Doesn't this break the x86 build? > > Jan >
diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 80364bb..9741113 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -47,6 +47,7 @@ #include <asm/setup.h> #include <xsm/xsm.h> #include <asm/acpi.h> +#include <xen/efi.h> struct bootinfo __initdata bootinfo; @@ -104,6 +105,7 @@ static void __init parse_acpi_param(char *s) else if ( !strcmp(s, "force") ) { acpi_disabled = 0; + efi_enabled = 1; } } #endif diff --git a/xen/common/efi/runtime.c b/xen/common/efi/runtime.c index 5ed8b01..fb8c0d0 100644 --- a/xen/common/efi/runtime.c +++ b/xen/common/efi/runtime.c @@ -11,7 +11,7 @@ DEFINE_XEN_GUEST_HANDLE(CHAR16); #ifndef COMPAT #ifdef CONFIG_ARM /* Disabled until runtime services implemented */ -const bool_t efi_enabled = 0; +bool_t efi_enabled = 0; #else # include <asm/i387.h> # include <asm/xstate.h> diff --git a/xen/include/xen/efi.h b/xen/include/xen/efi.h index 9fdc72b..448d41d 100644 --- a/xen/include/xen/efi.h +++ b/xen/include/xen/efi.h @@ -5,7 +5,7 @@ #include <xen/types.h> #endif -extern const bool_t efi_enabled; +extern bool_t efi_enabled; #define EFI_INVALID_TABLE_ADDR (~0UL) #define EFI_MEM_DESC_V1 1
efi should be enabled to fetch the root pointer from uefi Signed-off-by: Parth Dixit <parth.dixit@linaro.org> --- xen/arch/arm/setup.c | 2 ++ xen/common/efi/runtime.c | 2 +- xen/include/xen/efi.h | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-)