This is a note to let you know that I've just added the patch titled
arm64: efi: Force the use of SetVirtualAddressMap() on eMAG and Altra Max machines
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
arm64-efi-force-the-use-of-setvirtualaddressmap-on-emag-and-altra-max-machines.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 190233164cd77115f8dea718cbac561f557092c6 Mon Sep 17 00:00:00 2001
From: Darren Hart <darren@xxxxxxxxxxxxxxxxxxxxxx>
Date: Wed, 8 Feb 2023 16:28:21 -0800
Subject: arm64: efi: Force the use of SetVirtualAddressMap() on eMAG and Altra Max machines
From: Darren Hart <darren@xxxxxxxxxxxxxxxxxxxxxx>
commit 190233164cd77115f8dea718cbac561f557092c6 upstream.
Commit 550b33cfd445 ("arm64: efi: Force the use of SetVirtualAddressMap()
on Altra machines") identifies the Altra family via the family field in
the type#1 SMBIOS record. eMAG and Altra Max machines are similarly
affected but not detected with the strict strcmp test.
The type1_family smbios string is not an entirely reliable means of
identifying systems with this issue as OEMs can, and do, use their own
strings for these fields. However, until we have a better solution,
capture the bulk of these systems by adding strcmp matching for "eMAG"
and "Altra Max".
Fixes: 550b33cfd445 ("arm64: efi: Force the use of SetVirtualAddressMap() on Altra machines")
Cc: <stable@xxxxxxxxxxxxxxx> # 6.1.x
Cc: Alexandru Elisei <alexandru.elisei@xxxxxxxxx>
Signed-off-by: Darren Hart <darren@xxxxxxxxxxxxxxxxxxxxxx>
Tested-by: Justin He <justin.he@xxxxxxx>
Signed-off-by: Ard Biesheuvel <ardb@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/firmware/efi/libstub/arm64-stub.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
--- a/drivers/firmware/efi/libstub/arm64-stub.c
+++ b/drivers/firmware/efi/libstub/arm64-stub.c
@@ -20,10 +20,13 @@ static bool system_needs_vamap(void)
const u8 *type1_family = efi_get_smbios_string(1, family);
/*
- * Ampere Altra machines crash in SetTime() if SetVirtualAddressMap()
- * has not been called prior.
+ * Ampere eMAG, Altra, and Altra Max machines crash in SetTime() if
+ * SetVirtualAddressMap() has not been called prior.
*/
- if (!type1_family || strcmp(type1_family, "Altra"))
+ if (!type1_family || (
+ strcmp(type1_family, "eMAG") &&
+ strcmp(type1_family, "Altra") &&
+ strcmp(type1_family, "Altra Max")))
return false;
efi_warn("Working around broken SetVirtualAddressMap()\n");
Patches currently in stable-queue which might be from darren@xxxxxxxxxxxxxxxxxxxxxx are
queue-6.1/arm64-efi-force-the-use-of-setvirtualaddressmap-on-emag-and-altra-max-machines.patch
