Commit 877c20b1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'efi-fixes-for-v6.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi 

Pull EFI fixes from Ard Biesheuvel:

 - Set the NX compat flag for arm64 and zboot, to ensure compatibility
   with EFI firmware that complies with tightening requirements imposed
   across the ecosystem.

 - Improve identification of Ampere Altra systems based on SMBIOS data.

 - Fix some issues related to the EFI framebuffer that were introduced
   as a result from some refactoring related to zboot and the merge with
   sysfb.

 - Makefile tweak to avoid rebuilding vmlinuz unnecessarily.

 - Fix efi_random_alloc() return value on out of memory condition.

* tag 'efi-fixes-for-v6.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi:
  efi/libstub: randomalloc: Return EFI_OUT_OF_RESOURCES on failure
  efi/libstub: Use relocated version of kernel's struct screen_info
  efi/libstub: zboot: Add compressed image to make targets
  efi: sysfb_efi: Add quirk for Lenovo Yoga Book X91F/L
  efi: sysfb_efi: Fix DMI quirks not working for simpledrm
  efi/libstub: smbios: Drop unused 'recsize' parameter
  arm64: efi: Use SMBIOS processor version to key off Ampere quirk
  efi/libstub: smbios: Use length member instead of record struct size
  efi: earlycon: Reprobe after parsing config tables
  arm64: efi: Set NX compat flag in PE/COFF header
  efi/libstub: arm64: Remap relocated image with strict permissions
  efi/libstub: zboot: Mark zboot EFI application as NX compatible
parents 19a6b66c 0b1d9deb

arch/arm64/kernel/efi-header.S

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ 
	.long	.Lefi_header_end - .L_head		// SizeOfHeaders

	.long	0					// CheckSum

	.short	IMAGE_SUBSYSTEM_EFI_APPLICATION		// Subsystem

	.short	0					// DllCharacteristics

	.short	IMAGE_DLL_CHARACTERISTICS_NX_COMPAT	// DllCharacteristics

	.quad	0					// SizeOfStackReserve

	.quad	0					// SizeOfStackCommit

	.quad	0					// SizeOfHeapReserve

drivers/firmware/efi/earlycon.c

+13 −3
Original line number Diff line number Diff line
@@ -215,6 +215,14 @@ efi_earlycon_write(struct console *con, const char *str, unsigned int num) 
	}

}



static bool __initdata fb_probed;



void __init efi_earlycon_reprobe(void)

{

	if (fb_probed)

		setup_earlycon("efifb");

}



static int __init efi_earlycon_setup(struct earlycon_device *device,

				     const char *opt)

{
@@ -222,15 +230,17 @@ static int __init efi_earlycon_setup(struct earlycon_device *device, 
	u16 xres, yres;

	u32 i;



	if (screen_info.orig_video_isVGA != VIDEO_TYPE_EFI)

	fb_wb = opt && !strcmp(opt, "ram");



	if (screen_info.orig_video_isVGA != VIDEO_TYPE_EFI) {

		fb_probed = true;

		return -ENODEV;

	}



	fb_base = screen_info.lfb_base;

	if (screen_info.capabilities & VIDEO_CAPABILITY_64BIT_BASE)

		fb_base |= (u64)screen_info.ext_lfb_base << 32;



	fb_wb = opt && !strcmp(opt, "ram");



	si = &screen_info;

	xres = si->lfb_width;

	yres = si->lfb_height;

drivers/firmware/efi/efi-init.c

+3 −0
Original line number Diff line number Diff line
@@ -72,6 +72,9 @@ static void __init init_screen_info(void) 
		if (memblock_is_map_memory(screen_info.lfb_base))

			memblock_mark_nomap(screen_info.lfb_base,

					    screen_info.lfb_size);



		if (IS_ENABLED(CONFIG_EFI_EARLYCON))

			efi_earlycon_reprobe();

	}

}

drivers/firmware/efi/libstub/Makefile.zboot

+1 −1
Original line number Diff line number Diff line
@@ -44,4 +44,4 @@ OBJCOPYFLAGS_vmlinuz.efi := -O binary 
$(obj)/vmlinuz.efi: $(obj)/vmlinuz.efi.elf FORCE

	$(call if_changed,objcopy)



targets += zboot-header.o vmlinuz.o vmlinuz.efi.elf vmlinuz.efi
 
targets += zboot-header.o vmlinuz vmlinuz.o vmlinuz.efi.elf vmlinuz.efi

drivers/firmware/efi/libstub/arm64-stub.c

+4 −1
Original line number Diff line number Diff line
@@ -85,8 +85,10 @@ efi_status_t handle_kernel_image(unsigned long *image_addr, 
		}

	}



	if (image->image_base != _text)

	if (image->image_base != _text) {

		efi_err("FIRMWARE BUG: efi_loaded_image_t::image_base has bogus value\n");

		image->image_base = _text;

	}



	if (!IS_ALIGNED((u64)_text, SEGMENT_ALIGN))

		efi_err("FIRMWARE BUG: kernel image not aligned on %dk boundary\n",
@@ -139,6 +141,7 @@ efi_status_t handle_kernel_image(unsigned long *image_addr, 
	*image_addr = *reserve_addr;

	memcpy((void *)*image_addr, _text, kernel_size);

	caches_clean_inval_pou(*image_addr, *image_addr + kernel_codesize);

	efi_remap_image(*image_addr, *reserve_size, kernel_codesize);



	return EFI_SUCCESS;

}