From nobody Thu Oct 9 16:32:23 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 4cjFlW5mlNz6Bk5T; Thu, 09 Oct 2025 16:32:23 +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 4cjFlW4Fngz42sx; Thu, 09 Oct 2025 16:32:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760027543; 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=iP40ZR0v/Ms9QtBL9NRuES6omTJmrTFIxjTgTNF39/E=; b=pMlCAL0beRHygit0wydpEBQ/5B/lkaiqaGqqMTlzpfgffpaWabcsQSszSd1Cjuvb5Zl6Im dgaSbONy8GgTV/6/JdEg0GV3lhPw3zcCziixN/fwvLfi9vLxoJfXG3sRHV8nzL63cx9isf Kp1vfzGbG2U8FVgyru5l8ugCXX7UuUlXQxDE606S5gGRKQ4+zjRLu5/C5YfFRJk2SfIfXg THo+VTW8BQU37iqApi5dZIki+dZ5ZZHR6dWfUD+CdNM1OerO7fo2/yR4vSKhFPGS2R5Lew nX0YljgeOEgt9CIIW8B52peq73F6tyGuMiEQ79yC/J7XU9bv4Bk0TtPuRJu11Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760027543; 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=iP40ZR0v/Ms9QtBL9NRuES6omTJmrTFIxjTgTNF39/E=; b=BixQOkH+3BIYeiX4UAyjtzdvGTk1NQGr06YzaXcmb4hN8T8ML0AAqjSwCypXAOa3zZvJ6d sFd6FLc6ixz/UzGUI0spiFVak4GsQ5R7vWyKLPPCYYRokQIXLyfLf9IZY6pjCW/VlYTv0o hUbJRfIH/QSDcK2EL5HMJl0lOH3gRo2hdo2V0iFczbyRHDAPjMEzSLIblrPW0848XMxB1C 8WKlnS3tCD7Vs2mx//bCH5heBnL14h1ZFrLQVWjdrn5VMR+ZHCmZKYjPrRNvKIH1agIOtr YVhBn69/uzEQcPeD0gcK0FmUen65nLGwYOdIclG5+sfyqdtqtV02PhAQcS9vMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760027543; a=rsa-sha256; cv=none; b=aVh79vINIWYQ7g3Gai6OznOMgG45kjKXFMIwQ/8bkHDXDLwhXLfyvX/KUa1MUFQayuHt3v d2t6Mbvok9RQF2rcSp6DyHQ64umoD96STPiAW5SMh1iI6umY/TiE+qG9AX8jKb4fgQLwZc k9svGQfOWnRFrnUygn3YssPLZ2QUK13c4tUoLYfYq2s2s/xpfClmZFVrostfn+tAFDRsmi jYhBrg2/5es+p3d9zvmDdfzXMtgSVdbpnzx2oLW3zTgRfEuywjXluqjFgeJaHLWvYufrou riDqNVtgQSNu8Sg+fSPudt6eQbbrymNhbFvQXkGvUE+ClK1QWqzFMABqvDGeXg== 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 4cjFlW3sK4z8wc; Thu, 09 Oct 2025 16:32:23 +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 599GWNWw023658; Thu, 9 Oct 2025 16:32:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 599GWNAO023655; Thu, 9 Oct 2025 16:32:23 GMT (envelope-from git) Date: Thu, 9 Oct 2025 16:32:23 GMT Message-Id: <202510091632.599GWNAO023655@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: cb004ced6350 - stable/15 - arm64: Rename the MDCR_EL2 macros 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: cb004ced6350e990fbbca673f09e38939c7c1896 Auto-Submitted: auto-generated The branch stable/15 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=cb004ced6350e990fbbca673f09e38939c7c1896 commit cb004ced6350e990fbbca673f09e38939c7c1896 Author: Andrew Turner AuthorDate: 2025-10-02 15:34:54 +0000 Commit: Andrew Turner CommitDate: 2025-10-09 16:31:50 +0000 arm64: Rename the MDCR_EL2 macros To be consistent within the register prefix all fields with MDCR_EL2_. Reviewed by: emaste Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D52804 (cherry picked from commit d552556b7e6d226887ebb6da30e4f1dcff3cb407) --- sys/arm64/include/hypervisor.h | 60 +++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/sys/arm64/include/hypervisor.h b/sys/arm64/include/hypervisor.h index e3a880afbe9c..3b55f76d2477 100644 --- a/sys/arm64/include/hypervisor.h +++ b/sys/arm64/include/hypervisor.h @@ -316,35 +316,35 @@ #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_E2PB_SHIFT 12 -#define MDCR_E2PB_MASK (0x3UL << MDCR_E2PB_SHIFT) -#define MDCR_TPMS_SHIFT 14 -#define MDCR_TPMS (0x1UL << MDCR_TPMS_SHIFT) -#define MDCR_EnSPM_SHIFT 15 -#define MDCR_EnSPM (0x1UL << MDCR_EnSPM_SHIFT) -#define MDCR_HPMD_SHIFT 17 -#define MDCR_HPMD (0x1UL << MDCR_HPMD_SHIFT) -#define MDCR_TTRF_SHIFT 19 -#define MDCR_TTRF (0x1UL << MDCR_TTRF_SHIFT) -#define MDCR_HCCD_SHIFT 23 -#define MDCR_HCCD (0x1UL << MDCR_HCCD_SHIFT) -#define MDCR_E2TB_SHIFT 24 -#define MDCR_E2TB_MASK (0x3UL << MDCR_E2TB_SHIFT) -#define MDCR_HLP_SHIFT 26 -#define MDCR_HLP (0x1UL << MDCR_HLP_SHIFT) -#define MDCR_TDCC_SHIFT 27 -#define MDCR_TDCC (0x1UL << MDCR_TDCC_SHIFT) -#define MDCR_MTPME_SHIFT 28 -#define MDCR_MTPME (0x1UL << MDCR_MTPME_SHIFT) -#define MDCR_HPMFZO_SHIFT 29 -#define MDCR_HPMFZO (0x1UL << MDCR_HPMFZO_SHIFT) -#define MDCR_PMSSE_SHIFT 30 -#define MDCR_PMSSE_MASK (0x3UL << MDCR_PMSSE_SHIFT) -#define MDCR_HPMFZS_SHIFT 36 -#define MDCR_HPMFZS (0x1UL << MDCR_HPMFZS_SHIFT) -#define MDCR_PMEE_SHIFT 40 -#define MDCR_PMEE_MASK (0x3UL << MDCR_PMEE_SHIFT) -#define MDCR_EBWE_SHIFT 43 -#define MDCR_EBWE (0x1UL << MDCR_EBWE_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_ */