From nobody Wed Sep 09 14:23:07 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 4hg31l70Qgz6s9s7 for ; Wed, 09 Sep 2026 14:23:07 +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 4hg31l3Z6Tz3KDT for ; Wed, 09 Sep 2026 14:23:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788963787; 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=GFDg21Hs3mYTslgOmFxE3YbfMmPXl5pSvpvccKVWb6w=; b=mhHcyYnf7J3xpF89e+8wz46hl+dy8etx02QaaGUakgW1z0VNR2sdGi+947k3OjtsG4o9gM CZinfYqeLG3GAi9lld0C+AJ2RxrALZeDK/fTFmGNBiUIf7JY6KC8DEmz3M9sEFrazA2V1N gswhrOA0PXI29Pa43r+WJpzVcpNvjfKvsTowwI0+o8ELS2m0Z0G3UthC6lgg/7cb6xNkUP mt74xmLjIcw1S8pjkSeZRBEN6w+Q0wQ1QSASQWkW53/dBbKiUme1AdmlXuHWgnP85wEAkw xTICs+HBYX8SAmSdj+/KTjH73fxpc8FNtS74k/kHH+KT8Qg0PQzxGWOizFOrzg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1788963787; b=PkuCQoGxZKG0fmrljylaE9/CvxaBCswQQnI1uf4K9ZlT3kVbngPh8G5A+IURZQjZLAvQ1L cxgWj0KnZZHDH/VqThnG4fNxJNgvxbHq0YWBVXwGcVbG9WU2e48U/kjWW0CDOVRxIgVug/ OZQ4EACuLN4tnNOkYQ1W7xI6wIkYsluXHW53j0LqmVobsmaML+V2cLSUeQ6NdnmUNCAchq jKXeYl/phpZilCXLZdeyyIqMA+pVrb+DvIYmDqC2x45Qx/bpcWDVCczjLzIrhCz8peAxWA mEYLdnX8Ed/VVp7AFBE62aDjeUosjTIb/49LmzvDzwm/9mQgavY2HdraexW62w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788963787; 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=GFDg21Hs3mYTslgOmFxE3YbfMmPXl5pSvpvccKVWb6w=; b=e/sVLdr+CY2ecb+AvhjBX6EW5b4dQgkdFDAkEV9aT7hFHVrg5z6vmhFBBZHFCVGV7YwDXG 8ROaCQ1QnBBlIUMieCzL2Wa4qTAs044dE2SSfjW2LFjSZ1fKgRgLyFqsptL8ytWMfM5TBn FvkMNRn7yOenZuX+IDGv43jCLKm9Lx2LEGk8RU/VNTjiJyLwCBSNkgQ7zmo0MTMOQ3K0in 467nFjxonYalDfTXDb/EPyDo5Ft8uKdbp2IH/84kJzNJB58HPNRez1ZiJCoxOgY02++r/O 3wM5LTpw0QpymSe3K5Lwth4RAXmFx3f1jzZgeK0EPY1uPmdpT2fNtIl2a6Jjiw== 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 4hg31l2Mkmz11By for ; Wed, 09 Sep 2026 14:23:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18448 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 09 Sep 2026 14:23:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: deb43dafdcd2 - main - arm64: Fix the capitalization of CurrentEL 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: deb43dafdcd2805a59e7ce29327279c8357dbe03 Auto-Submitted: auto-generated Date: Wed, 09 Sep 2026 14:23:07 +0000 Message-Id: <6aa16bcb.18448.1bdbb0af@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=deb43dafdcd2805a59e7ce29327279c8357dbe03 commit deb43dafdcd2805a59e7ce29327279c8357dbe03 Author: Andrew Turner AuthorDate: 2026-09-08 00:00:32 +0000 Commit: Andrew Turner CommitDate: 2026-09-08 03:05:27 +0000 arm64: Fix the capitalization of CurrentEL Use the same capitalization as the Arm documentation. Reviewed by: Kajetan Puchalski Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D59180 --- sys/arm64/arm64/locore.S | 4 ++-- sys/arm64/arm64/machdep.c | 6 +++--- sys/arm64/include/armreg.h | 12 ++++++------ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S index 7d85b54d4688..20b072912ab9 100644 --- a/sys/arm64/arm64/locore.S +++ b/sys/arm64/arm64/locore.S @@ -349,8 +349,8 @@ END(mp_cpu_spinloop) */ LENTRY(enter_kernel_el) mrs x23, CurrentEL - and x23, x23, #(CURRENTEL_EL_MASK) - cmp x23, #(CURRENTEL_EL_EL2) + and x23, x23, #(CurrentEL_EL_MASK) + cmp x23, #(CurrentEL_EL_EL2) b.eq 1f /* diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index f35ec7ab2e2e..ebe5f8aee4f9 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -252,15 +252,15 @@ CPU_FEAT(feat_mops, "MOPS", bool has_hyp(void) { - return (boot_el == CURRENTEL_EL_EL2); + return (boot_el == CurrentEL_EL_EL2); } bool in_vhe(void) { /* If we are currently in EL2 then must be in VHE */ - return ((READ_SPECIALREG(CurrentEL) & CURRENTEL_EL_MASK) == - CURRENTEL_EL_EL2); + return ((READ_SPECIALREG(CurrentEL) & CurrentEL_EL_MASK) == + CurrentEL_EL_EL2); } static void diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index 207f024774e9..d8d695a39477 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -463,12 +463,12 @@ #define CTR_IminLine_SIZE(reg) (4 << (CTR_IminLine_VAL(reg) >> CTR_IminLine_SHIFT)) /* CurrentEL - Current Exception Level */ -#define CURRENTEL_EL_SHIFT 2 -#define CURRENTEL_EL_MASK (0x3 << CURRENTEL_EL_SHIFT) -#define CURRENTEL_EL_EL0 (0x0 << CURRENTEL_EL_SHIFT) -#define CURRENTEL_EL_EL1 (0x1 << CURRENTEL_EL_SHIFT) -#define CURRENTEL_EL_EL2 (0x2 << CURRENTEL_EL_SHIFT) -#define CURRENTEL_EL_EL3 (0x3 << CURRENTEL_EL_SHIFT) +#define CurrentEL_EL_SHIFT 2 +#define CurrentEL_EL_MASK (0x3 << CurrentEL_EL_SHIFT) +#define CurrentEL_EL_EL0 (0x0 << CurrentEL_EL_SHIFT) +#define CurrentEL_EL_EL1 (0x1 << CurrentEL_EL_SHIFT) +#define CurrentEL_EL_EL2 (0x2 << CurrentEL_EL_SHIFT) +#define CurrentEL_EL_EL3 (0x3 << CurrentEL_EL_SHIFT) /* DAIFSet/DAIFClear */ #define DAIF_D (1 << 3)