Commit 792fc921 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull EFI fixes from Ard Biesheuvel:
 "A few minor fixes for EFI, one of which fixes the reported boot
  regression when booting x86 kernels using the BIOS based loader built
  into the hypervisor framework on macOS.

   - fix harmless warning in zboot code on 'make clean'

   - add some missing prototypes

   - fix boot regressions triggered by PE/COFF header image minor
     version bump"

* tag 'efi-fixes-for-v6.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi:
  efi: Bump stub image version for macOS HVF compatibility
  efi: fix missing prototype warnings
  efi/libstub: zboot: Avoid eager evaluation of objcopy flags
parents 9e87b63e 36e4fc57

drivers/acpi/apei/apei-internal.h

+0 −6
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
#ifndef APEI_INTERNAL_H

#define APEI_INTERNAL_H



#include <linux/cper.h>

#include <linux/acpi.h>



struct apei_exec_context;
@@ -130,10 +129,5 @@ static inline u32 cper_estatus_len(struct acpi_hest_generic_status *estatus) 
		return sizeof(*estatus) + estatus->data_length;

}



void cper_estatus_print(const char *pfx,

			const struct acpi_hest_generic_status *estatus);

int cper_estatus_check_header(const struct acpi_hest_generic_status *estatus);

int cper_estatus_check(const struct acpi_hest_generic_status *estatus);



int apei_osc_setup(void);

#endif

drivers/acpi/apei/bert.c

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/module.h>

#include <linux/init.h>

#include <linux/acpi.h>

#include <linux/cper.h>

#include <linux/io.h>



#include "apei-internal.h"

drivers/firmware/efi/libstub/Makefile.zboot

+2 −1
Original line number Diff line number Diff line
@@ -32,7 +32,8 @@ zboot-size-len-$(CONFIG_KERNEL_GZIP) := 0 
$(obj)/vmlinuz: $(obj)/vmlinux.bin FORCE

	$(call if_changed,$(zboot-method-y))



OBJCOPYFLAGS_vmlinuz.o := -I binary -O $(EFI_ZBOOT_BFD_TARGET) $(EFI_ZBOOT_OBJCOPY_FLAGS) \

# avoid eager evaluation to prevent references to non-existent build artifacts

OBJCOPYFLAGS_vmlinuz.o = -I binary -O $(EFI_ZBOOT_BFD_TARGET) $(EFI_ZBOOT_OBJCOPY_FLAGS) \

			  --rename-section .data=.gzdata,load,alloc,readonly,contents

$(obj)/vmlinuz.o: $(obj)/vmlinuz FORCE

	$(call if_changed,objcopy)

drivers/firmware/efi/libstub/efistub.h

+3 −0
Original line number Diff line number Diff line
@@ -1133,4 +1133,7 @@ const u8 *__efi_get_smbios_string(const struct efi_smbios_record *record, 
void efi_remap_image(unsigned long image_base, unsigned alloc_size,

		     unsigned long code_size);



asmlinkage efi_status_t __efiapi

efi_zboot_entry(efi_handle_t handle, efi_system_table_t *systab);



#endif

include/linux/cper.h

+6 −0
Original line number Diff line number Diff line
@@ -572,4 +572,10 @@ void cper_print_proc_ia(const char *pfx, 
int cper_mem_err_location(struct cper_mem_err_compact *mem, char *msg);

int cper_dimm_err_location(struct cper_mem_err_compact *mem, char *msg);



struct acpi_hest_generic_status;

void cper_estatus_print(const char *pfx,

			const struct acpi_hest_generic_status *estatus);

int cper_estatus_check_header(const struct acpi_hest_generic_status *estatus);

int cper_estatus_check(const struct acpi_hest_generic_status *estatus);



#endif