leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Followup fixes for EFI:

Browse Source 
- fix the build breakage on IA64 caused by recent capsule loader changes
 - suppress a type mismatch build warning in the expansion of
   EFI_PHYS_ALIGN on ARM
 -----BEGIN PGP SIGNATURE-----
 
 iQGzBAABCgAdFiEE+9lifEBpyUIVN1cpw08iOZLZjyQFAl/XhAMACgkQw08iOZLZ
 jyQJswv/VYyEJw3FF+GHkrHTPuBHM6R2JexAFMF5O5fK4+LFfE8pmrPCYqr8gbQ+
 6NATV9w3NM1+OZMRfnFH5Tqet18II9Lgri5r+Cgngq55QT9lnJuRdRfkzGjplPwu
 +kSk84twUVSwrhy1/h9+zzlzLPWlRSKPqY/IfxXpzQZzxGzD01YgreyneLxBvphh
 QUsRD1I5W1UqBXhuindr0jAd7J94uPp0wSoQziafSUzAA2E6ntgGVUqEr78+ktGy
 g50h+odETjwxVRNdFW+CFl1t/dvrWxewgiuO9MxHko4J9ySGmRUkqy5x9p++q/3S
 6Mpzk+xGCPLKqX109pJFI3uNdDyc3spFa6uDyRGashf+UBPcAPWP0lfR5gqB2L8f
 r5xpnt4BCTjzRnv5dryjHd3BJYn8/QmxvU81uDfkJ7yRQwA8WcGoexSz2DvChM8U
 y1x2SANyHk5YzctNoe0OY2KC2wu1US006l3CdQEVZB6iEW5LkER/6RyZ5uNR/98b
 Nvv16Xdy
 =ZTHO
 -----END PGP SIGNATURE-----

Merge tag 'efi-next-for-v5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into efi/core

Pull followup fixes for EFI from Ard Biesheuvel:

 - fix the build breakage on IA64 caused by recent capsule loader changes

 - suppress a type mismatch build warning in the expansion of
   EFI_PHYS_ALIGN on ARM

Link: https://lore.kernel.org/r/20201215080144.17077-1-ardb@kernel.org
This commit is contained in:
Thomas Gleixner 2020-12-15 12:14:38 +01:00
commit 3dcb8b53cb
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/include/asm/efi.h
View File

@ -71,7 +71,7 @@ static inline void efifb_setup_from_dmi(struct screen_info *si, const char *opt)
* here throws off the memory allocation logic, so let's use the lowest power
* of two greater than 2 MiB and greater than TEXT_OFFSET.
*/
#define EFI_PHYS_ALIGN max(SZ_2M, roundup_pow_of_two(TEXT_OFFSET))
#define EFI_PHYS_ALIGN max(UL(SZ_2M), roundup_pow_of_two(TEXT_OFFSET))
/* on ARM, the initrd should be loaded in a lowmem region */
static inline unsigned long efi_get_max_initrd_addr(unsigned long image_addr)

2
drivers/firmware/efi/Kconfig
View File

@ -147,7 +147,7 @@ config EFI_BOOTLOADER_CONTROL
config EFI_CAPSULE_LOADER
tristate "EFI capsule loader"
depends on EFI
depends on EFI && !IA64
help
This option exposes a loader interface "/dev/efi_capsule_loader" for
users to load EFI capsules. This driver requires working runtime

5
drivers/firmware/efi/Makefile
View File

@ -12,7 +12,10 @@ KASAN_SANITIZE_runtime-wrappers.o := n
obj-$(CONFIG_ACPI_BGRT) += efi-bgrt.o
obj-$(CONFIG_EFI) += efi.o vars.o reboot.o memattr.o tpm.o
obj-$(CONFIG_EFI) += capsule.o memmap.o
obj-$(CONFIG_EFI) += memmap.o
ifneq ($(CONFIG_EFI_CAPSULE_LOADER),)
obj-$(CONFIG_EFI) += capsule.o
endif
obj-$(CONFIG_EFI_PARAMS_FROM_FDT) += fdtparams.o
obj-$(CONFIG_EFI_VARS) += efivars.o
obj-$(CONFIG_EFI_ESRT) += esrt.o

10
include/linux/efi.h
View File

@ -817,12 +817,6 @@ static inline bool efi_enabled(int feature)
static inline void
efi_reboot(enum reboot_mode reboot_mode, const char *__unused) {}
static inline bool
efi_capsule_pending(int *reset_type)
{
return false;
}
static inline bool efi_soft_reserve_enabled(void)
{
return false;
@ -1038,6 +1032,7 @@ bool efivar_validate(efi_guid_t vendor, efi_char16_t *var_name, u8 *data,
bool efivar_variable_is_removable(efi_guid_t vendor, const char *name,
size_t len);
#if IS_ENABLED(CONFIG_EFI_CAPSULE_LOADER)
extern bool efi_capsule_pending(int *reset_type);
extern int efi_capsule_supported(efi_guid_t guid, u32 flags,
@ -1045,6 +1040,9 @@ extern int efi_capsule_supported(efi_guid_t guid, u32 flags,
extern int efi_capsule_update(efi_capsule_header_t *capsule,
phys_addr_t *pages);
#else
static inline bool efi_capsule_pending(int *reset_type) { return false; }
#endif
#ifdef CONFIG_EFI_RUNTIME_MAP
int efi_runtime_map_init(struct kobject *);