From nobody Mon Mar 18 16:37:54 2024 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 4Tz0ry2ZVqz5F3Yv; Mon, 18 Mar 2024 16:37:54 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tz0ry23wVz4lC5; Mon, 18 Mar 2024 16:37:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710779874; 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=KUKa2kL6O+pEpj+9s0h1rHWiTYJIicpEZtQQ5PXHHxA=; b=aTTZqRzw9bONaVZvaGGM1ceL0/sHiwE3AKh9oyAQiaAIbr791Q7Mb53tVIbE2WmNl6k8he oOIB0UEcD9JlQqx6MVWtoFwHMOfGrvVZJWYtH5lmOHk6gAocBgkZY+U58XowcV6rR/RItm nEvEtUZnX8woqKYbn3BvfFYKQ8KylYJzJV8mfdT0ejtmvob5qi2hLfxAlrTFQpk8vJFNs1 MeHsbzfVD5wL4Eij/pUCAQUyx/95dVMfE1l/2TlZrCE0Lr2BtHTIdfCsivju3fEuK86E47 pniuSj6L3pPh019A0Z5vGu1Zo9CbHQufS4meDDbAGiam/RWB9eadLU7Lnnfd5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710779874; a=rsa-sha256; cv=none; b=bvdfdTrmYadra5G/u0JTyazZ/oAOqcm+/MKRPj8dHjYneXUXJtLqISd+EqOLZDXAY6dAei deBSE8zjR+MJXP7baLfVlKG8i1BbI1S87UVvxxbQXwDMRvIkY7p5PVkwx2Q1Z1RfyLajBz M5q7ciXtljL1SOkwyhmaoCXp1R2zwal/7zrUnpnIl6Yf9k0jiP8JKxKfEtGYlarPE1mcey BkehLZqrKfEAgVRI652rrV3sT40fAEa69SYW0xSsNOUA6Sl1kGH4NkKtbHSd+sPA2Uqhz8 IKL+3p9lKucdHY2dv4XELIp01nEFafg0MpOp3p5ZqGBXw0fH1ZV9eHMSW9+sOA== 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=1710779874; 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=KUKa2kL6O+pEpj+9s0h1rHWiTYJIicpEZtQQ5PXHHxA=; b=BUgms5QPPaoUpZHZEm1q5GVQ/SV+CnSVeo/9cw7KKgu+kyhjw5IF2+3ip0bbHioKjGMj5V H3O7feMPz2dF5UT0Yn+iG7W2fvBfVYf1QA7cmfxFzlA5E5U6jHm5qvuNwZ5AlY9oWY4pV9 Ei7cqtdmYylW4sPHkZJimSG4dBmq5YgucyR30AWQC1bP413N6Gepj+NLWRhszPIR4hF+D9 S52/6s1zpuLbrrPGcrngBBmwWCcbozi3XofZ6u8QdFxx6J+gGcnulqyByQ72fEvn1Gyqp0 VihoFJ6sLCL2Mdi+93p6PGtDZjnnfRBjgmRfuHEQWSSshA7PkRKpWqvQ2s4GJw== 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 4Tz0ry1XfPzVPB; Mon, 18 Mar 2024 16:37:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42IGbs9N070975; Mon, 18 Mar 2024 16:37:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IGbsgZ070972; Mon, 18 Mar 2024 16:37:54 GMT (envelope-from git) Date: Mon, 18 Mar 2024 16:37:54 GMT Message-Id: <202403181637.42IGbsgZ070972@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: 801160f4c0a3 - main - arm64: Rename drop_to_el1 to enter_kernel_el 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 801160f4c0a3afbd136a1a6402c9ca233dfdc1eb Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=801160f4c0a3afbd136a1a6402c9ca233dfdc1eb commit 801160f4c0a3afbd136a1a6402c9ca233dfdc1eb Author: Andrew Turner AuthorDate: 2024-02-15 14:48:54 +0000 Commit: Andrew Turner CommitDate: 2024-03-18 16:20:51 +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 --- 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 6589d3e35a3a..fd77938edae9 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 and x23, x23, #(CURRENTEL_EL_MASK) cmp x23, #(CURRENTEL_EL_EL2) @@ -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.