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

Commit ba3f35c7 authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

Merge tag 'efi-urgent' into x86/urgent 



 * Fix a few compiler warnings (one being a real bug) in the arm64 EFI
   code that lots of people are running into and reporting - Catalin Marinas

 * Use a cast to avoid a 32-bit overflow issue when generating pstore
   filenames - Andrzej Zaborowski

Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parents 6a89d710 783ee431

drivers/firmware/efi/efi-pstore.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -40,7 +40,7 @@ struct pstore_read_data { 
static inline u64 generic_id(unsigned long timestamp,

static inline u64 generic_id(unsigned long timestamp,

			     unsigned int part, int count)

			     unsigned int part, int count)

{

{

	return (timestamp * 100 + part) * 1000 + count;

	return ((u64) timestamp * 100 + part) * 1000 + count;

}

}





static int efi_pstore_read_func(struct efivar_entry *entry, void *data)

static int efi_pstore_read_func(struct efivar_entry *entry, void *data)

drivers/firmware/efi/efi.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -353,10 +353,10 @@ static int __init fdt_find_uefi_params(unsigned long node, const char *uname, 
				       int depth, void *data)

				       int depth, void *data)

{

{

	struct param_info *info = data;

	struct param_info *info = data;

	void *prop, *dest;

	const void *prop;

	unsigned long len;

	void *dest;

	u64 val;

	u64 val;

	int i;

	int i, len;





	if (depth != 1 ||

	if (depth != 1 ||

	    (strcmp(uname, "chosen") != 0 && strcmp(uname, "chosen@0") != 0))

	    (strcmp(uname, "chosen") != 0 && strcmp(uname, "chosen@0") != 0))

drivers/firmware/efi/fdt.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -63,7 +63,7 @@ static efi_status_t update_fdt(efi_system_table_t *sys_table, void *orig_fdt, 
	 */

	 */

	prev = 0;

	prev = 0;

	for (;;) {

	for (;;) {

		const char *type, *name;

		const char *type;

		int len;

		int len;





		node = fdt_next_node(fdt, prev, NULL);

		node = fdt_next_node(fdt, prev, NULL);