From:   Darren Hart <darren@os.amperecomputing.com>
To:     LKML <linux-kernel@vger.kernel.org>
Cc:     stable@vger.kernel.org, linux-efi@vger.kernel.org,
        Alexandru Elisei <alexandru.elisei@gmail.com>,
        Ard Biesheuvel <ardb@kernel.org>
Subject: [PATCH] arm64: efi: Force the use of SetVirtualAddressMap() on Altra Max machines
Date:   Wed,  8 Feb 2023 15:12:00 -0800
Message-Id: <a968c446bde75bf019580366854349bf94e6c961.1675897882.git.darren@os.amperecomputing.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?h/5Px6G5SBBnddFV3MyLH9+KSQ1w4C4QeIGsN9R3h+KxJ1+fusFXAHcPvKRU?=
 =?us-ascii?Q?4JofM2C2KaSycodaSbK4MB5NPn1gUSnSSis7ByWh13H7fwj7/PPaTFTEb9mi?=
 =?us-ascii?Q?xoohW/XmzLvgAjEMQhVoVlfISyTnlO0YPSk5g+SaOwBuxgRXHgyo+bxZvrnz?=
 =?us-ascii?Q?jCbda0FITG76if+3JGLsp5hyi/0km2xyjrXkVLCqq++OzdXUJUWrlaxY8A4t?=
 =?us-ascii?Q?5HTVtPkUbA22d+1veE0v3blkHoJ5kV9YZixaU/P3lCq48NEke6o+F4JbgLcm?=
 =?us-ascii?Q?HU0Vk5UuP8rA+Som5zO1TdY65oRZcEVXCC2mJIeIUfVqin1YucgPuffr0+V0?=
 =?us-ascii?Q?XwxEKuwyhF55nhf2saKPw0EWDe+hLk3cKsmfMKzScFJ6BOXvVzJXDH4bhBSo?=
 =?us-ascii?Q?OAKVdvwJA0YnMoAFt3tnNlczldqPh3Tu2WqP+nmYG4S0NChb7aKXvbd+Jkpk?=
 =?us-ascii?Q?weIK4A5fFJA75NaiE3zt3GPN31ODnNBfRkJVI57vHUltxKxUzMLmJaOotZIv?=
 =?us-ascii?Q?rppyICwfzYsYiobcGNOsE8hdkbrpDspPwrybQnB/gf/qabiLCBU5QmUmPUKI?=
 =?us-ascii?Q?GFROhmdVakiBYvqDkgWrVUVOGHLosrPsKWJ7gpl5J3B7nWrSrEBZcwgnA4oW?=
 =?us-ascii?Q?DeUVTAC36NQKUZZ4fFvY8yvQZjeKAqqSX7QJr1MTtMNzioi9H3Msc02/ZlsU?=
 =?us-ascii?Q?AezgYofjpOy0W+ZG0EVe2XAQqkCXOoOhereGvlln4gBUbbbyfuMThZMKbjSC?=
 =?us-ascii?Q?BHqj40y9MWOoKF4V22Cp7v2To8G3hq+1vGieeFmxR8sllcFm3TdlOaGK4kxC?=
 =?us-ascii?Q?liAWTRanOORjVwxMQHFaoLAiDbX9OjXGALfI8uz44b9debw+lKXTjNSksZBL?=
 =?us-ascii?Q?EJKIAaoHlFLwj1GbZeOg9iU3BbLXl65SMnplOq2QblYvjzvcEdL7hko2cjlf?=
 =?us-ascii?Q?M2MQhf53v2MnEk2ghP2BzjXDUg9IDmqA07e/3tPmkpjikN+CZoRRMjWd5Xb/?=
 =?us-ascii?Q?QBxsSx2dFZoafm+GhDnIZl6KwOVHJdduKK0lW1adgU/9k40GEa6WLC0DdDBN?=
 =?us-ascii?Q?nztxk0o4gmIL/ryTiRqdxZ7yoBytTvWJ6rbKHtn5cRKo4zmNH+QtR9VnRMCv?=
 =?us-ascii?Q?AWO+m0gzQ/6zr717PyW4phmhkDzfaOFyU0C9QZRqt+ZLtXB0igXsEi/s2Nsb?=
 =?us-ascii?Q?12KypYl7WN9SpVVf850Qd17YlcvIDFbdQVf6HRj/RUdj0Me+81K8WANTl6Bu?=
 =?us-ascii?Q?ap9CVbHaqP/UokSm96oIWjfcOZFkwQbbcuMl4Cvtv8GuaMTxlXR/sNGclnr8?=
 =?us-ascii?Q?6V7wk21/ALAtdsWu7KkJ5dQTwgP9FjHknROKtNo5p+PDLotLOP68RxaOzgAh?=
 =?us-ascii?Q?9YtY/CvaZDyGIHNZKCNS8H7fFi0ppp9uH7LwZQLhOnrVUu4YfWq2mkUF0FD6?=
 =?us-ascii?Q?mUKTDCoSolGtu8pMXLJlFHQ/B4ljhT/K2gRqMLikFVVkIh5CjGSxz3Nr5EIh?=
 =?us-ascii?Q?eocJpzcbty7oZmTFJmwEPAepYSFNHhmauEQI9OQoNVfpXLnvzgm92OaHgN83?=
 =?us-ascii?Q?T24vAnei7EE/oR6TW5Fd+Qbup4UgJZfzxTJDDHrJyxM04FYsxMJsDTZUjo6n?=
 =?us-ascii?Q?kPUntoRuHYoR2DkoCOLiARE=3D?=
X-OriginatorOrg: os.amperecomputing.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ade786ff-5493-44e1-0980-08db0a2a2842
X-MS-Exchange-CrossTenant-AuthSource: SJ0PR01MB7432.prod.exchangelabs.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Feb 2023 23:13:58.5736
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3bc2b170-fd94-476d-b0ce-4229bdc904a7
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: G+xdH2Ahj4WtZqDtm2CgyNLaFYwT8kokxxsHsfsEXYFyBILQ4MGuWw5qLL2XcBiUfOUsUk2tQmXzklzQFnO0TyBBsOlQBscCOT3KeNvE3d+jOL7BkGcAmLhu9HCr8n/z
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR01MB6956
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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. Altra Max machines are similarly affected but
not detected with the strict strcmp test.

Rather than risk greedy matching with strncmp, add a second test for
Altra Max. Do not refactor to handle multiple tests as these should be
the only two needed.

Fixes: 550b33cfd445 ("arm64: efi: Force the use of SetVirtualAddressMap() on Altra machines")
Cc: <stable@vger.kernel.org> # 6.1.x
Cc: <linux-efi@vger.kernel.org>
Cc: Alexandru Elisei <alexandru.elisei@gmail.com>
Cc: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Darren Hart <darren@os.amperecomputing.com>
---
 drivers/firmware/efi/libstub/arm64.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/firmware/efi/libstub/arm64.c b/drivers/firmware/efi/libstub/arm64.c
index ff2d18c42ee7..97f4423059c7 100644
--- a/drivers/firmware/efi/libstub/arm64.c
+++ b/drivers/firmware/efi/libstub/arm64.c
@@ -19,10 +19,10 @@ 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 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, "Altra") && strcmp(type1_family, "Altra Max")))
 		return false;
 
 	efi_warn("Working around broken SetVirtualAddressMap()\n");
-- 
2.34.3