Received-SPF: Pass (protection.outlook.com: domain of arm.com designates
 63.35.35.123 as permitted sender) receiver=protection.outlook.com;
 client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com;
 pr=C
From:   Justin He <Justin.He@arm.com>
To:     Darren Hart <darren@os.amperecomputing.com>,
        LKML <linux-kernel@vger.kernel.org>
CC:     "stable@vger.kernel.org" <stable@vger.kernel.org>,
        "linux-efi@vger.kernel.org" <linux-efi@vger.kernel.org>,
        Alexandru Elisei <alexandru.elisei@gmail.com>,
        Huacai Chen <chenhuacai@kernel.org>,
        "Jason A. Donenfeld" <Jason@zx2c4.com>,
        Ard Biesheuvel <ardb@kernel.org>, nd <nd@arm.com>
Subject: RE: [PATCH v2] arm64: efi: Force the use of SetVirtualAddressMap() on
 eMAG and Altra Max machines
Thread-Topic: [PATCH v2] arm64: efi: Force the use of SetVirtualAddressMap()
 on eMAG and Altra Max machines
Thread-Index: AQHZPB16WuoCttLgRE2E1vPXNQssV67F5ikg
Date:   Thu, 9 Feb 2023 04:26:16 +0000
Message-ID: <DBBPR08MB4538C586B721C8209B03AEEEF7D99@DBBPR08MB4538.eurprd08.prod.outlook.com>
References: <2ab9645789707f31fd37c49435e476d4b5c38a0a.1675901828.git.darren@os.amperecomputing.com>
In-Reply-To: <2ab9645789707f31fd37c49435e476d4b5c38a0a.1675901828.git.darren@os.amperecomputing.com>
Accept-Language: en-US, zh-CN
Content-Language: en-US
Authentication-Results-Original: dkim=none (message not signed)
 header.d=none;dmarc=none action=none header.from=arm.com;
nodisclaimer: true
X-Microsoft-Antispam-Message-Info-Original: w3Q+kG9JiL3pAxCt7DlIEfFqGDyMw/kAjduYw67lh2Ci++YeZNzd1mEvwKD2ebNmqflj/NnPJuTrw8KkQpLtucEq+EkmgyZkm6KDYIMwiCALdUcy6BEd2yAyNGKKyHppp1kWrItcxq8bgitt9slPK1zQdOgj3iCU1lTmAcZo0ChB1vXIoO1afjgkIFlirDkIRlqk93alpq3OGSol5ZJBgHB4uy94QiJp4MuExPDwcYob+yeW+a7RKR56fXYIdt+MSYDwhqpteL3rxB9v99kO9h3XkqmDNmYWT8LGRI/PPq1D7Nfe0dK9RWxgf/J/RAGWqgQg54EgOK6uPkLpT84cMICfbq36bXuFB502hCxVO1pQ1rLs5/BK7JgqR7yRLaAt5tHPh9LBpJQc2jyLRm8P7gp0SaAcl2SftEIwx5zwoQIBmXUzjaYrQcPoe+XV198v7LDwgzug+5EpJrXQL/bT+EaYFPNYXyOu/GhEfpPYjAnXrVT9mjPzS+XJg5ioxVJgBiNfUKopxte/1pwuj0xi2HCH5amdnzKHoMmZtRuDejMXrFo7OZWHINXNLJu9TysLq875PGyCSUBIdEOI9SJMOkCHmrs57uwljHTcpSbmim4x9RBD1ZkidN8tn82tAu8+0lXwRJCta82AzmQUozuRUgJpgZ/1UjB4VZdggewlGM/Vvrs2sOuVNWjKys3UxcoVTy+92Hex6UDlLVQO7WhTsw==
X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DBBPR08MB4538.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(4636009)(39860400002)(396003)(366004)(136003)(376002)(346002)(451199018)(66476007)(83380400001)(8936002)(76116006)(66946007)(316002)(54906003)(66446008)(64756008)(52536014)(5660300002)(478600001)(110136005)(8676002)(4326008)(41300700001)(186003)(6506007)(53546011)(26005)(7696005)(71200400001)(9686003)(33656002)(66556008)(38070700005)(55016003)(86362001)(2906002)(122000001)(38100700002);DIR:OUT;SFP:1101;
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR08MB6297
Original-Authentication-Results: dkim=none (message not signed)
 header.d=none;dmarc=none action=none header.from=arm.com;
X-EOPAttributedMessage: 0
X-MS-Exchange-Transport-CrossTenantHeadersStripped: DBAEUR03FT056.eop-EUR03.prod.protection.outlook.com
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id-Prvs: 54571038-1344-4ea8-6407-08db0a55c95e
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: W0fqpg3UNoQbJ6CXWk+3oMsnuhy6ErfDYKmSn1cQGgep5A37sgy+Gr+ath/6z6W76K+GMV+tTJ5zYvYcjEkLijY7v/wOV4322UuZtPfEyOXstpAXL9EnJaNW5dNy6vwAXsuJBDyAa7GmzE40nkE0SqXcGvXMgLDCtJUsEtzdz8Xz+Y62uIE1RumB5ipUtwh5ONIUzT4OFnKDccNdFw9qZfqa7vJvy6HPZf3llCAl8/TQbrj6lMTyusRqHHzVsH9Z4wqS76ApCQ4UaghQ+YOJpEkIjwkR/0b9sCzLq0PBVSwfeLU1yXga6z4UcJuq4LL51L2jYNbsGFvY3CHgQNZU95An83bTO3pZAbCjiIxg1ptHFHe7U6bdyFH0nDaBCfBC5NyDNNMhWnTMOZf0x7JB2TKlQB+9n7t75F46OiESe4LlPD1sYP2Hah2XiTKzKYfTyHbIKvHw7Z1QedSZ5UhPwKi99AwydALK53GnNAPBb3t6TbuCKovLM8evpTBdtEGMtwVHYMOFCxf/ap7KVSqv+IIEtvaDBDQnyVx2VY2HXKWdJoUrky0bQN4R8DejgZ1lvW0Q+PumILpI/6HjoSdH306akGuJxEyf7jHc+Cvf8EZcn4ehlH7QC9ztfdr4feLsf5ukziIWX8Mlkkzp1AKUxRw5BPErcywofnL1IW2qFYyFvv/AviuOes6HUUfMTjDLgjv6w4/gSnRRJ0RcfIOxgA==
X-Forefront-Antispam-Report: CIP:63.35.35.123;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:64aa7808-outbound-1.mta.getcheckrecipient.com;PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com;CAT:NONE;SFS:(13230025)(4636009)(376002)(136003)(39860400002)(396003)(346002)(451199018)(40470700004)(46966006)(36840700001)(82740400003)(81166007)(356005)(86362001)(33656002)(40460700003)(41300700001)(52536014)(8936002)(5660300002)(316002)(110136005)(70206006)(4326008)(8676002)(54906003)(7696005)(70586007)(450100002)(2906002)(82310400005)(55016003)(83380400001)(336012)(47076005)(36860700001)(40480700001)(478600001)(9686003)(53546011)(186003)(26005)(6506007);DIR:OUT;SFP:1101;
X-OriginatorOrg: arm.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2023 04:26:25.5061
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: ba551e31-1ac1-4d7f-4e17-08db0a55ce73
X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com]
X-MS-Exchange-CrossTenant-AuthSource: DBAEUR03FT056.eop-EUR03.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR08MB6282
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


> -----Original Message-----
> From: Darren Hart <darren@os.amperecomputing.com>
> Sent: Thursday, February 9, 2023 8:28 AM
> 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() o=
n
> eMAG and Altra Max machines
>=20
> Commit 550b33cfd445 ("arm64: efi: Force the use of SetVirtualAddressMap()
> on Altra machines") identifies the Altra family via the family field in t=
he type#1
> SMBIOS record. eMAG and Altra Max machines are similarly affected but not
> detected with the strict strcmp test.
>=20
> The type1_family smbios string is not an entirely reliable means of ident=
ifying
> systems with this issue as OEMs can, and do, use their own strings for th=
ese
> fields. However, until we have a better solution, capture the bulk of the=
se
> systems by adding strcmp matching for "eMAG"
> and "Altra Max".
>=20
> 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>
Tested-by: justin.he@arm.com
> ---
> V1 -> V2: include eMAG
>=20
>  drivers/firmware/efi/libstub/arm64.c | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
>=20
> 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 =3D efi_get_smbios_string(1, family);
>=20
>  	/*
> -	 * 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")))
In terms of resolving the boot hang issue, it looks good to me. And I've ve=
rified the
"eMAG" part check.
So please feel free to add:
Tested-by: Justin He <justin.he@arm.com>

But I have some other concerns:
1. On an Altra server, the type1_family returns "Server". I don't know whet=
her it
is a smbios or server firmware bug.
2. On an eMAG server, I once successfully run efibootmgr -t 10 to call the
Set_variable rts, but currently I always met the error, even with above pat=
ch:
# efibootmgr -t 9; efibootmgr -t 5;
Could not set Timeout: Input/output error
Could not set Timeout: Input/output error

Meanwhile, on the Altra server, it works:
# efibootmgr -t 9; efibootmgr -t 5;
BootCurrent: 0007
Timeout: 9 seconds
BootOrder: 0007,0005,0006,0001
Boot0001* UEFI: Built-in EFI Shell
Boot0005* UEFI: PXE IPv4 Intel(R) I350 Gigabit Network Connection
Boot0006* UEFI: PXE IPv4 Intel(R) I350 Gigabit Network Connection
Boot0007* ubuntu
BootCurrent: 0007
Timeout: 5 seconds
BootOrder: 0007,0005,0006,0001
Boot0001* UEFI: Built-in EFI Shell
Boot0005* UEFI: PXE IPv4 Intel(R) I350 Gigabit Network Connection
Boot0006* UEFI: PXE IPv4 Intel(R) I350 Gigabit Network Connection
Boot0007* ubuntu


--
Cheers,
Justin (Jia He)