From nobody Wed Jul 2 10:02:23 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bXFnD2nYxz60Bmx; Wed, 02 Jul 2025 10:02:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bXFnD0Fgnz48pk; Wed, 02 Jul 2025 10:02:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751450544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OeL7Akn26Xgb09X4tDQC7xkeebQiem2hZ6X+Nf+3klc=; b=Y8ToMQ3uvfSNvyMiIASHXz8SlEBFkkeAGGKsfaa/J91QTmuuSEOczd2MVGbKsooDLUv0HA TVNo4R4yy3FqiPw8UF5HyG+Z2K2I2AHPOxv07gLi03VcD8zwH6pibxHzZ8Bfu1y9ZnzOz0 +Iwhol4WSPe9utYXAErywPCutebbDhbrd6BANcg+FUMVaJ4V84JDfDs0j5Ir3Vvm3M5GcM 88eupdrsIFY2u0UqOlz1SVMok78dT9knCluwItcDLLz9mjTREQ9Og6Spufa5jICjyMl52J fqo96k5GidV+zqd0P8LV0IZw9xRxogn5dq5PXtZGo2oJIua5MrgM4aS79rTVxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751450544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OeL7Akn26Xgb09X4tDQC7xkeebQiem2hZ6X+Nf+3klc=; b=ReMQH7yueOkNyvsNDc2XQ8epR1/xOwkgZRovw92RMki/dWF96TWbzD/8A+OALKM69333QY t35yJaMl6lfGHWQpo85SXFTkNCXpecOA77dOIfg1QT3C4mbTi7dMSBPwcnSUmyvpOso4BJ UCEoDiK3p7lzTFGnWIgdf0R5x2NdXSWYuI0XRJHmmCqDcgDScsZhQKJNV+re4ZRfMjsk/O KDF8iyymxxZHIsO2ZFaKolHtWHRH46aAa4v8iYGWSNWGn4ndiWZqAQRbIWhQJQ6NLDFOxJ AJNS1KpjX6vnTgRB2stZN1ETWh96/a3/0MZRW3R9T31iV3OstavsXTdfrYd/KQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751450544; a=rsa-sha256; cv=none; b=c+mJv2RtZeRK0pLTeVSkJCqLtlzK00k9C+Ok+FDPHNnem4RXt0MvLyLtUBW8Xt3QZBITE7 qVdLk3YXAXkv1zyOfN4hmJ41tS3ok6XkCPTPcH5msw4p/uxYenPCPFm659zxVrfMgacFte YY6oTy5d6ZSXRaAbDel3O1kiefYqW6TeyEnDbIxKIXIunrVC4l98Wa+ac3uhiFCBl+PfRX QHAUGWBzkZCI3wQCe2lMCkLFeDALZASpgtCS8aYvgd6ibHRIOctCsK0tV9eRgfc3PUvi9e gl8/R9vE+E7FCJvQfiaj3blSVcBSXJhoUh9Mj5191aXmYj7/zcaBCxGf4lxZgg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bXFnC6y34zK4; Wed, 02 Jul 2025 10:02:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 562A2Nrq012210; Wed, 2 Jul 2025 10:02:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 562A2NJr012207; Wed, 2 Jul 2025 10:02:23 GMT (envelope-from git) Date: Wed, 2 Jul 2025 10:02:23 GMT Message-Id: <202507021002.562A2NJr012207@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: eba385011bfe - main - arm64: Use CHECK_CPU_FEAT to check for VHE List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eba385011bfed4c7b536eb22913dff979f36f128 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=eba385011bfed4c7b536eb22913dff979f36f128 commit eba385011bfed4c7b536eb22913dff979f36f128 Author: Andrew Turner AuthorDate: 2025-07-02 09:49:15 +0000 Commit: Andrew Turner CommitDate: 2025-07-02 09:49:15 +0000 arm64: Use CHECK_CPU_FEAT to check for VHE Now we have a macro to check if a feature is supported in an ID register we can use it to see if VHE is supported. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D51102 --- sys/arm64/arm64/locore.S | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S index 2f549a527f43..3c75feaa685b 100644 --- a/sys/arm64/arm64/locore.S +++ b/sys/arm64/arm64/locore.S @@ -373,9 +373,8 @@ LENTRY(enter_kernel_el) ldr x2, =INIT_SCTLR_EL1 msr sctlr_el1, x2 - /* Check if the E2H flag is set */ - tst x4, #HCR_E2H - b.eq .Lno_vhe + /* Check for VHE */ + CHECK_CPU_FEAT(x2, ID_AA64MMFR1, VH, .Lno_vhe) /* * The kernel will be running in EL2, route exceptions here rather