From nobody Mon Apr 13 14:24:09 2026 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 4fvV5j57vjz6ZFX9 for ; Mon, 13 Apr 2026 14:24:09 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvV5j2fMsz3qnR for ; Mon, 13 Apr 2026 14:24:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776090249; 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=5x8AWcqgg1O98p5uiIGvvmronIiky0y76GlwClvtrk8=; b=FvybQT7nqymAWfdKyTSIiKBjzO/MRiVrkdxo9KFjNhCkfWZ5VcIneV4L9/t+Zo4Dw/eC5v GYDCSHg7h8vX6SK3pBetEdDv8jY5FAmEp/Feh7Lg9MyghpyJ7LIQwCRjFLBfwc+NZr8kLi N5Kt5ngBsNVoMU5/IrLh1brvTA9Kfe+0XYJ8oMobhtETTU4chjdDERwlwxB2vlfiTZKoCg R9GG/pPOWpOgFFtJMzrF5oURBnLd8kltr2MU39IxviEG9ZYP9vmm5bEJlcMZT/urgPt8JX o6Ypq1c8jNmIan8yWiLk9Kk37F4vbjzomyuYP6TJElAgArMEr0nQT7auPQdrbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776090249; a=rsa-sha256; cv=none; b=oFQtEf3PLJmim7gJ2Q0UJqTrHEzqCvWVOq4Q+sqmRJJeOmnbHmJZSbH17jTNv9x0mqh275 FXrpim0SaXbld6uCISeUpeGiXqt7R39+RHgeccwDB/NsEVF8HaRaxK4d+EjasEQc8HdXEJ Kf7HISzMZzF6kTfAevLFN6tXuq0HVtpA2CQ6kIHZqimb5Sz9oGdWzZMX6DMtLjYlWVfnNQ 1jaPbconV/Q+jhgDwnmuzHxmC4Bpq/NqUPK2mu8lhbtdqoAvi6vmqODGLfmjLQjozxxPRg pv46RUwfjTTE/tNFFvfrV9gUiEB6JeDuKiFNAsy4ckfQtAp75U9HT8dOh7MiVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776090249; 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=5x8AWcqgg1O98p5uiIGvvmronIiky0y76GlwClvtrk8=; b=mAbjga95z84Pj2sZkdh3yBda9X+3trM0RggLGwYyb4oqNnd8PLEDUzeBUgg4PXZg5cdvoi mP0omt1G9+eg78cYA2TmCRTvQDjxiyBau6yx8AtaHTAI+yaRUj8HYqX4Jxj8RnOtyARN06 sFuCpTNeShwnwAT0YT/Yx/fTSGl54OQwp0hiYtn7PoZQZ64ouUxUi/u2Y6VMvlABVAkZCo 3YgsDofL/1Xny7QWUZMjFV6LKhFjESjzYKp/dtkHRDLtZKLPc9BsHXNI7VlTRQEtqKpOWm IYBhO37iz5CDlwuj1/+lZ1i1OjKieCIecX9q2PKag29doA+T8n7XZEh6Ss7uQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvV5j1hC5z172G for ; Mon, 13 Apr 2026 14:24:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 464ef by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 14:24:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Harry Moulton From: Andrew Turner Subject: git: 58de79153622 - main - arm64: mte: configure initial state for system registers 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: 58de79153622145cb6fc57bc92c4de678876992f Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 14:24:09 +0000 Message-Id: <69dcfc89.464ef.4e312925@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=58de79153622145cb6fc57bc92c4de678876992f commit 58de79153622145cb6fc57bc92c4de678876992f Author: Harry Moulton AuthorDate: 2026-04-13 11:54:38 +0000 Commit: Andrew Turner CommitDate: 2026-04-13 14:23:05 +0000 arm64: mte: configure initial state for system registers The fields in SCTLR_EL1 and HCR_EL2 for enabling MTE are set, and if the ID_AA64PFR1_EL1 register shows MTE is present, the GCR_EL1 register is also configured, and the two TFSR registers which hold pending tag check faults are cleared. Reviewed by: andrew Sponsored by: Arm Ltd Signed-off-by: Harry Moulton Differential Revision: https://reviews.freebsd.org/D55946 --- sys/arm64/arm64/locore.S | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S index f1228235dfe7..4c8e0c680321 100644 --- a/sys/arm64/arm64/locore.S +++ b/sys/arm64/arm64/locore.S @@ -398,7 +398,7 @@ LENTRY(enter_kernel_el) */ /* Configure the Hypervisor */ - ldr x2, =(HCR_RW | HCR_APK | HCR_API) + ldr x2, =(HCR_RW | HCR_APK | HCR_API | HCR_ATA) msr hcr_el2, x2 /* Stash value of HCR_EL2 for later */ @@ -1063,6 +1063,21 @@ LENTRY(start_mmu) isb ldr x2, mair + + /* + * If MTE is supported, configure GCR_EL1 and clear the TFSR registers of + * any pending tag check faults + */ + CHECK_CPU_FEAT(x3, ID_AA64PFR1, MTE, MTE, 1f) + + /* Set GCR_EL1, non-zero tags excluded by default */ + mov x3, #(GCR_Exclude_MASK | GCR_RRND) + msr GCR_EL1_REG, x3 + + /* Clear any pending tag check faults */ + msr TFSR_EL1_REG, xzr + msr TFSRE0_EL1_REG, xzr +1: msr mair_el1, x2 /*