Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3846c158 authored Jun 05, 2015 by Peter Jones Committed by Matt Fleming Jun 08, 2015

efi: Work around ia64 build problem with ESRT driver



So, I'm told this problem exists in the world:

 > Subject: Build error in -next due to 'efi: Add esrt support'
 >
 > Building ia64:defconfig ... failed
 > --------------
 > Error log:
 >
 > drivers/firmware/efi/esrt.c:28:31: fatal error: asm/early_ioremap.h: No such file or directory
 >

I'm not really sure how it's okay that we have things in asm-generic on
some platforms but not others - is having it the same everywhere not the
whole point of asm-generic?

That said, ia64 doesn't have early_ioremap.h .  So instead, since it's
difficult to imagine new IA64 machines with UEFI 2.5, just don't build
this code there.

To me this looks like a workaround - doing something like:

generic-y += early_ioremap.h

in arch/ia64/include/asm/Kbuild would appear to be more correct, but
ia64 has its own early_memremap() decl in arch/ia64/include/asm/io.h ,
and it's a macro.  So adding the above /and/ requiring that asm/io.h be
included /after/ asm/early_ioremap.h in all cases would fix it, but
that's pretty ugly as well.  Since I'm not going to spend the rest of my
life rectifying ia64 headers vs "generic" headers that aren't generic,
it's much simpler to just not build there.

Note that I've only actually tried to build this patch on x86_64, but
esrt.o still gets built there, and that would seem to demonstrate that
the conditional building is working correctly at all the places the code
built before.  I no longer have any ia64 machines handy to test that the
exclusion actually works there.

Signed-off-by: Peter Jones <pjones@redhat.com>
Acked-by: Tony Luck <tony.luck@intel.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
(Compile-)Tested-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>

parent c208358c

drivers/firmware/efi/Kconfig

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -18,6 +18,11 @@ config EFI_VARS
	Subsequent efibootmgr releases may be found at:		Subsequent efibootmgr releases may be found at:
	<http://github.com/vathpela/efibootmgr>		<http://github.com/vathpela/efibootmgr>

			config EFI_ESRT
			bool
			depends on EFI && !IA64
			default y

	config EFI_VARS_PSTORE		config EFI_VARS_PSTORE
	tristate "Register efivars backend for pstore"		tristate "Register efivars backend for pstore"
	depends on EFI_VARS && PSTORE		depends on EFI_VARS && PSTORE

drivers/firmware/efi/Makefile

+2 −1

Original line number	Original line	Diff line number	Diff line
	#		#
	# Makefile for linux kernel		# Makefile for linux kernel
	#		#
	obj-$(CONFIG_EFI) += efi.o esrt.o vars.o reboot.o		obj-$(CONFIG_EFI) += efi.o vars.o reboot.o
	obj-$(CONFIG_EFI_VARS) += efivars.o		obj-$(CONFIG_EFI_VARS) += efivars.o
			obj-$(CONFIG_EFI_ESRT) += esrt.o
	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
	obj-$(CONFIG_EFI_RUNTIME_MAP) += runtime-map.o		obj-$(CONFIG_EFI_RUNTIME_MAP) += runtime-map.o

include/linux/efi.h

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -879,7 +879,11 @@ 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);
			#ifdef CONFIG_EFI_ESRT
	extern void __init efi_esrt_init(void);		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,		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);