From nobody Wed Jul 2 10:02:24 2025 X-Original-To: dev-commits-src-all@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 4bXFnF2Td5z60Bmy; Wed, 02 Jul 2025 10:02:25 +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 4bXFnF0mc0z49BB; Wed, 02 Jul 2025 10:02:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751450545; 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=uZKkIDvrAj0lhUmrpNRa1YLE9huO7sUh2Ka4O95ARsI=; b=AHTtPgNCFtt1HciCDNMZFuPuQAo9ZnIfSs6GhmuD/Y998T8qdBbxxv6s/x+J6ts9GTd80D 3fL7HmAVpPKYlIyhF0A3dCHbV8MYp9ZezYi+TuFQDkjgQZ3degFKLAqceCxqNah5N6oa/s 1kk4HpJzddkJiJqY1iFoUqXtvqyzfpvJ7xq7u3FkARX0lEaPSJY21078Qc8b7GBhspoAeC pMV2GhGKvnl1FD6L7TJY9wfBxIWRqgvffz5kOtzMI8eM6wBiTAwRw5lI7CkQ0NfMdpC8cj UmlK8FNtw731ohdLcMfFDdrPd20h1r6YIOnxXviQsDD4rnZeD5nLm1sDDYfSkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751450545; 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=uZKkIDvrAj0lhUmrpNRa1YLE9huO7sUh2Ka4O95ARsI=; b=uu3P9FTiehh1Nd34tT6Uo25e+bD7L5mzCFmgdxT2gL8B3N+ZSwHN7M8g07ppYWHaEcuBzu uifpDfhz2lN5xvn4cv8lzCc0k12l0j0eR61PdchZn4Mf+qEoQl/8lE8P82eW5kbGX5fUFT Ro81D1ZP0eHGIhhkLqadUlzruqg4MKwfVqftSd3mLOjHVILLA3t7h0wJpZZ63j+E5jE8xQ bDWMfw5MURhiBXB8+huFkl2RfducFMzORG+KUibzUPBJMvOg41aOCQDcAxhoKtuZ8x68is K8Dc7uB3fqdr1HJn65fiE2DR8TY3kD3/HpCcRTDT8zIEjTuFRFUpZlS+BmYFfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751450545; a=rsa-sha256; cv=none; b=PaaQTVLla/ygghnzelQx8E5lDIdV2sbS0jslkmcoMMSSjhgLF4l7XeB3SjglXswC2s6bvL +hfLLwQjX158UaIAQ72OYeDtcHkYPT8TwraMTppO5fXiks5+Tdy4uNnxLV4Gm7NrsGJyDy J39WuxN8Xe/LB7pFrWsg6whAFTeiZ1ZT0MwTeAaTq4NCE7WWuyNZWz9pUDWoYGwqVqgX+c j4Le6kDbhVU/ZMShfJiGrpUslpZlkYmRVcL59y1yoUvs+MVWdGNbfCjEFQC/iMBnkx92Y5 eUI2ctN0ZoSjaowuZYMbym9ibdH4szmfDZnalCyFPN0Z1z7HmjJx1xnRGv5n2g== 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 4bXFnF0KthzGf; Wed, 02 Jul 2025 10:02:25 +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 562A2O9p012244; Wed, 2 Jul 2025 10:02:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 562A2OsT012241; Wed, 2 Jul 2025 10:02:24 GMT (envelope-from git) Date: Wed, 2 Jul 2025 10:02:24 GMT Message-Id: <202507021002.562A2OsT012241@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: 0e0576700fbe - main - arm64: Only set HCR_EL2.E2H when VHE is supported List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 0e0576700fbeb7c765095132a43410d3e35c1a80 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=0e0576700fbeb7c765095132a43410d3e35c1a80 commit 0e0576700fbeb7c765095132a43410d3e35c1a80 Author: Andrew Turner AuthorDate: 2025-07-02 09:49:24 +0000 Commit: Andrew Turner CommitDate: 2025-07-02 09:49:24 +0000 arm64: Only set HCR_EL2.E2H when VHE is supported When VHE isn't implemented then the HCR_EL2.E2H field should be 0. Move setting it to the VHE path of the early boot code so it is only set when supported. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D51103 --- sys/arm64/arm64/locore.S | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S index 3c75feaa685b..bb323dbafd85 100644 --- a/sys/arm64/arm64/locore.S +++ b/sys/arm64/arm64/locore.S @@ -354,7 +354,7 @@ LENTRY(enter_kernel_el) isb /* Configure the Hypervisor */ - ldr x2, =(HCR_RW | HCR_APK | HCR_API | HCR_E2H) + ldr x2, =(HCR_RW | HCR_APK | HCR_API) msr hcr_el2, x2 /* Stash value of HCR_EL2 for later */ @@ -380,7 +380,8 @@ LENTRY(enter_kernel_el) * The kernel will be running in EL2, route exceptions here rather * than EL1. */ - orr x4, x4, #(HCR_TGE) + orr x4, x4, #HCR_E2H + orr x4, x4, #HCR_TGE msr hcr_el2, x4 isb