Commit 9bb4cbf4 authored by Borislav Petkov's avatar Borislav Petkov
Browse files

Merge tag 'efi-fixes-for-v5.7-rc6' of... 

Merge tag 'efi-fixes-for-v5.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into efi/urgent

Pull EFI fixes from Ard Biesheuvel:

"- fix EFI framebuffer earlycon for wide fonts
 - avoid filling screen_info with garbage if the EFI framebuffer is not
   available
 - fix a potential host tool build error due to a symbol clash on x86
 - work around a EFI firmware bug regarding the binary format of the TPM
   final events table
 - fix a missing memory free by reworking the E820 table sizing routine to
   not do the allocation in the first place
 - add CPER parsing for firmware errors"
parents b9bbe6ed b4f1874c

arch/x86/boot/tools/build.c

+8 −8
Original line number Diff line number Diff line
@@ -59,14 +59,14 @@ u8 buf[SETUP_SECT_MAX*512]; 
#define PECOFF_COMPAT_RESERVE 0x0

#endif



unsigned long efi32_stub_entry;

unsigned long efi64_stub_entry;

unsigned long efi_pe_entry;

unsigned long efi32_pe_entry;

unsigned long kernel_info;

unsigned long startup_64;

unsigned long _ehead;

unsigned long _end;

static unsigned long efi32_stub_entry;

static unsigned long efi64_stub_entry;

static unsigned long efi_pe_entry;

static unsigned long efi32_pe_entry;

static unsigned long kernel_info;

static unsigned long startup_64;

static unsigned long _ehead;

static unsigned long _end;



/*----------------------------------------------------------------------*/

drivers/firmware/efi/cper.c

+62 −0
Original line number Diff line number Diff line
@@ -407,6 +407,58 @@ static void cper_print_pcie(const char *pfx, const struct cper_sec_pcie *pcie, 
	}

}



static const char * const fw_err_rec_type_strs[] = {

	"IPF SAL Error Record",

	"SOC Firmware Error Record Type1 (Legacy CrashLog Support)",

	"SOC Firmware Error Record Type2",

};



static void cper_print_fw_err(const char *pfx,

			      struct acpi_hest_generic_data *gdata,

			      const struct cper_sec_fw_err_rec_ref *fw_err)

{

	void *buf = acpi_hest_get_payload(gdata);

	u32 offset, length = gdata->error_data_length;



	printk("%s""Firmware Error Record Type: %s\n", pfx,

	       fw_err->record_type < ARRAY_SIZE(fw_err_rec_type_strs) ?

	       fw_err_rec_type_strs[fw_err->record_type] : "unknown");

	printk("%s""Revision: %d\n", pfx, fw_err->revision);



	/* Record Type based on UEFI 2.7 */

	if (fw_err->revision == 0) {

		printk("%s""Record Identifier: %08llx\n", pfx,

		       fw_err->record_identifier);

	} else if (fw_err->revision == 2) {

		printk("%s""Record Identifier: %pUl\n", pfx,

		       &fw_err->record_identifier_guid);

	}



	/*

	 * The FW error record may contain trailing data beyond the

	 * structure defined by the specification. As the fields

	 * defined (and hence the offset of any trailing data) vary

	 * with the revision, set the offset to account for this

	 * variation.

	 */

	if (fw_err->revision == 0) {

		/* record_identifier_guid not defined */

		offset = offsetof(struct cper_sec_fw_err_rec_ref,

				  record_identifier_guid);

	} else if (fw_err->revision == 1) {

		/* record_identifier not defined */

		offset = offsetof(struct cper_sec_fw_err_rec_ref,

				  record_identifier);

	} else {

		offset = sizeof(*fw_err);

	}



	buf += offset;

	length -= offset;



	print_hex_dump(pfx, "", DUMP_PREFIX_OFFSET, 16, 4, buf, length, true);

}



static void cper_print_tstamp(const char *pfx,

				   struct acpi_hest_generic_data_v300 *gdata)

{
@@ -494,6 +546,16 @@ cper_estatus_print_section(const char *pfx, struct acpi_hest_generic_data *gdata 
		else

			goto err_section_too_small;

#endif

	} else if (guid_equal(sec_type, &CPER_SEC_FW_ERR_REC_REF)) {

		struct cper_sec_fw_err_rec_ref *fw_err = acpi_hest_get_payload(gdata);



		printk("%ssection_type: Firmware Error Record Reference\n",

		       newpfx);

		/* The minimal FW Error Record contains 16 bytes */

		if (gdata->error_data_length >= SZ_16)

			cper_print_fw_err(newpfx, gdata, fw_err);

		else

			goto err_section_too_small;

	} else {

		const void *err = acpi_hest_get_payload(gdata);

drivers/firmware/efi/earlycon.c

+8 −6
Original line number Diff line number Diff line
@@ -114,14 +114,16 @@ static void efi_earlycon_write_char(u32 *dst, unsigned char c, unsigned int h) 
	const u32 color_black = 0x00000000;

	const u32 color_white = 0x00ffffff;

	const u8 *src;

	u8 s8;

	int m;

	int m, n, bytes;

	u8 x;



	src = font->data + c * font->height;

	s8 = *(src + h);

	bytes = BITS_TO_BYTES(font->width);

	src = font->data + c * font->height * bytes + h * bytes;



	for (m = 0; m < 8; m++) {

		if ((s8 >> (7 - m)) & 1)

	for (m = 0; m < font->width; m++) {

		n = m % 8;

		x = *(src + m / 8);

		if ((x >> (7 - n)) & 1)

			*dst = color_white;

		else

			*dst = color_black;

drivers/firmware/efi/efi.c

+1 −4
Original line number Diff line number Diff line
@@ -130,11 +130,8 @@ static ssize_t systab_show(struct kobject *kobj, 
	if (efi.smbios != EFI_INVALID_TABLE_ADDR)

		str += sprintf(str, "SMBIOS=0x%lx\n", efi.smbios);



	if (IS_ENABLED(CONFIG_IA64) || IS_ENABLED(CONFIG_X86)) {

		extern char *efi_systab_show_arch(char *str);



	if (IS_ENABLED(CONFIG_IA64) || IS_ENABLED(CONFIG_X86))

		str = efi_systab_show_arch(str);

	}



	return str - buf;

}

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

+5 −1
Original line number Diff line number Diff line
@@ -60,7 +60,11 @@ static struct screen_info *setup_graphics(void) 
		si = alloc_screen_info();

		if (!si)

			return NULL;

		efi_setup_gop(si, &gop_proto, size);

		status = efi_setup_gop(si, &gop_proto, size);

		if (status != EFI_SUCCESS) {

			free_screen_info(si);

			return NULL;

		}

	}

	return si;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE