x86 EFI changes for v4.2
Subsystems (3)
Linus,
Please pull the latest x86-efi-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-efi-for-linus
# HEAD: d4f7743542f20c2b20b68bba856c281ba9c84e42 Merge tag 'efi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi into x86/efi
EFI changes:
- Use idiomatic negative error values in efivar_create_sysfs_entry() instead of returning '1' to indicate error. (Dan Carpenter)
- Implement new support to expose the EFI System Resource Tables in sysfs, which provides information for performing firmware updates. (Peter Jones)
- Documentation cleanup in the EFI handover protocol section which falsely claimed that 'cmdline_size' needed to be filled out by the boot loader. (Alex Smith)
- Align the order of SMBIOS tables in /sys/firmware/efi/systab to match the way that we do things for ACPI and add documentation to Documentation/ABI. (Jean Delvare)
out-of-topic modifications in x86-efi-for-linus:
--------------------------------------------------
drivers/firmware/efi/Kconfig # 3846c15820a1: efi: Work around ia64 build
drivers/firmware/efi/Makefile # 3846c15820a1: efi: Work around ia64 build
# 0bb549052d33: efi: Add esrt support
drivers/firmware/efi/efi.c # b119fe080a83: efi: dmi: List SMBIOS3 table
# 0bb549052d33: efi: Add esrt support
drivers/firmware/efi/efivars.c # f7ef7e3e5060: efi: efivar_create_sysfs_ent
drivers/firmware/efi/esrt.c # f2f6b587c553: efi/esrt: Fix some compiler
# 0bb549052d33: efi: Add esrt supportThanks,
Ingo
------------------>
Alex Smith (1):
x86, doc: Remove cmdline_size from list of fields to be filled in for EFI handover
Dan Carpenter (1):
efi: efivar_create_sysfs_entry() should return negative error codes
Jean Delvare (1):
efi: dmi: List SMBIOS3 table before SMBIOS table
Matt Fleming (1):
efi: Add 'systab' information to Documentation/ABI
Peter Jones (3):
efi: Add esrt support
efi/esrt: Fix some compiler warnings
efi: Work around ia64 build problem with ESRT driver
Documentation/ABI/testing/sysfs-firmware-efi | 10 + Documentation/ABI/testing/sysfs-firmware-efi-esrt | 81 ++++ Documentation/x86/boot.txt | 1 - arch/x86/platform/efi/efi.c | 2 + drivers/firmware/efi/Kconfig | 5 + drivers/firmware/efi/Makefile | 1 + drivers/firmware/efi/efi.c | 91 ++++- drivers/firmware/efi/efivars.c | 11 +- drivers/firmware/efi/esrt.c | 471 ++++++++++++++++++++++ include/linux/efi.h | 12 + 10 files changed, 676 insertions(+), 9 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-firmware-efi-esrt create mode 100644 drivers/firmware/efi/esrt.c
Documentation/ABI/testing/sysfs-firmware-efi +10 -0
@@ -18,3 +18,13 @@ Contact: Dave Young <[email protected]> Description: It shows the physical address of config table entry in the EFI system table. Users: Kexec + +What: /sys/firmware/efi/systab +Date: April 2005 +Contact: [email protected] +Description: Displays the physical addresses of all EFI Configuration + Tables found via the EFI System Table. The order in + which the tables are printed forms an ABI and newer + versions are always printed first, i.e. ACPI20 comes + before ACPI. +Users: dmidecode
Documentation/ABI/testing/sysfs-firmware-efi-esrt new file +81 -0
81 lines not on this page · raw message
Documentation/x86/boot.txt +0 -1
@@ -1124,7 +1124,6 @@ The boot loader *must* fill out the following fields in bp, o hdr.code32_start o hdr.cmd_line_ptr - o hdr.cmdline_size o hdr.ramdisk_image (if applicable) o hdr.ramdisk_size (if applicable)
arch/x86/platform/efi/efi.c +2 -0
@@ -501,6 +501,8 @@ void __init efi_init(void)if (efi_enabled (EFI_DBG ))print_efi_memmap (); + +efi_esrt_init (); }void __init efi_late_init (void )
drivers/firmware/efi/Kconfig +5 -0
@@ -18,6 +18,11 @@ config EFI_VARS Subsequent efibootmgr releases may be found at: <http://github.com/vathpela/efibootmgr> +config EFI_ESRT + bool + depends on EFI && !IA64 + default y + config EFI_VARS_PSTORE tristate "Register efivars backend for pstore" depends on EFI_VARS && PSTORE
drivers/firmware/efi/Makefile +1 -0
@@ -3,6 +3,7 @@ # obj-$(CONFIG_EFI) += efi.o vars.o reboot.o obj-$(CONFIG_EFI_VARS) += efivars.o +obj-$(CONFIG_EFI_ESRT) += esrt.o obj-$(CONFIG_EFI_VARS_PSTORE) += efi-pstore.o obj-$(CONFIG_UEFI_CPER) += cper.o obj-$(CONFIG_EFI_RUNTIME_MAP) += runtime-map.o
drivers/firmware/efi/efi.c +88 -3
123 lines not on this page · raw message
drivers/firmware/efi/efivars.c +6 -5
@@ -535,7 +535,7 @@ static ssize_t efivar_delete(struct file *filp, struct kobject *kobj,* efivar_create_sysfs_entry - create a new entry in sysfs * @new_var: efivar entry to create * -* Returns 1 on failure, 0 on success +* Returns 0 on success, negative error code on failure */ static int efivar_create_sysfs_entry (struct efivar_entry *new_var)
@@ -544,6 +544,7 @@ efivar_create_sysfs_entry(struct efivar_entry *new_var)char *short_name;unsigned long variable_name_size;efi_char16_t *variable_name; +int ret; variable_name = new_var->var.VariableName; variable_name_size =ucs2_strlen (variable_name) *sizeof (efi_char16_t);
@@ -558,7 +559,7 @@ efivar_create_sysfs_entry(struct efivar_entry *new_var) short_name =kzalloc (short_name_size,GFP_KERNEL );if (!short_name) -return 1 ; +return -ENOMEM ;/* Convert Unicode to normal chars (assume top bits are 0), ala UTF-8 */
@@ -574,11 +575,11 @@ efivar_create_sysfs_entry(struct efivar_entry *new_var) new_var->kobj.kset = efivars_kset; - i =kobject_init_and_add (&new_var->kobj, &efivar_ktype, + ret =kobject_init_and_add (&new_var->kobj, &efivar_ktype,NULL ,"%s" , short_name);kfree (short_name); -if (i) -return 1 ; +if (ret) +return ret;kobject_uevent (&new_var->kobj,KOBJ_ADD );efivar_entry_add (new_var, &efivar_sysfs_list);
drivers/firmware/efi/esrt.c new file +471 -0
471 lines not on this page · raw message
include/linux/efi.h +12 -0
@@ -583,6 +583,9 @@ void efi_native_runtime_setup(void);#define EFI_FILE_INFO_ID \ EFI_GUID( 0x9576e92, 0x6d3f, 0x11d2, 0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b ) +#define EFI_SYSTEM_RESOURCE_TABLE_GUID \ + EFI_GUID( 0xb122a263, 0x3661, 0x4f68, 0x99, 0x29, 0x78, 0xf8, 0xb0, 0xd6, 0x21, 0x80 ) +#define EFI_FILE_SYSTEM_GUID \ EFI_GUID( 0x964e5b22, 0x6459, 0x11d2, 0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b )
@@ -823,6 +826,7 @@ extern struct efi {unsigned long fw_vendor;/* fw_vendor */ unsigned long runtime;/* runtime table */ unsigned long config_table;/* config tables */ +unsigned long esrt;/* ESRT table */ efi_get_time_t *get_time;efi_set_time_t *set_time;efi_get_wakeup_time_t *get_wakeup_time;
@@ -875,6 +879,11 @@ static inline efi_status_t efi_query_variable_store(u32 attributes, unsigned lon#endif extern void __iomem *efi_lookup_mapped_addr (u64 phys_addr);extern int efi_config_init (efi_config_table_type_t *arch_tables); +#ifdef CONFIG_EFI_ESRT +extern void __init efi_esrt_init (void ); +#else +static inline void efi_esrt_init (void ) { } +#endif extern int efi_config_parse_tables (void *config_tables,int count,int sz,efi_config_table_type_t *arch_tables);extern u64 efi_get_iobase (void );
@@ -882,12 +891,15 @@ extern u32 efi_mem_type (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 int __init efi_uart_console_only (void ); +extern u64 efi_mem_desc_end (efi_memory_desc_t *md); +extern int efi_mem_desc_lookup (u64 phys_addr,efi_memory_desc_t *out_md);extern void efi_initialize_iomem_resources (struct resource *code_resource,struct resource *data_resource,struct resource *bss_resource);extern void efi_get_time (struct timespec *now);extern void efi_reserve_boot_services (void );extern int efi_get_fdt_params (struct efi_fdt_params *params,int verbose);extern struct efi_memory_map memmap; +extern struct kobject *efi_kobj;extern int efi_reboot_quirk_mode;extern bool efi_poweroff_required (void );
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in Please read the FAQ at http://www.tux.org/lkml/