Merge tag 'v2026.01-rc3' into next

Prepare v2026.01-rc3

lib/efi_client/efi_app.c

@@ -21,7 +21,6 @@
 #include <asm/global_data.h>
 #include <linux/err.h>
 #include <linux/types.h>
-#include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <dm/root.h>

lib/efi_client/efi_stub.c

@@ -110,7 +110,7 @@ void *memset(void *inptr, int ch, size_t size)
 	while (ptr < end)
 		*ptr++ = ch;
 
-	return ptr;
+	return inptr;
 }
 
 static void jump_to_uboot(ulong cs32, ulong addr, ulong info)

lib/efi_loader/efi_firmware.c

@@ -651,6 +651,7 @@ efi_status_t EFIAPI efi_firmware_fit_set_image(
 	efi_status_t status;
 	struct fmp_state state = { 0 };
 	char *orig_dfu_env;
+	void *img;
 
 	EFI_ENTRY("%p %d %p %zu %p %p %p\n", this, image_index, image,
 		  image_size, vendor_code, progress, abort_reason);
@@ -677,7 +678,20 @@ efi_status_t EFIAPI efi_firmware_fit_set_image(
 		return EFI_EXIT(EFI_DEVICE_ERROR);
 	}
 
-	ret = fit_update(image);
+	/* Make sure the update fitImage is properly aligned to 8-bytes */
+	if (!IS_ALIGNED((uintptr_t)image, 8)) {
+		img = memalign(8, image_size);
+		if (!img)
+			return EFI_EXIT(EFI_BAD_BUFFER_SIZE);
+		memcpy(img, image, image_size);
+	} else {
+		img = (void *)image;
+	}
+
+	ret = fit_update(img);
+
+	if (!IS_ALIGNED((uintptr_t)image, 8))
+		free(img);
 
 	if (env_set("dfu_alt_info", orig_dfu_env))
 		log_warning("Unable to restore env variable \"dfu_alt_info\".  Further DFU operations may fail!\n");

lib/efi_loader/efi_ipconfig.c

@@ -168,8 +168,8 @@ static efi_status_t EFIAPI efi_ip4_config2_register_notify(struct efi_ip4_config
 }
 
 /*
- * efi_ip4_config2_unregister_notify() -  Remove a previously registered eventfor
- * the specified configuration data
+ * efi_ip4_config2_unregister_notify() -  Remove a previously registered event
+ * for the specified configuration data
  *
  * This function implements EFI_IP4_CONFIG2_PROTOCOL.UnregisterDataNotify()
  * See the Unified Extensible Firmware Interface

lib/efi_selftest/efi_selftest_console.c

@@ -12,12 +12,12 @@
 struct efi_simple_text_output_protocol *con_out;
 struct efi_simple_text_input_protocol *con_in;
 
-/*
- * Print a MAC address to an u16 string
+/**
+ * mac() - print a MAC address to an u16 string
  *
- * @pointer: mac address
- * @buf: pointer to buffer address
- * on return position of terminating zero word
+ * @pointer:	mac address
+ * @buf:	pointer to buffer address,
+ *		on return position of terminating zero word
  */
 static void mac(void *pointer, u16 **buf)
 {
@@ -43,7 +43,7 @@ static void mac(void *pointer, u16 **buf)
 	*buf = pos;
 }
 
-/*
+/**
  * printx() - print hexadecimal number to an u16 string
  *
  * @p:		value to print
@@ -71,7 +71,7 @@ static void printx(u64 p, int prec, u16 **buf)
 }
 
 /**
- * print_guid() - print GUID to an u16 string
+ * print_uuid() - print GUID to an u16 string
  *
  * @p:		GUID to print
  * @buf:	pointer to buffer address,
@@ -92,12 +92,12 @@ static void print_uuid(u8 *p, u16 **buf)
 	}
 }
 
-/*
- * Print an unsigned 32bit value as decimal number to an u16 string
+/**
+ * uint2dec() - print an unsigned 32bit value as decimal number to an u16 string
  *
  * @value:	value to be printed
  * @prec:	minimum number of digits to display
- * @buf:	pointer to buffer address
+ * @buf:	pointer to buffer address,
  *		on return position of terminating zero word
  */
 static void uint2dec(u32 value, int prec, u16 **buf)
@@ -132,13 +132,13 @@ static void uint2dec(u32 value, int prec, u16 **buf)
 	*buf = pos;
 }
 
-/*
- * Print a signed 32bit value as decimal number to an u16 string
+/**
+ * int2dec() - print a signed 32bit value as decimal number to an u16 string
  *
  * @value:	value to be printed
  * @prec:	minimum number of digits to display
- * @buf:	pointer to buffer address
- * on return position of terminating zero word
+ * @buf:	pointer to buffer address,
+ *		on return position of terminating zero word
  */
 static void int2dec(s32 value, int prec, u16 **buf)
 {
@@ -155,12 +155,12 @@ static void int2dec(s32 value, int prec, u16 **buf)
 	*buf = pos;
 }
 
-/*
- * Print a colored formatted string to the EFI console
+/**
+ * efi_st_printc() - print a colored message
  *
- * @color	color, see constants in efi_api.h, use -1 for no color
- * @fmt		format string
- * @...		optional arguments
+ * @color:	color, see constants in efi_api.h, use -1 for no color
+ * @fmt:	printf style format string
+ * @...:	arguments to be printed
  */
 void efi_st_printc(int color, const char *fmt, ...)
 {
@@ -271,10 +271,10 @@ void efi_st_printc(int color, const char *fmt, ...)
 		con_out->set_attribute(con_out, EFI_LIGHTGRAY);
 }
 
-/*
- * Reads an Unicode character from the input device.
+/**
+ * efi_st_get_key() - read an Unicode character from the input device
  *
- * Return: Unicode character
+ * Return:	Unicode character
  */
 u16 efi_st_get_key(void)
 {

lib/efi_selftest/efi_selftest_snp.c

@@ -43,7 +43,7 @@ struct dhcp_hdr {
 	u8 chaddr[16];
 	u8 sname[64];
 	u8 file[128];
-};
+} __packed;
 
 /*
  * Message type option.

lib/optee/Kconfig

@@ -4,6 +4,25 @@ config OPTEE_LIB
 	help
 	  Selecting this option will enable the shared OPTEE library code.
 
+config HAS_TEE_IN_BUILD_ENV
+	def_bool $(success, test -n "$(TEE)")
+	select OPTEE_LIB if OF_CONTROL
+	select OF_LIBFDT if OF_CONTROL
+	help
+	  It is typical whenever OP-TEE OS is loaded before U-Boot proper that
+	  it modifies the FDT passed to U-Boot proper to add reserved-memory
+	  nodes for the RAM it just reserved for itself.
+
+	  U-Boot must copy those reserved-nodes in the FDT for the next OS to
+	  boot.
+
+	  Failing to do so will incur random crashes or device reboots once the
+	  next OS is running.
+
+	  This makes sure that whenever TEE is present in the environment,
+	  meaning a TEE OS will be part of the boot flow, the copy made by the
+	  OP-TEE lib will happen.
+
 config OPTEE_IMAGE
 	bool "Support OPTEE images"
 	help