From nobody Wed Feb 21 11:27:51 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 4TfvCC3Z1bz5C1Wd; Wed, 21 Feb 2024 11:27:51 +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 4TfvCC1dF7z4MgB; Wed, 21 Feb 2024 11:27:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708514871; 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=me3rCigNej2nlXSP0EW+jFoCFetscY8ROwPEUClSshA=; b=IUurXCCqLrIEmIbFuAOujpGP+BpjAHf+CBaFRXa1IAvAMl0XpkIzRglWGX4oPKo/du+cRv ITcEGB6VrMaTeDDLP5X6oRxxw7YxCb558zCfjLrrdsxuAqrcLS/xXRLE3X2D+x3PSpJoPd pdp+rza09s81qnwn9LFX9My48oGtTW/Kt5Bbos/SSya6fY6blf70e1Vj9JB79f74OBod0K KlnF1N/P2oI751pRrlw6Qae0P8Az7gKjG9BF1kpZuw/v8u/NuMrUOvm1hERTQYLYM3o4h2 P3rTXHS4PEsY3Ci0g2WJzTFwcwlrQgeu7rlmlwVxbFQdVRwbt6HCBGfJmIR4qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708514871; 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=me3rCigNej2nlXSP0EW+jFoCFetscY8ROwPEUClSshA=; b=Ccjtj3yeh6IWGC876TEooalXEaeLcayBzI6bHIzdjflucLVJt6tU5+vM/d9NLpefcxw/v1 HAgMmG7b1Pll2+Z1oVCmSscuuLM5efKJuHNqxxlOMtrmNVeaF2R+to0huf1BpUzHzc5JRs 1/lePsGWAomROzkV3tX9gqeONQhXv6rUVQxxUEwmwNRaODYXaYxMcYXi4G4Ro1im0FW7SJ 8V0vd1ZPIoiUuJ9W/osYMtQDxFNrZ2x5xBIeBr0ulC+9wZOsUYuTOtgO5/Wp9iAT6LrwRM ezXvMNY73+29b1VMAz+LsnkV7k57sHz+zcV7Ivc5thp5+J9sGtpVvFIB8knBIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708514871; a=rsa-sha256; cv=none; b=C2PHGM3rEJ2F1mw4b1KUABRxSQ7y2dmD9VrlkrzIexLF3w4C7+f9F81CZbThmXp5DgNIyh /9dU37xPFdd4c84pJ1+pCaHvntXRRh3/3NFszOx/mVHYky7BjcGpJ2iczE79XfEPGYPR+1 tdNB7iw70WF3E175a1wnEZjU8zzOuFtZh6dX2ULxXasAqQ+qNMXT4tsy5zFbNs7kRkV+Hb HN0IfGm/1vXUQq2qWGBY5VXjq1FM49DwvveppCFGgGLn0Y4VqPTQjaUXd8cLa1VNcyInNT 2rHSRoJ9EtvUwnnHw+lB/mZV41aqDOWwMXDRwRf7E6pdHuqyyULgGFXJQ+4eMg== 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 4TfvCC0jLqz11GK; Wed, 21 Feb 2024 11:27:51 +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 41LBRpIR013314; Wed, 21 Feb 2024 11:27:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41LBRpgi013311; Wed, 21 Feb 2024 11:27:51 GMT (envelope-from git) Date: Wed, 21 Feb 2024 11:27:51 GMT Message-Id: <202402211127.41LBRpgi013311@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: 37563d39efd1 - main - arm64: Use the new CurrentEL macros 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: 37563d39efd115c7e6ccddb5f2dc1e0d089b2b8b Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=37563d39efd115c7e6ccddb5f2dc1e0d089b2b8b commit 37563d39efd115c7e6ccddb5f2dc1e0d089b2b8b Author: Andrew Turner AuthorDate: 2024-02-15 16:13:09 +0000 Commit: Andrew Turner CommitDate: 2024-02-21 11:23:58 +0000 arm64: Use the new CurrentEL macros Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D43972 --- sys/arm64/arm64/locore.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S index b246ed3f2a41..638c4a542891 100644 --- a/sys/arm64/arm64/locore.S +++ b/sys/arm64/arm64/locore.S @@ -267,8 +267,8 @@ END(mpentry) */ LENTRY(drop_to_el1) mrs x23, CurrentEL - lsr x23, x23, #2 - cmp x23, #0x2 + and x23, x23, #(CURRENTEL_EL_MASK) + cmp x23, #(CURRENTEL_EL_EL2) b.eq 1f ret 1: