diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-02-14 13:44:08 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-02-14 13:44:08 +0100 |
commit | c4a07e264d38d5cad5d77298957cbd7d7db70b1f (patch) | |
tree | bf7d4da0dadc50248951c643ca4f3f16a6ef8d04 /drivers/firmware/efi/libstub | |
parent | f87b564686ee47c480ccacc3922b38a8c54a6945 (diff) | |
parent | ceaa837f96adb69c0df0397937cd74991d5d821a (diff) | |
download | linux-stable-c4a07e264d38d5cad5d77298957cbd7d7db70b1f.tar.gz linux-stable-c4a07e264d38d5cad5d77298957cbd7d7db70b1f.tar.bz2 linux-stable-c4a07e264d38d5cad5d77298957cbd7d7db70b1f.zip |
Merge 6.2-rc8 into usb-next
We need the USB fixes in here for testing.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/firmware/efi/libstub')
-rw-r--r-- | drivers/firmware/efi/libstub/arm64.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/firmware/efi/libstub/arm64.c b/drivers/firmware/efi/libstub/arm64.c index ff2d18c42ee7..4501652e11ab 100644 --- a/drivers/firmware/efi/libstub/arm64.c +++ b/drivers/firmware/efi/libstub/arm64.c @@ -19,10 +19,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"); |