rpms/kernel
9
2
Fork 4
Code Issues Pull Requests Releases Activity

Refresh esrt from exploded git tree

Browse Source
This commit is contained in:
Josh Boyer 2015-04-01 08:39:24 -04:00
parent 9adfc18494
commit 2850957a12
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
efi-Add-esrt-support.patch
View File

@ -1,4 +1,3 @@
From 47a69c76881e80f353676a3fde1d668adf894eb3 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com> From: Peter Jones <pjones@redhat.com>
Date: Tue, 18 Nov 2014 10:18:22 -0500 Date: Tue, 18 Nov 2014 10:18:22 -0500
Subject: [PATCH] efi: Add esrt support. Subject: [PATCH] efi: Add esrt support.
@ -38,7 +37,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
diff --git a/Documentation/ABI/testing/sysfs-firmware-efi-esrt b/Documentation/ABI/testing/sysfs-firmware-efi-esrt diff --git a/Documentation/ABI/testing/sysfs-firmware-efi-esrt b/Documentation/ABI/testing/sysfs-firmware-efi-esrt
new file mode 100644 new file mode 100644
index 0000000..6e431d1 index 000000000000..6e431d1a4e79
--- /dev/null --- /dev/null
+++ b/Documentation/ABI/testing/sysfs-firmware-efi-esrt +++ b/Documentation/ABI/testing/sysfs-firmware-efi-esrt
@@ -0,0 +1,81 @@ @@ -0,0 +1,81 @@
@ -124,7 +123,7 @@ index 0000000..6e431d1
+ 6 - Battery power event + 6 - Battery power event
+ +
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index dbc8627..b4c9fbb 100644 index dbc8627a5cdf..b4c9fbbc9270 100644
--- a/arch/x86/platform/efi/efi.c --- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c +++ b/arch/x86/platform/efi/efi.c
@@ -492,6 +492,8 @@ void __init efi_init(void) @@ -492,6 +492,8 @@ void __init efi_init(void)
@ -137,7 +136,7 @@ index dbc8627..b4c9fbb 100644
void __init efi_late_init(void) void __init efi_late_init(void)
diff --git a/drivers/firmware/efi/Makefile b/drivers/firmware/efi/Makefile diff --git a/drivers/firmware/efi/Makefile b/drivers/firmware/efi/Makefile
index d8be608..26eabbc 100644 index d8be608a9f3b..26eabbc55341 100644
--- a/drivers/firmware/efi/Makefile --- a/drivers/firmware/efi/Makefile
+++ b/drivers/firmware/efi/Makefile +++ b/drivers/firmware/efi/Makefile
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
@ -150,7 +149,7 @@ index d8be608..26eabbc 100644
obj-$(CONFIG_EFI_VARS_PSTORE) += efi-pstore.o obj-$(CONFIG_EFI_VARS_PSTORE) += efi-pstore.o
obj-$(CONFIG_UEFI_CPER) += cper.o obj-$(CONFIG_UEFI_CPER) += cper.o
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
index 3061bb8..48b4c35 100644 index 3061bb8629dc..48b4c356740f 100644
--- a/drivers/firmware/efi/efi.c --- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c
@@ -39,6 +39,7 @@ struct efi __read_mostly efi = { @@ -39,6 +39,7 @@ struct efi __read_mostly efi = {
@ -265,7 +264,7 @@ index 3061bb8..48b4c35 100644
diff --git a/drivers/firmware/efi/esrt.c b/drivers/firmware/efi/esrt.c diff --git a/drivers/firmware/efi/esrt.c b/drivers/firmware/efi/esrt.c
new file mode 100644 new file mode 100644
index 0000000..20c0cbd index 000000000000..20c0cbdb1c60
--- /dev/null --- /dev/null
+++ b/drivers/firmware/efi/esrt.c +++ b/drivers/firmware/efi/esrt.c
@@ -0,0 +1,464 @@ @@ -0,0 +1,464 @@
@ -734,7 +733,7 @@ index 0000000..20c0cbd
+MODULE_DESCRIPTION("EFI System Resource Table support"); +MODULE_DESCRIPTION("EFI System Resource Table support");
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
diff --git a/include/linux/efi.h b/include/linux/efi.h diff --git a/include/linux/efi.h b/include/linux/efi.h
index cf7e431..bb12adf 100644 index 470e8dfcb517..c15e1de5273c 100644
--- a/include/linux/efi.h --- a/include/linux/efi.h
+++ b/include/linux/efi.h +++ b/include/linux/efi.h
@@ -583,6 +583,9 @@ void efi_native_runtime_setup(void); @@ -583,6 +583,9 @@ void efi_native_runtime_setup(void);
@ -747,7 +746,7 @@ index cf7e431..bb12adf 100644
#define EFI_FILE_SYSTEM_GUID \ #define EFI_FILE_SYSTEM_GUID \
EFI_GUID( 0x964e5b22, 0x6459, 0x11d2, 0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b ) EFI_GUID( 0x964e5b22, 0x6459, 0x11d2, 0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b )
@@ -823,6 +826,7 @@ extern struct efi { @@ -849,6 +852,7 @@ extern struct efi {
unsigned long fw_vendor; /* fw_vendor */ unsigned long fw_vendor; /* fw_vendor */
unsigned long runtime; /* runtime table */ unsigned long runtime; /* runtime table */
unsigned long config_table; /* config tables */ unsigned long config_table; /* config tables */
@ -755,7 +754,7 @@ index cf7e431..bb12adf 100644
efi_get_time_t *get_time; efi_get_time_t *get_time;
efi_set_time_t *set_time; efi_set_time_t *set_time;
efi_get_wakeup_time_t *get_wakeup_time; efi_get_wakeup_time_t *get_wakeup_time;
@@ -875,6 +879,7 @@ static inline efi_status_t efi_query_variable_store(u32 attributes, unsigned lon @@ -901,6 +905,7 @@ static inline efi_status_t efi_query_variable_store(u32 attributes, unsigned lon
#endif #endif
extern void __iomem *efi_lookup_mapped_addr(u64 phys_addr); extern void __iomem *efi_lookup_mapped_addr(u64 phys_addr);
extern int efi_config_init(efi_config_table_type_t *arch_tables); extern int efi_config_init(efi_config_table_type_t *arch_tables);
@ -763,7 +762,7 @@ index cf7e431..bb12adf 100644
extern int efi_config_parse_tables(void *config_tables, int count, int sz, extern int efi_config_parse_tables(void *config_tables, int count, int sz,
efi_config_table_type_t *arch_tables); efi_config_table_type_t *arch_tables);
extern u64 efi_get_iobase (void); extern u64 efi_get_iobase (void);
@@ -882,12 +887,15 @@ extern u32 efi_mem_type (unsigned long phys_addr); @@ -908,12 +913,15 @@ extern u32 efi_mem_type (unsigned long phys_addr);
extern u64 efi_mem_attributes (unsigned long phys_addr); extern u64 efi_mem_attributes (unsigned long phys_addr);
extern u64 efi_mem_attribute (unsigned long phys_addr, unsigned long size); extern u64 efi_mem_attribute (unsigned long phys_addr, unsigned long size);
extern int __init efi_uart_console_only (void); extern int __init efi_uart_console_only (void);