From nobody Wed Sep 09 14:23:05 2026 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 4hg31j41JHz6s9s3 for ; Wed, 09 Sep 2026 14:23:05 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hg31j388tz3Jhq for ; Wed, 09 Sep 2026 14:23:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788963785; 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=nJ3dUS+R6mcj6CbIYEet91ZjB4PSgW1V3zv0ghpgUgg=; b=cFtj+946I/AcFD2RwcCgDaNDUom+qnDOAIPCH7vCUQhHvIWoDb4YGQlzMI1RUWxXW7Lb9y /tvUkUlmu1wUygZa2njhY6+3BFfB7aWEi0KE1Jqu5psNEwNTLIT3XmoxG2S2Su43qwndN/ mxsAP9UiPLaQBMxe3O8794kbD6VCXhlDTVdw4VUvCJ+MRmpR/+rI0T4pdohBJ6S9wupulR m7K4oBNss21EmNoYP2nSbg+dqtjerBVi54RLgqCZq0pc7m73Q1dxkYXE1dLEKgWDnWMF7X dfE9CNrNnzhuaKIyRwXSuMHaZxC3GBDETAQyVqETlUBuTw/w9HrQ9c590dPO5w== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1788963785; b=fVYTeUj/q4IrB8Ep6Dx02E5/WzEI2HzsU1C4VFknzA+K0iDBhXrFxon5xo4xr8B9qH73nV JYS/iKWx+orZCazKdTnl79Dje4FFLZorgPTqQ82DBpNGK5f+9kfse9jOK+cwiZEuzhm2m1 BaaAejISA076vVTjE1sYkaVXX6ip7qriloIU2F6WpSbGca4HhJ1TMm0rOjZpPCs0scpVDO DtH+jZ4EbuPcMfs3aPaInqiRQ2ZjMDigXcnzCJju12G1j0DNkOts8GYGa9ITiOYK9nqkpS m9ewLnCAfk0/BXjaW6lE4Edl3IIFo1gGTXr37sCjD3yPtCDQo9YaHo0hnBTNhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788963785; 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=nJ3dUS+R6mcj6CbIYEet91ZjB4PSgW1V3zv0ghpgUgg=; b=WgdK/hXTSc2g5Av7EGwKrqEtOA9JR104Lxje8SgZ54H7QN32ArgzDK74nAnWqpZ9ZelPFt gm2CzpFcILFBTONZPFooGLMn/MORxt+gHTQ8afZe2XDHLBmP2dPvgrul8VW0Lj6dT+1sxo 1SFCgVvG62iCCZLRBlKibbujt9k22wDF57yo6CAcaIOXLA62Xk/ya7ySI3Xf5z7STJU38e wbmzy3OG0FlBZ3XCBGPJdvcqrG9CaBqnp+yYhl8YE4gUMmeC4t/S3MJnrHdPFfhQIrpneT +HSoLkGzUZWIzJew9g6st5yVCSGNGFV19DPCBME2emow2YGZUkXcA4lJUTdpTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hg31j1FwZz11FP for ; Wed, 09 Sep 2026 14:23:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 183a2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 09 Sep 2026 14:23:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: fe659a889617 - main - arm64: Rename some ID_AA64DFR0_EL1 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: fe659a889617de129461b19e60a14a751e1ff02e Auto-Submitted: auto-generated Date: Wed, 09 Sep 2026 14:23:05 +0000 Message-Id: <6aa16bc9.183a2.4b352ae1@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=fe659a889617de129461b19e60a14a751e1ff02e commit fe659a889617de129461b19e60a14a751e1ff02e Author: Andrew Turner AuthorDate: 2026-09-08 00:00:00 +0000 Commit: Andrew Turner CommitDate: 2026-09-08 03:05:27 +0000 arm64: Rename some ID_AA64DFR0_EL1 macros These macros are used to extract the number of breakpoints and watchpoints from the register. Rename them to not conflict with the common meaning of an _VAL macro in this file. Reviewed by: Kajetan Puchalski Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D59178 --- sys/arm64/arm64/debug_monitor.c | 4 ++-- sys/arm64/arm64/exec_machdep.c | 4 ++-- sys/arm64/include/armreg.h | 6 +++--- sys/arm64/vmm/vmm_hyp.c | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sys/arm64/arm64/debug_monitor.c b/sys/arm64/arm64/debug_monitor.c index d92d3fb37ce4..9707f52aca56 100644 --- a/sys/arm64/arm64/debug_monitor.c +++ b/sys/arm64/arm64/debug_monitor.c @@ -634,8 +634,8 @@ dbg_monitor_init(void) /* Find out many breakpoints and watchpoints we can use */ aa64dfr0 = READ_SPECIALREG(id_aa64dfr0_el1); - dbg_watchpoint_num = ID_AA64DFR0_WRPs_VAL(aa64dfr0); - dbg_breakpoint_num = ID_AA64DFR0_BRPs_VAL(aa64dfr0); + dbg_watchpoint_num = ID_AA64DFR0_WRPs_NUM(aa64dfr0); + dbg_breakpoint_num = ID_AA64DFR0_BRPs_NUM(aa64dfr0); if (bootverbose && PCPU_GET(cpuid) == 0) { printf("%d watchpoints and %d breakpoints supported\n", diff --git a/sys/arm64/arm64/exec_machdep.c b/sys/arm64/arm64/exec_machdep.c index dd433907de12..7b43bbd9b288 100644 --- a/sys/arm64/arm64/exec_machdep.c +++ b/sys/arm64/arm64/exec_machdep.c @@ -214,8 +214,8 @@ fill_dbregs(struct thread *td, struct dbreg *regs) } else { debug_ver = ID_AA64DFR0_DebugVer_VAL(dfr0) >> ID_AA64DFR0_DebugVer_SHIFT; - nbkpts = ID_AA64DFR0_BRPs_VAL(dfr0) >> ID_AA64DFR0_BRPs_SHIFT; - nwtpts = ID_AA64DFR0_WRPs_VAL(dfr0) >> ID_AA64DFR0_WRPs_SHIFT; + nbkpts = ID_AA64DFR0_BRPs_NUM(dfr0); + nwtpts = ID_AA64DFR0_WRPs_NUM(dfr0); } /* diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index 75dcf5489902..a58027a5a6be 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -911,7 +911,7 @@ #define ID_AA64DFR0_BRPs_SHIFT 12 #define ID_AA64DFR0_BRPs_WIDTH 4 #define ID_AA64DFR0_BRPs_MASK (UL(0xf) << ID_AA64DFR0_BRPs_SHIFT) -#define ID_AA64DFR0_BRPs_VAL(x) \ +#define ID_AA64DFR0_BRPs_NUM(x) \ ((((x) >> ID_AA64DFR0_BRPs_SHIFT) & 0xf) + 1) #define ID_AA64DFR0_PMSS_SHIFT 16 #define ID_AA64DFR0_PMSS_WIDTH 4 @@ -922,12 +922,12 @@ #define ID_AA64DFR0_WRPs_SHIFT 20 #define ID_AA64DFR0_WRPs_WIDTH 4 #define ID_AA64DFR0_WRPs_MASK (UL(0xf) << ID_AA64DFR0_WRPs_SHIFT) -#define ID_AA64DFR0_WRPs_VAL(x) \ +#define ID_AA64DFR0_WRPs_NUM(x) \ ((((x) >> ID_AA64DFR0_WRPs_SHIFT) & 0xf) + 1) #define ID_AA64DFR0_CTX_CMPs_SHIFT 28 #define ID_AA64DFR0_CTX_CMPs_WIDTH 4 #define ID_AA64DFR0_CTX_CMPs_MASK (UL(0xf) << ID_AA64DFR0_CTX_CMPs_SHIFT) -#define ID_AA64DFR0_CTX_CMPs_VAL(x) \ +#define ID_AA64DFR0_CTX_CMPs_NUM(x) \ ((((x) >> ID_AA64DFR0_CTX_CMPs_SHIFT) & 0xf) + 1) #define ID_AA64DFR0_PMSVer_SHIFT 32 #define ID_AA64DFR0_PMSVer_WIDTH 4 diff --git a/sys/arm64/vmm/vmm_hyp.c b/sys/arm64/vmm/vmm_hyp.c index 7a86086be56e..6eb1208e4fb5 100644 --- a/sys/arm64/vmm/vmm_hyp.c +++ b/sys/arm64/vmm/vmm_hyp.c @@ -48,7 +48,7 @@ vmm_hyp_reg_store_pmu_debug(struct hypctx *hypctx, bool guest) READ_SPECIALREG(dbgclaimset_el1)); dfr0 = READ_SPECIALREG(id_aa64dfr0_el1); - switch (ID_AA64DFR0_BRPs_VAL(dfr0) - 1) { + switch (ID_AA64DFR0_BRPs_NUM(dfr0) - 1) { #define STORE_DBG_BRP(x) \ case x: \ hypctx_write_sys_reg(hypctx, DBGBCR_EL1(x), \ @@ -75,7 +75,7 @@ vmm_hyp_reg_store_pmu_debug(struct hypctx *hypctx, bool guest) #undef STORE_DBG_BRP } - switch (ID_AA64DFR0_WRPs_VAL(dfr0) - 1) { + switch (ID_AA64DFR0_WRPs_NUM(dfr0) - 1) { #define STORE_DBG_WRP(x) \ case x: \ hypctx_write_sys_reg(hypctx, DBGWCR_EL1(x), \ @@ -529,7 +529,7 @@ vmm_hyp_reg_restore_pmu_debug(struct hypctx *hypctx) hypctx_read_sys_reg(hypctx, DBGCLAIMSET_EL1)); dfr0 = READ_SPECIALREG(id_aa64dfr0_el1); - switch (ID_AA64DFR0_BRPs_VAL(dfr0) - 1) { + switch (ID_AA64DFR0_BRPs_NUM(dfr0) - 1) { #define LOAD_DBG_BRP(x) \ case x: \ WRITE_SPECIALREG(dbgbcr ## x ## _el1, \ @@ -556,7 +556,7 @@ vmm_hyp_reg_restore_pmu_debug(struct hypctx *hypctx) #undef LOAD_DBG_BRP } - switch (ID_AA64DFR0_WRPs_VAL(dfr0) - 1) { + switch (ID_AA64DFR0_WRPs_NUM(dfr0) - 1) { #define LOAD_DBG_WRP(x) \ case x: \ WRITE_SPECIALREG(dbgwcr ## x ## _el1, \