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>,
        Justin He <Justin.He@arm.com>,
        Huacai Chen <chenhuacai@kernel.org>,
        "Jason A. Donenfeld" <Jason@zx2c4.com>,
        Ard Biesheuvel <ardb@kernel.org>
Subject: [PATCH v2] arm64: efi: Force the use of SetVirtualAddressMap() on eMAG and Altra Max machines
Date:   Wed,  8 Feb 2023 16:28:21 -0800
Message-Id: <2ab9645789707f31fd37c49435e476d4b5c38a0a.1675901828.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?pYnpVmhMuug9lGXZ0/8sH7ZZFCqBMBluGXYT5eMxi+yjzSyGo1FEdzR+l3J+?=
 =?us-ascii?Q?CrtgOAEYfmaZOnrZVhmllITIYmMlz+TBok2TGG+Bh16P5nzDaSakhJYe9GiD?=
 =?us-ascii?Q?ydoMWSpSP3TMyrqxEhu2+dG8H3CgcuWKtjs3rhD74yFrDDdhcs6QRHJPH9la?=
 =?us-ascii?Q?Y7mWG9dW1gBGmEH10OPE7DCl2ZcY0Xi9fA5dOFN7DM6INkhm4WhU9luJIHYx?=
 =?us-ascii?Q?7dloZH+CsF7EK448Ek+Z/WlNt14O8Zis9r/vv3+CYMXl4nWgmLaoZcc93R5b?=
 =?us-ascii?Q?cfn5n8zAoq+S80dJMfA6RH7qL0yCxoN7gktVgRCiZIkvHkqhlJ5uriTPhO4J?=
 =?us-ascii?Q?ux4jagXfJYxFSlqavKF9RZe+0aUwgy146a6z8IJ8Foim4kL9YjNSCNhyakhp?=
 =?us-ascii?Q?p3EEGVbZ2x19836wdhzPuceHLmFuCtNOxfI27wHJujGYaq1FIb1JBtwMW7Sq?=
 =?us-ascii?Q?szCj3FDvCFlI1KpPx8D7RQvVuXMZg5+Tub58BURGvD3fG0gLVKQbvDZMbNwE?=
 =?us-ascii?Q?RIvFgLGLmDULIiNEs14uO0pWyqYcxaUMRbwOFccTLP2NzTlZ2v5+ppptUawI?=
 =?us-ascii?Q?tZNwWAZ8f0Aqpz+wXxfy7dcZh10Y1RXnn9qEeqx3hJwpB8Q8+uV+LXIhNSp1?=
 =?us-ascii?Q?gwKeV3+27i4by16GiGAh6Fh9NSQuwsBfx+0LOrGHoheHaRSsKr0jmH4nlR9t?=
 =?us-ascii?Q?l2OtPKpTBmlZ0Vv9hzL3+pIx8bLzbNHq2Zs1Zkg9q5ps1GNUNssdS/VIuc3L?=
 =?us-ascii?Q?0wTv6AxfxeewdTUHD8XtuD05Cjrxjhyei2BQWKWPyWSztAjVDt3kPLM49Kwa?=
 =?us-ascii?Q?BMpFVwrTJY11de+16aQNBMXtgIOKobtJWNbZnVhyjUMMsKCEObEJWD8L7PWz?=
 =?us-ascii?Q?t3W71/3DE8BRIq4Ydx3jhOnHzWYUaZ9r1Rj75qVwEhKAxKOLMhEtvypJSDyw?=
 =?us-ascii?Q?9UV8+6TN7zXbaDC4EyZL0sptvHO1x/ybzerTNpfXXlOskfDRjqGsDM522hKO?=
 =?us-ascii?Q?igsmmP56f0nUBXeEk9FFICCljdRnVJpfr4c96QioNpMHWARTPLBZNSiBOm6+?=
 =?us-ascii?Q?WivBRdddfI48OwVnmisrVPg2Bi1NIYvJPa2aTMgBsbfII3YfidElKJ7VJPKP?=
 =?us-ascii?Q?6TvyVgQV4VVCxxGW25h47Mt/vvhOjVcI9jhmsnZkG40M4nbnDqjMQn/eT25t?=
 =?us-ascii?Q?fUmjrC7W3HUFHoVlFokYC/WvrrD+Dtw9Te0Ou27HqliyL3vuljLoyVDPtHlC?=
 =?us-ascii?Q?ptHbkepAj+UIgR5CtYRG54yXYz35FSGb8w9eGj4IRpoxwz4nmiWvtlwNuztR?=
 =?us-ascii?Q?tzjb4jL8ivjf0JmNGVI16uZd42PssemqhBoNBvAbhBljulpllYV66OKAZPA8?=
 =?us-ascii?Q?D7WkTujTrHzlOQAqA+OzvLcs49SCtAw+hIefR/UmjOE37AMKQRo8kIBRwcFT?=
 =?us-ascii?Q?YscLL6rcTZHGE2KNOsIpQY1m3hlKMpJS+co5LDFlBg6y2CO1DJLUk6C6BXu3?=
 =?us-ascii?Q?7s6eN7i/o+QJ3JoFhqFPKhiY6+rT8EXaoS3BwDDhnA5K2WAJtOR1bsptylMD?=
 =?us-ascii?Q?EBUPPe0t1VnZ/sO5Al8u3vmQOeL7f3UyDIg5mzC4WLwk7Iv5xRm6Ztf6OqiG?=
 =?us-ascii?Q?+nAWGyYtlicA6EPx/9NkDY4=3D?=
X-OriginatorOrg: os.amperecomputing.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 0814d5cd-d7ff-4b7b-983e-08db0a349592
X-MS-Exchange-CrossTenant-AuthSource: SJ0PR01MB7432.prod.exchangelabs.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2023 00:28:36.9702
 (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: kpnh8q8FJFTrkEZu6BpqrwHZDy7JpFNjeu4NIgFk8BVy9w3j6MGxJgkCM23uPZL1eCMADZonG6/3rCJS3hpyP2y7e+KKcHa79QfZ2BE/CXJeuVX7cOq/jQIOGjJoEkcq
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN7PR01MB3747
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. 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: <linux-efi@vger.kernel.org>
Cc: Alexandru Elisei <alexandru.elisei@gmail.com>
Cc: Justin He <Justin.He@arm.com>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: "Jason A. Donenfeld" <Jason@zx2c4.com>
Cc: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Darren Hart <darren@os.amperecomputing.com>
---
V1 -> V2: include eMAG

 drivers/firmware/efi/libstub/arm64.c | 9 ++++++---
 1 file 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");
-- 
2.34.3