arm64: efi: Force the use of SetVirtualAddressMap() on eMAG and Altra Max machines

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@vger.kernel.org> # 6.1.x
Cc: Alexandru Elisei <alexandru.elisei@gmail.com>
Signed-off-by: Darren Hart <darren@os.amperecomputing.com>
Tested-by: Justin He <justin.he@arm.com>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/firmware/efi/libstub/arm64-stub.c b/drivers/firmware/efi/libstub/arm64-stub.c
index f9de5217ea65ed93cfd1a30a80e356a090ca65e4..42282c5c3fe6a496ff37b0e53616b5c8e02db49c 100644 (file)
--- 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");