From nobody Mon Jul 15 12:37:59 2024 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 4WN1vD29Rzz5QrTn; Mon, 15 Jul 2024 12:38:00 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WN1vD11Swz4H2V; Mon, 15 Jul 2024 12:38:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721047080; 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=sCg+WdmKVdrP5leeJeeKp8QUViziRjVb/odVO12RNrE=; b=NKHpamlovcmws9dibAxqRL9gL9ixTV61a3IlqnybIy/ml5CTpH9Vz3GIEtG1tXKF06deUp e9mxkOl3LqUD2DldZSY2bdEuVLsCF9eDmPlaDcnVilIP1W8JKBCxuVfNOwnscFnq+9jm7o qxVC6uik1A8ZPnctu97yBMvWV4YirxpOHPhwk50UmkXp/Xo9WUAuW/UnKbgDXNIbeyMyXT /Nf7yd02HKyBSedzXDR13wcs4hi057cwPrvIzoFjpVmKxQboZsjGl6hjNPdUfdsoOvs7NS GdB1jjbP83b8CttRcglztvVVZQob1AQ2L5QkRVlBQuVQ3OK0eYhJQoB444eFzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721047080; a=rsa-sha256; cv=none; b=l/3AfEGimD28R7mBNU2/zI/TO2iKbvpbCnEJDwhc2NC2IoLcT0/IvIcA6PwtGj16FUrYyx DBd2EKaV1luJCXHMOgl+BlNN9nhNZZSY42cr7J8cgjNr/UDGclIHWlSkkXWKz4K0wkYXQp JU1g8BIDpB0/rkU0ffDAb7DvkQ9jTW5kAA+q5MBKMzwHs6ifDmdikZy0BNqEIBEOqKZBwM 2BecZVvPRtL91qeLmkM062jiOa9unM617u+cKFsL5VPNrf6uBPKPSR/FZK6wxsa6ox6EWD +zS4gvykwAhC84UP+FjQTfmKSA8uJ+1GIlehz47hvnoTysajnQq7cneDVbswIA== 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=1721047080; 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=sCg+WdmKVdrP5leeJeeKp8QUViziRjVb/odVO12RNrE=; b=AxHxlpWZADpBUuozo0SM3qCXuL9PFCOyf/IqxC+WP5OqLq1/ONfUI5NzvfzzPOwVpuOwSu wKsCGvmtxwAXyQSh8tHklepsFDFaqIfvYvWDgC8DOK4jaKyOy8driq/Pcc2jPKLLrePdKh +x3dl0CYV9RLhMMSV88th62Pw8HodIcAcWH9rTKTe60Tohd6KowadoR3hlBSK9hsqChppP k+4OoYWNGlvU9HEldYzJXi41gGyBZmAWIupcH34Yne3G4Dqe43FTdXvr7JUmLfXxMzVpj0 NhYI31E0f06CtYqAhyLqGJ0W0ceHLfT6oq7ApzZOAGCTKkuifd/jsbyOe00dLA== 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 4WN1vC6t0LzsLw; Mon, 15 Jul 2024 12:37:59 +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 46FCbx2G059083; Mon, 15 Jul 2024 12:37:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46FCbxwg059080; Mon, 15 Jul 2024 12:37:59 GMT (envelope-from git) Date: Mon, 15 Jul 2024 12:37:59 GMT Message-Id: <202407151237.46FCbxwg059080@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: cfba49ca49f6 - stable/14 - arm64: Rename drop_to_el1 to enter_kernel_el 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/stable/14 X-Git-Reftype: branch X-Git-Commit: cfba49ca49f6ac5e401a05148a71896ec2a8e6a7 Auto-Submitted: auto-generated The branch stable/14 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=cfba49ca49f6ac5e401a05148a71896ec2a8e6a7 commit cfba49ca49f6ac5e401a05148a71896ec2a8e6a7 Author: Andrew Turner AuthorDate: 2024-02-15 14:48:54 +0000 Commit: Andrew Turner CommitDate: 2024-07-15 12:22:28 +0000 arm64: Rename drop_to_el1 to enter_kernel_el In the future we may not drop to EL1, e.g. when we support FEAT_VHE where the kernel runs in EL2. Reviewed by: emaste, imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D43976 (cherry picked from commit 801160f4c0a3afbd136a1a6402c9ca233dfdc1eb) --- sys/arm64/arm64/locore.S | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S index e97b393b90b4..9f3739c85534 100644 --- a/sys/arm64/arm64/locore.S +++ b/sys/arm64/arm64/locore.S @@ -62,8 +62,8 @@ */ ENTRY(_start) - /* Drop to EL1 */ - bl drop_to_el1 + /* Enter the kernel exception level */ + bl enter_kernel_el /* * Disable the MMU. We may have entered the kernel with it on and @@ -201,8 +201,8 @@ ENTRY(mpentry) /* Disable interrupts */ msr daifset, #DAIF_INTR - /* Drop to EL1 */ - bl drop_to_el1 + /* Enter the kernel exception level */ + bl enter_kernel_el /* Set the context id */ msr contextidr_el1, xzr @@ -265,7 +265,7 @@ END(mpentry) * If we are started in EL2, configure the required hypervisor * registers and drop to EL1. */ -LENTRY(drop_to_el1) +LENTRY(enter_kernel_el) mrs x23, CurrentEL lsr x23, x23, #2 cmp x23, #0x2 @@ -358,7 +358,7 @@ LENTRY(drop_to_el1) .align 3 .Lsctlr_res1: .quad SCTLR_RES1 -LEND(drop_to_el1) +LEND(enter_kernel_el) /* * Get the physical address the kernel was loaded at.