Skip to contentSkip to conversation

EFI changes for v5.14

GIT PULL Merged Ingo Molnar 2 participants 2 messages Jun 28, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest efi/core git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git efi-core-2021-06-28

# HEAD: 267be9dbacf4485f7842a3755eef4bb68dc85fc9 Merge tag 'efi-next-for-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into efi/core

EFI changes: two driver API cleanups, and a log message tweak.

Thanks,

Ingo

------------------>
Andy Shevchenko (1):
efi/dev-path-parser: Switch to use for_each_acpi_dev_match()

Heikki Krogerus (1):
efi/apple-properties: Handle device properties with software node API

Paul Menzel (1):
x86/efi: Log 32/64-bit mismatch with kernel as an error

 arch/x86/platform/efi/efi.c             |  2 +-
 drivers/firmware/efi/apple-properties.c |  2 +-
 drivers/firmware/efi/dev-path-parser.c  | 49 ++++++++++++---------------------
 3 files changed, 20 insertions(+), 33 deletions(-)
arch/x86/platform/efi/efi.c +1 -1
index 8a26e705cb06..147c30a81f15 100644
@@ -468,7 +468,7 @@ void __init efi_init(void)
 	 */
 
 	if (!efi_runtime_supported())
-		pr_info("No EFI runtime due to 32/64-bit mismatch with kernel\n");
+		pr_err("No EFI runtime due to 32/64-bit mismatch with kernel\n");
 
 	if (!efi_runtime_supported() || efi_runtime_disabled()) {
 		efi_memmap_unmap();
drivers/firmware/efi/apple-properties.c +1 -1
index e1926483ae2f..4c3201e290e2 100644
@@ -157,7 +157,7 @@ static int __init unmarshal_devices(struct properties_header *properties)
 		if (!entry[0].name)
 			goto skip_device;
 
-		ret = device_add_properties(dev, entry); /* makes deep copy */
+		ret = device_create_managed_software_node(dev, entry, NULL);
 		if (ret)
 			dev_err(dev, "error %d assigning properties\n", ret);
 
drivers/firmware/efi/dev-path-parser.c +18 -31

70 lines not on this page · raw message