From nobody Mon Jul 15 12:38:05 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 4WN1vL2Vdnz5QrVC; Mon, 15 Jul 2024 12:38:06 +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 4WN1vL06zSz4H9g; Mon, 15 Jul 2024 12:38:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721047086; 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=OAxYhEcCwDO+hj9A4MbWg/TWaksJS5tlQhj0+NVo1g8=; b=h4cqGXSILPeRkM8gbEZ6CSSDIes9SOinyPuZ0GN7OPlU4PA5PE5vARFt/e9UsGI/RiqbPM dp+dOO2CXECDJ2Z8DqiJIU3QbLAtGlZXAP8/wVv+9LcGnUvdregU/i2c5u0PFRkb4KaHSu gpYmXEzxpqOdzyDk7d5r11MOJr742xXDGHmMhGKc3OIXrPL2Q9M3MnJEf/yb9jShqSZE9y RYvoVz9iTAzY3ekKRF83EF4M0nwSyK2ns4mG5RVNM7WErfjy+9fbeLlK/k7VYotVyreP5R lDZRTCc6GlIyuVbOg3JsWjTHGcfvFPt7UDgr0Y7EWVDZ4g4uErmWWTbPUdDSVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721047086; a=rsa-sha256; cv=none; b=Xhz38HsV4DMXdiwWbIrruV9vvpGLUWbkWaYu1h1PCg3xb3U2woxfM2d5ftNnwKGqZTSwrQ 3Hqb7xCP50uglHWDjcJAAVSC4/BTn03dW4oWVGOKBumFySzDFUg5rvHcc+dw6r5o5NxlHV 8sXu/zezZAX4ecfh/VBxQpoUm8OAgwUQX0hDVPkA3c6PwXg6OELwaLIN6Qsd3Rg7eJA28q 3IydilKbQ4ULKgurYifb/xlI6douKPWlKW/KOS8zhpkVU9rIHdZ0huszWJr214buURynet VfWy0TvmY+SIQLnxv/ad+YTOQBjD/X5up4VhwHrVr65/HyH1yiNd1RPesyLxnQ== 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=1721047086; 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=OAxYhEcCwDO+hj9A4MbWg/TWaksJS5tlQhj0+NVo1g8=; b=CDR+eSkFxawhFAroDFXcYD3w3nmx+tYtr2q8aDvn9jNKazWNZ6H9yUk4aPjQ2UkC3B0xDR z03kfa6xvZJc3M8h1xUy7FQQxULcV4XMfkwwLbF7xKNKsjOcKwmj1ub/fS+vf2NzU5Y3YZ aHfovg1DNZhzvHVK7kxc3SyxtLxW4vQQZgvn1u/ZLLFi5O0+aLg+EzMgH98d6g60r7bbH3 5oPdNHP8BOBMah5pRjSIs8c4JKnAl1VufXq0F7OlWYnYmsRMdVMAvWXoEDy1SamUQP3L6N dNyi38pmVexFpChF6faLJxMDSBYwoTKMWYOo/77AXKSX4S2N5Y1DcNvmEw006w== 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 4WN1vK6k16zsM0; Mon, 15 Jul 2024 12:38:05 +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 46FCc5Ee059639; Mon, 15 Jul 2024 12:38:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46FCc548059636; Mon, 15 Jul 2024 12:38:05 GMT (envelope-from git) Date: Mon, 15 Jul 2024 12:38:05 GMT Message-Id: <202407151238.46FCc548059636@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: cf99898c4e87 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: cf99898c4e8703174d6502b5690f5d68a8f37a5f Auto-Submitted: auto-generated The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=cf99898c4e8703174d6502b5690f5d68a8f37a5f commit cf99898c4e8703174d6502b5690f5d68a8f37a5f Author: Andrew Turner AuthorDate: 2024-02-15 14:48:54 +0000 Commit: Andrew Turner CommitDate: 2024-07-15 12:34: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 a93c95b18f44..4bde1df945cb 100644 --- a/sys/arm64/arm64/locore.S +++ b/sys/arm64/arm64/locore.S @@ -49,8 +49,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 @@ -176,8 +176,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 @@ -232,7 +232,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 @@ -314,7 +314,7 @@ LENTRY(drop_to_el1) .align 3 .Lsctlr_res1: .quad SCTLR_RES1 -LEND(drop_to_el1) +LEND(enter_kernel_el) /* * Get the delta between the physical address we were loaded to and the