From nobody Thu Oct 9 16:32:24 2025 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 4cjFlX73YMz6Bjf8; Thu, 09 Oct 2025 16:32:24 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cjFlX5BQWz43DT; Thu, 09 Oct 2025 16:32:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760027544; 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=NkOFSr75dBVTLU7ZTD1abcKV59jKGCEdkzBUqkdesHc=; b=w3iOB54ooU3KMg3wD0I33Bqtie5PREr5DzeEMSpo5+vLaJl5HkOg0A3ZobJ1K6pyIvfP9K UczUTmQPLRwByWq9olXoplGlAEz7HiUcSGVBSO2QjLGajFpQgyts4bHBcIDHN/Dz9bSSZo GMEQo5YqYKM1KC/prw9nAFjC5/5bw2op9bgHKU92FsaXkkS7dG9YlMuLg0FJmP/Ch5uvVk KfmorY9Fom0nuMbnUyu8zR7nL2OA40NTSlyKSYkbxYpJP7TSZ4STSq26Hznosa4xh9mfpZ xGNMZmGhzEO5DR+DdNwAidxtsMpW4JswNo5N8oaeFeigUFbwgb4YuYETNYnwWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760027544; 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=NkOFSr75dBVTLU7ZTD1abcKV59jKGCEdkzBUqkdesHc=; b=mSx4bj6ioNuzAJX1dS69bB8yn8cm4LAsxMjD/o4HMv59H6+kQfRtkqB0AAjz2/0rnSa4kw uS8XGuh5FkGUF9ecVaKxthnS1oDey2GpUC2FOopJiR2gAftw8Jc8opXChvYcJ0b/bzfTSE IKsvUbB9xnAuPherRQQEpv19l+occCpkNRfTpWgjcmqeOavqU5Di49wyfy2TfZqnhN5FZI rbpRUUzBsZQj6SkLfVMeay6jepWgkOs4aH1xz052bNsGAyT4ICtZ4deR9uwpP4UCkosIjo JNWoz51cJx5x8ycKBzoeJYv9SpoPjnJyga2vsyZEMquIPY0pC190SDf9X8vu2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760027544; a=rsa-sha256; cv=none; b=hUQwfJoxreo5pWqzA4hA7WI30//iFvAnF21Ri6PJmxC9y8E2GKUDJEy1WWDuWDfrEO86rl gV5J2g3fqr/3ru92h7eknAloTaCwJFlS1Su3Rn/m6ifHbyR077eJUjxC3JVz2P6zrVr1gm RHFvi3TpaUf7hPuvlzyGFg0nus2GfYU6QL4rbk4VGvLSzvuL01gF1f+UQsLTefUgFW9Gnb ToZ8H2JITLPNsc9itn7TSs8DTxBjFgGQoyILejDCz1Y9QT/+tCmJzR6R7+S19yfOWnZwcm lYNDXzmbU4QXThL3WuO00dZZJ3LiLo5VPv75YXpLAd57FULP66reB9byI4KJIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cjFlX4ktlz9BZ; Thu, 09 Oct 2025 16:32:24 +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 599GWOwu023692; Thu, 9 Oct 2025 16:32:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 599GWORJ023689; Thu, 9 Oct 2025 16:32:24 GMT (envelope-from git) Date: Thu, 9 Oct 2025 16:32:24 GMT Message-Id: <202510091632.599GWORJ023689@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: 54ee094d9a98 - stable/15 - arm64: Sort hypervisor.h 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/15 X-Git-Reftype: branch X-Git-Commit: 54ee094d9a98d59b153822f3e4982f6e6225c0b6 Auto-Submitted: auto-generated The branch stable/15 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=54ee094d9a98d59b153822f3e4982f6e6225c0b6 commit 54ee094d9a98d59b153822f3e4982f6e6225c0b6 Author: Andrew Turner AuthorDate: 2025-10-02 15:35:04 +0000 Commit: Andrew Turner CommitDate: 2025-10-09 16:31:50 +0000 arm64: Sort hypervisor.h Move the MDCR_EL2 macros into the correct alphabetical location. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D52805 (cherry picked from commit 4aa762f3cb97402f0345ce5112c47a303dd4107d) --- sys/arm64/include/hypervisor.h | 96 +++++++++++++++++++++--------------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/sys/arm64/include/hypervisor.h b/sys/arm64/include/hypervisor.h index 3b55f76d2477..6e96ce7f1a7d 100644 --- a/sys/arm64/include/hypervisor.h +++ b/sys/arm64/include/hypervisor.h @@ -190,6 +190,54 @@ #define ICC_SRE_EL2_SRE (1UL << 0) #define ICC_SRE_EL2_EN (1UL << 3) +/* MDCR_EL2 - Hyp Debug Control Register */ +#define MDCR_EL2_HPMN_MASK 0x1f +#define MDCR_EL2_HPMN_SHIFT 0 +#define MDCR_EL2_TPMCR_SHIFT 5 +#define MDCR_EL2_TPMCR (0x1UL << MDCR_EL2_TPMCR_SHIFT) +#define MDCR_EL2_TPM_SHIFT 6 +#define MDCR_EL2_TPM (0x1UL << MDCR_EL2_TPM_SHIFT) +#define MDCR_EL2_HPME_SHIFT 7 +#define MDCR_EL2_HPME (0x1UL << MDCR_EL2_HPME_SHIFT) +#define MDCR_EL2_TDE_SHIFT 8 +#define MDCR_EL2_TDE (0x1UL << MDCR_EL2_TDE_SHIFT) +#define MDCR_EL2_TDA_SHIFT 9 +#define MDCR_EL2_TDA (0x1UL << MDCR_EL2_TDA_SHIFT) +#define MDCR_EL2_TDOSA_SHIFT 10 +#define MDCR_EL2_TDOSA (0x1UL << MDCR_EL2_TDOSA_SHIFT) +#define MDCR_EL2_TDRA_SHIFT 11 +#define MDCR_EL2_TDRA (0x1UL << MDCR_EL2_TDRA_SHIFT) +#define MDCR_EL2_E2PB_SHIFT 12 +#define MDCR_EL2_E2PB_MASK (0x3UL << MDCR_EL2_E2PB_SHIFT) +#define MDCR_EL2_TPMS_SHIFT 14 +#define MDCR_EL2_TPMS (0x1UL << MDCR_EL2_TPMS_SHIFT) +#define MDCR_EL2_EnSPM_SHIFT 15 +#define MDCR_EL2_EnSPM (0x1UL << MDCR_EL2_EnSPM_SHIFT) +#define MDCR_EL2_HPMD_SHIFT 17 +#define MDCR_EL2_HPMD (0x1UL << MDCR_EL2_HPMD_SHIFT) +#define MDCR_EL2_TTRF_SHIFT 19 +#define MDCR_EL2_TTRF (0x1UL << MDCR_EL2_TTRF_SHIFT) +#define MDCR_EL2_HCCD_SHIFT 23 +#define MDCR_EL2_HCCD (0x1UL << MDCR_EL2_HCCD_SHIFT) +#define MDCR_EL2_E2TB_SHIFT 24 +#define MDCR_EL2_E2TB_MASK (0x3UL << MDCR_EL2_E2TB_SHIFT) +#define MDCR_EL2_HLP_SHIFT 26 +#define MDCR_EL2_HLP (0x1UL << MDCR_EL2_HLP_SHIFT) +#define MDCR_EL2_TDCC_SHIFT 27 +#define MDCR_EL2_TDCC (0x1UL << MDCR_EL2_TDCC_SHIFT) +#define MDCR_EL2_MTPME_SHIFT 28 +#define MDCR_EL2_MTPME (0x1UL << MDCR_EL2_MTPME_SHIFT) +#define MDCR_EL2_HPMFZO_SHIFT 29 +#define MDCR_EL2_HPMFZO (0x1UL << MDCR_EL2_HPMFZO_SHIFT) +#define MDCR_EL2_PMSSE_SHIFT 30 +#define MDCR_EL2_PMSSE_MASK (0x3UL << MDCR_EL2_PMSSE_SHIFT) +#define MDCR_EL2_HPMFZS_SHIFT 36 +#define MDCR_EL2_HPMFZS (0x1UL << MDCR_EL2_HPMFZS_SHIFT) +#define MDCR_EL2_PMEE_SHIFT 40 +#define MDCR_EL2_PMEE_MASK (0x3UL << MDCR_EL2_PMEE_SHIFT) +#define MDCR_EL2_EBWE_SHIFT 43 +#define MDCR_EL2_EBWE (0x1UL << MDCR_EL2_EBWE_SHIFT) + /* SCTLR_EL2 - System Control Register */ #define SCTLR_EL2_RES1 0x30c50830 #define SCTLR_EL2_M_SHIFT 0 @@ -299,52 +347,4 @@ /* Assumed to be 0 by locore.S */ #define VTTBR_HOST 0x0000000000000000 -/* MDCR_EL2 - Hyp Debug Control Register */ -#define MDCR_EL2_HPMN_MASK 0x1f -#define MDCR_EL2_HPMN_SHIFT 0 -#define MDCR_EL2_TPMCR_SHIFT 5 -#define MDCR_EL2_TPMCR (0x1UL << MDCR_EL2_TPMCR_SHIFT) -#define MDCR_EL2_TPM_SHIFT 6 -#define MDCR_EL2_TPM (0x1UL << MDCR_EL2_TPM_SHIFT) -#define MDCR_EL2_HPME_SHIFT 7 -#define MDCR_EL2_HPME (0x1UL << MDCR_EL2_HPME_SHIFT) -#define MDCR_EL2_TDE_SHIFT 8 -#define MDCR_EL2_TDE (0x1UL << MDCR_EL2_TDE_SHIFT) -#define MDCR_EL2_TDA_SHIFT 9 -#define MDCR_EL2_TDA (0x1UL << MDCR_EL2_TDA_SHIFT) -#define MDCR_EL2_TDOSA_SHIFT 10 -#define MDCR_EL2_TDOSA (0x1UL << MDCR_EL2_TDOSA_SHIFT) -#define MDCR_EL2_TDRA_SHIFT 11 -#define MDCR_EL2_TDRA (0x1UL << MDCR_EL2_TDRA_SHIFT) -#define MDCR_EL2_E2PB_SHIFT 12 -#define MDCR_EL2_E2PB_MASK (0x3UL << MDCR_EL2_E2PB_SHIFT) -#define MDCR_EL2_TPMS_SHIFT 14 -#define MDCR_EL2_TPMS (0x1UL << MDCR_EL2_TPMS_SHIFT) -#define MDCR_EL2_EnSPM_SHIFT 15 -#define MDCR_EL2_EnSPM (0x1UL << MDCR_EL2_EnSPM_SHIFT) -#define MDCR_EL2_HPMD_SHIFT 17 -#define MDCR_EL2_HPMD (0x1UL << MDCR_EL2_HPMD_SHIFT) -#define MDCR_EL2_TTRF_SHIFT 19 -#define MDCR_EL2_TTRF (0x1UL << MDCR_EL2_TTRF_SHIFT) -#define MDCR_EL2_HCCD_SHIFT 23 -#define MDCR_EL2_HCCD (0x1UL << MDCR_EL2_HCCD_SHIFT) -#define MDCR_EL2_E2TB_SHIFT 24 -#define MDCR_EL2_E2TB_MASK (0x3UL << MDCR_EL2_E2TB_SHIFT) -#define MDCR_EL2_HLP_SHIFT 26 -#define MDCR_EL2_HLP (0x1UL << MDCR_EL2_HLP_SHIFT) -#define MDCR_EL2_TDCC_SHIFT 27 -#define MDCR_EL2_TDCC (0x1UL << MDCR_EL2_TDCC_SHIFT) -#define MDCR_EL2_MTPME_SHIFT 28 -#define MDCR_EL2_MTPME (0x1UL << MDCR_EL2_MTPME_SHIFT) -#define MDCR_EL2_HPMFZO_SHIFT 29 -#define MDCR_EL2_HPMFZO (0x1UL << MDCR_EL2_HPMFZO_SHIFT) -#define MDCR_EL2_PMSSE_SHIFT 30 -#define MDCR_EL2_PMSSE_MASK (0x3UL << MDCR_EL2_PMSSE_SHIFT) -#define MDCR_EL2_HPMFZS_SHIFT 36 -#define MDCR_EL2_HPMFZS (0x1UL << MDCR_EL2_HPMFZS_SHIFT) -#define MDCR_EL2_PMEE_SHIFT 40 -#define MDCR_EL2_PMEE_MASK (0x3UL << MDCR_EL2_PMEE_SHIFT) -#define MDCR_EL2_EBWE_SHIFT 43 -#define MDCR_EL2_EBWE (0x1UL << MDCR_EL2_EBWE_SHIFT) - #endif /* !_MACHINE_HYPERVISOR_H_ */