x86, efi: Allow basic init with mixed 32/64-bit efi/kernel

Traditionally the kernel has refused to setup EFI at all if there's been
a mismatch in 32/64-bit mode between EFI and the kernel.

On some platforms that boot natively through EFI (Chrome OS being one),
we still need to get at least some of the static data such as memory
configuration out of EFI. Runtime services aren't as critical, and
it's a significant amount of work to implement switching between the
operating modes to call between kernel and firmware for thise cases. So
I'm ignoring it for now.

v5:
* Fixed some printk strings based on feedback
* Renamed 32/64-bit specific types to not have _ prefix
* Fixed bug in printout of efi runtime disablement

v4:
* Some of the earlier cleanup was accidentally reverted by this patch, fixed.
* Reworded some messages to not have to line wrap printk strings

v3:
* Reorganized to a series of patches to make it easier to review, and
  do some of the cleanups I had left out before.

v2:
* Added graceful error handling for 32-bit kernel that gets passed
  EFI data above 4GB.
* Removed some warnings that were missed in first version.

Signed-off-by: Olof Johansson <olof@lixom.net>
Link: http://lkml.kernel.org/r/1329081869-20779-6-git-send-email-olof@lixom.net
Signed-off-by: H. Peter Anvin <hpa@zytor.com>

1 files changed, 45 insertions, 0 deletions

diff --git a/include/linux/efi.h b/include/linux/efi.h
index 37c300712e02..47fbf6b3dc77 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -315,6 +315,16 @@ typedef efi_status_t efi_query_capsule_caps_t(efi_capsule_header_t **capsules,
 
 typedef struct {
         efi_guid_t guid;
+        u64 table;
+} efi_config_table_64_t;
+
+typedef struct {
+        efi_guid_t guid;
+        u32 table;
+} efi_config_table_32_t;
+
+typedef struct {
+        efi_guid_t guid;
         unsigned long table;
 } efi_config_table_t;
 
@@ -329,6 +339,40 @@ typedef struct {
 
 typedef struct {
         efi_table_hdr_t hdr;
+        u64 fw_vendor;  /* physical addr of CHAR16 vendor string */
+        u32 fw_revision;
+        u32 __pad1;
+        u64 con_in_handle;
+        u64 con_in;
+        u64 con_out_handle;
+        u64 con_out;
+        u64 stderr_handle;
+        u64 stderr;
+        u64 runtime;
+        u64 boottime;
+        u32 nr_tables;
+        u32 __pad2;
+        u64 tables;
+} efi_system_table_64_t;
+
+typedef struct {
+        efi_table_hdr_t hdr;
+        u32 fw_vendor;  /* physical addr of CHAR16 vendor string */
+        u32 fw_revision;
+        u32 con_in_handle;
+        u32 con_in;
+        u32 con_out_handle;
+        u32 con_out;
+        u32 stderr_handle;
+        u32 stderr;
+        u32 runtime;
+        u32 boottime;
+        u32 nr_tables;
+        u32 tables;
+} efi_system_table_32_t;
+
+typedef struct {
+        efi_table_hdr_t hdr;
         unsigned long fw_vendor;        /* physical addr of CHAR16 vendor string */
         u32 fw_revision;
         unsigned long con_in_handle;
@@ -497,6 +541,7 @@ extern int __init efi_setup_pcdp_console(char *);
 #ifdef CONFIG_EFI
 # ifdef CONFIG_X86
    extern int efi_enabled;
+   extern bool efi_64bit;
 # else
 #  define efi_enabled 1
 # endif