git: b033e3684fd1 - main - armv7: Tweak some armv6 removals

The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=b033e3684fd14c798405420449eb55e1d4f9df1e

commit b033e3684fd14c798405420449eb55e1d4f9df1e
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2025-12-03 05:29:42 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2025-12-03 05:29:42 +0000

    armv7: Tweak some armv6 removals
    
    Fixes: 42421307b115 (sys: remove armv6/6.1 support from debug monitor)
    Suggested by:   jhb
    Sponsored by:   Netflix
---
 sys/arm/arm/debug_monitor.c | 2 ++
 sys/arm/include/cpu.h       | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/sys/arm/arm/debug_monitor.c b/sys/arm/arm/debug_monitor.c
index a703c65f541b..9c5ee85e2925 100644
--- a/sys/arm/arm/debug_monitor.c
+++ b/sys/arm/arm/debug_monitor.c
@@ -83,6 +83,8 @@ static uint32_t dbg_breakpoint_num;
 #define	ID_DFR0_CP_DEBUG_M_SHIFT	0
 #define	ID_DFR0_CP_DEBUG_M_MASK		(0xF << ID_DFR0_CP_DEBUG_M_SHIFT)
 #define	ID_DFR0_CP_DEBUG_M_NS		(0x0) /* Not supported */
+#define	ID_DFR0_CP_DEBUG_M_V6		(0x2) /* v6 Debug arch. CP14 access */
+#define	ID_DFR0_CP_DEBUG_M_V6_1		(0x3) /* v6.1 Debug arch. CP14 access */
 #define	ID_DFR0_CP_DEBUG_M_V7		(0x4) /* v7 Debug arch. CP14 access */
 #define	ID_DFR0_CP_DEBUG_M_V7_1		(0x5) /* v7.1 Debug arch. CP14 access */
 
diff --git a/sys/arm/include/cpu.h b/sys/arm/include/cpu.h
index da8127b093f0..d13e0d81db5b 100644
--- a/sys/arm/include/cpu.h
+++ b/sys/arm/include/cpu.h
@@ -186,7 +186,6 @@ _RF0(cp14_dbgoslsr_get, CP14_DBGOSLSR(%0))
 _RF0(cp14_dbgosdlr_get, CP14_DBGOSDLR(%0))
 _RF0(cp14_dbgdscrint_get, CP14_DBGDSCRint(%0))
 
-_WF1(cp14_dbgdscr_v6_set, CP14_DBGDSCRext_V6(%0))
 _WF1(cp14_dbgdscr_v7_set, CP14_DBGDSCRext_V7(%0))
 _WF1(cp14_dbgvcr_set, CP14_DBGVCR(%0))
 _WF1(cp14_dbgoslar_set, CP14_DBGOSLAR(%0))