From nobody Tue Sep 22 13:32:34 2026 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 4hq1HQ5N5Cz6thCW for ; Tue, 22 Sep 2026 13:32:34 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hq1HQ4RJTz4Pxr for ; Tue, 22 Sep 2026 13:32:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790083954; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w/KcSrZ/1jYm+DPghGApj6WZI3PVbUanuMPF5vTHzV0=; b=J+1JFeTk+HSdZu+6zQVC5hwq2f+iWpRFvkLgWi536f1Qalx62qevx2hnArz9Yq0clofym9 sT4HWzVs1F6bS/I69xvVCtAjaSxzjA5VHaGYGXALHDHjLdQNnMBsZY0s/1XjymUmp3vFiz G7T00lT9g24rLJoT3IOTQnSW3tt3/iOz0JQtdcwrvSdtuBlT4ZDFhU/K2mYWaLdeY4gauw VexjtP1Ku/kkBnZsk95FGlwrKVNeOvGULK2ybzA7Y0VctZkF/iHaFI6e/0KeCcaaNgNCaM n+zm5w7xTao1dpS7CcMGQ0u59a+QBvvwof7jsMUNrvBTT1ryKAarJVSUFNXgOQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790083954; b=pJ/qAm0QT9yzXNRerZc644vR98a5kpmkZIhJtba7P+Geu1dU2P5KpmkGlmgbz7gAspHp8T Hf8V1Mnhr38xo/BOmur9MrhV1LYysyx+jQkYmsOqKBQkUHtDRwG/IWoNWMOdBg6hFX+URx y8LNG9SLhHLnAedxcdkl74LHuof1hiJbJ9vUW2R0qDay/oUEqHkzR4EycHPz3ZdtLzPCJI n6CEsOCZtknwDkc0YvMe09LzJOGzIVK4YK3LRG9GN3jhEMy//3DS6QNA7Mw5jXb8odxPpy Nbhc6GONJJ02/5OkUHjmP7Uv8ovkYP+omPQZqpwMv6MJuI4DfjysZlT1luvaHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790083954; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w/KcSrZ/1jYm+DPghGApj6WZI3PVbUanuMPF5vTHzV0=; b=fsUaDS4hvg9irQWKU2iiILxbSM3syRa1wBfZ+xte6lubXQWyR0Zw2qjT0KBmS1cLf2RJHe 50umYoAXyhTSvZK2Xg0vDCnRXPT2H9K7SRkX2dxCgmjAFpU6MjmdWl/Fue1sOdt83I8D5y 6HafIZA4XUBItD7msylf/7bD4hYOZm3m4HEqycHHfoJG5LIAITIZnUK0Hr/r8lIdXud9wh i1DmeC/P1RyVKaZUEjXC6fYNQcB62YxyCV5yJF92TdwJfx+NGxTwEVyT+ugfikCYx5sDwh akK0gWI2Dh5VBmedokT6zKlfUMjFY0DTFs/lFdnYOWd89s62xMss0XY6v5EVWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hq1HQ3VKnz1882 for ; Tue, 22 Sep 2026 13:32:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c8d5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 22 Sep 2026 13:32:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Kajetan Puchalski From: Andrew Turner Subject: git: 334f81f41185 - main - arm64/vmm: Fix translation regime in s2_tlbi_range 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 334f81f411857ad7b3cdeaec20b44316dde01ae8 Auto-Submitted: auto-generated Date: Tue, 22 Sep 2026 13:32:34 +0000 Message-Id: <6ab28372.1c8d5.70a447b7@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=334f81f411857ad7b3cdeaec20b44316dde01ae8 commit 334f81f411857ad7b3cdeaec20b44316dde01ae8 Author: Kajetan Puchalski AuthorDate: 2026-09-15 16:17:56 +0000 Commit: Andrew Turner CommitDate: 2026-09-18 19:07:49 +0000 arm64/vmm: Fix translation regime in s2_tlbi_range s2_tlbi_range under VHE is supposed to clear HCR_EL2.TGE, but it erroneously clears an unrelated bit 27 in TCR_EL2 (HWU61). Since HCR_TGE determines which translation regime will be used by a tlbi, the instruction targets the wrong regime when it is not cleared. Fix the register accessed by the function to actually clear HCR_EL2.TGE. Signed-off-by: Kajetan Puchalski Reviewed by: andrew Sponsored by: Arm Ltd Differential Revision: https://github.com/freebsd/freebsd-src/pull/2435 --- sys/arm64/vmm/vmm_hyp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/arm64/vmm/vmm_hyp.c b/sys/arm64/vmm/vmm_hyp.c index 6eb1208e4fb5..99a5b3728192 100644 --- a/sys/arm64/vmm/vmm_hyp.c +++ b/sys/arm64/vmm/vmm_hyp.c @@ -835,7 +835,7 @@ VMM_HYP_FUNC(s2_tlbi_range)(uint64_t vttbr, vm_offset_t sva, vm_offset_t eva, uint64_t end, r, start; uint64_t host_vttbr; #ifdef VMM_VHE - uint64_t host_tcr; + uint64_t host_hcr; #endif dsb(ishst); @@ -852,8 +852,8 @@ VMM_HYP_FUNC(s2_tlbi_range)(uint64_t vttbr, vm_offset_t sva, vm_offset_t eva, isb(); #ifdef VMM_VHE - host_tcr = READ_SPECIALREG(tcr_el2); - WRITE_SPECIALREG(tcr_el2, host_tcr & ~HCR_TGE); + host_hcr = READ_SPECIALREG(hcr_el2); + WRITE_SPECIALREG(hcr_el2, host_hcr & ~HCR_TGE); isb(); #endif @@ -882,7 +882,7 @@ VMM_HYP_FUNC(s2_tlbi_range)(uint64_t vttbr, vm_offset_t sva, vm_offset_t eva, isb(); #ifdef VMM_VHE - WRITE_SPECIALREG(tcr_el2, host_tcr); + WRITE_SPECIALREG(hcr_el2, host_hcr); isb(); #endif