Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

[~andy/linux] / include / linux / efi.h

diff --git a/include/linux/efi.h b/include/linux/efi.h
index e46d771f87e50095936a964fb564dd2a2c546c80..37c300712e025c2138f8627033b82ff9584683c6 100644 (file)
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -307,6 +307,12 @@ typedef efi_status_t efi_query_capsule_caps_t(efi_capsule_header_t **capsules,
 #define EFI_PCI_IO_PROTOCOL_GUID \
     EFI_GUID(  0x4cf5b200, 0x68b8, 0x4ca5, 0x9e, 0xec, 0xb2, 0x3e, 0x3f, 0x50, 0x2, 0x9a )
 
+#define EFI_FILE_INFO_ID \
+    EFI_GUID(  0x9576e92, 0x6d3f, 0x11d2, 0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b )
+
+#define EFI_FILE_SYSTEM_GUID \
+    EFI_GUID(  0x964e5b22, 0x6459, 0x11d2, 0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b )
+
 typedef struct {
        efi_guid_t guid;
        unsigned long table;
@@ -362,6 +368,40 @@ typedef struct {
        unsigned long unload;
 } efi_loaded_image_t;
 
+typedef struct {
+       u64 revision;
+       void *open_volume;
+} efi_file_io_interface_t;
+
+typedef struct {
+       u64 size;
+       u64 file_size;
+       u64 phys_size;
+       efi_time_t create_time;
+       efi_time_t last_access_time;
+       efi_time_t modification_time;
+       __aligned_u64 attribute;
+       efi_char16_t filename[1];
+} efi_file_info_t;
+
+typedef struct {
+       u64 revision;
+       void *open;
+       void *close;
+       void *delete;
+       void *read;
+       void *write;
+       void *get_position;
+       void *set_position;
+       void *get_info;
+       void *set_info;
+       void *flush;
+} efi_file_handle_t;
+
+#define EFI_FILE_MODE_READ     0x0000000000000001
+#define EFI_FILE_MODE_WRITE    0x0000000000000002
+#define EFI_FILE_MODE_CREATE   0x8000000000000000
+
 #define EFI_INVALID_TABLE_ADDR         (~0UL)
 
 /*
@@ -471,6 +511,13 @@ extern int __init efi_setup_pcdp_console(char *);
 #define EFI_VARIABLE_BOOTSERVICE_ACCESS 0x0000000000000002
 #define EFI_VARIABLE_RUNTIME_ACCESS     0x0000000000000004
 
+/*
+ * The type of search to perform when calling boottime->locate_handle
+ */
+#define EFI_LOCATE_ALL_HANDLES                 0
+#define EFI_LOCATE_BY_REGISTER_NOTIFY          1
+#define EFI_LOCATE_BY_PROTOCOL                 2
+
 /*
  * EFI Device Path information
  */