On 11/29/25 01:11, Warner Losh wrote:
The branch main has been updated by imp:
URL:
https://cgit.FreeBSD.org/src/commit/?id=f42421307b115345ea1a6c8fdf61fbb581e4400f
commit f42421307b115345ea1a6c8fdf61fbb581e4400f
Author: Minsoo Choo <[email protected]>
AuthorDate: 2025-11-29 00:34:40 +0000
Commit: Warner Losh <[email protected]>
CommitDate: 2025-11-29 04:56:36 +0000
sys: remove armv6/6.1 support from debug monitor
Signed-off-by: Minsoo Choo <[email protected]>
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1903
---
sys/arm/arm/debug_monitor.c | 30 ------------------------------
1 file changed, 30 deletions(-)
diff --git a/sys/arm/arm/debug_monitor.c b/sys/arm/arm/debug_monitor.c
index 7944becbae4d..4d61896a2142 100644
--- a/sys/arm/arm/debug_monitor.c
+++ b/sys/arm/arm/debug_monitor.c
@@ -83,8 +83,6 @@ 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 */
Humm, I would have probably left these as the register is still valid and I
find it
useful to describe the full range of values for registers that we define
constants for.
The rest of the removal certainly makes sense.
@@ -594,10 +592,6 @@ dbg_enable_monitor(void)
dbg_dscr = cp14_dbgdscrint_get();
switch (dbg_model) {
- case ID_DFR0_CP_DEBUG_M_V6:
- case ID_DFR0_CP_DEBUG_M_V6_1: /* fall through */
- cp14_dbgdscr_v6_set(dbg_dscr | DBGSCR_MDBG_EN);
- break;
Should this function also be removed? Looks to be defined here in
sys/arm/include/cpu.h:
_WF1(cp14_dbgdscr_v6_set, CP14_DBGDSCRext_V6(%0))
--
John Baldwin
