From nobody Sat Nov 29 06:11:51 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 4dJKYz5DP7z6JYNy for ; Sat, 29 Nov 2025 06:11:51 +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 4dJKYz1f9kz3b0y for ; Sat, 29 Nov 2025 06:11:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764396711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PCKQzGqSJXT+1/EtQ1U7P3B0xFs5YaAeUdfLVBg09Oc=; b=n/KhuX7ddMehgSwj/ClOODLLHgVUT3Ab6Z0mreVs7FCc6zFDU31sSO2gXt+RZfysDsBVjL ks4ppzMnViQQwmAWJmp7njveDey28A+yme+HO+6EQ9AEtqgU1zWgKYO5C6l5NCuRu/jmKA ErbWXaHSdXWnHXPiFY/smTgluQRIt3tieGcn6eh/MGbqreM4OELNboSdFUwseoHKfi37dR V5erKqyFaensGEHZS4LHlH3+oO0WV/OxN4+ci2Lgj/fMObLp9NYNC3JIGjv0GqSibSufgf rzzZSEz+v3WwF4/5ZTYGbH3/JLAe0RypAwWAHFNPG/AKI3bkzY9WL0FOPW0Yug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764396711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PCKQzGqSJXT+1/EtQ1U7P3B0xFs5YaAeUdfLVBg09Oc=; b=cCmMU5VaRXo5rQJ1jj3NXmkWSwx9W+9f/JqlgwuKc9zr42l772wL1EJAOE1b/ah+m6AG+U pd4wX6wDty52UAlAfPiVnAAO18GJiPHpHC9qYmbqJXmNqMHbJINwS44nxHLNvoJQ9SpM95 ncxjxYd9YOcHENuwIcrRyUMc+ONizOmrqfbaxODDxOQk93z/fLwOAMyURTQHUwP2Htzoqn 5dtOh1vivnod1rXG6zkZzj3U0IAxHyXg1oTIabInTTC6eZHTOhNcOxu9X5lKHK9b5rpHgc LLBp0jtD38WIwHK4wg71d0qGfpvK7jee+M9wHANyNUyPOhGYA1910z09z705Kg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764396711; a=rsa-sha256; cv=none; b=C0N4n7JiZ4+5InJXQt0rMQ8IfE+pKeThEsXQtSTNri8DvjL6u1g2w86PBRqo4CRMqAEnMm eLJW5p3eEoDUktTPdhgrpDCr1IkbIw5ISEfGGXAx7iN9WpxoAu/40F35HX4WzxduBavZDU bvKAbwGZcBuvaPVu27B6Q8ULJ6QHD2JfrGFLu0YceCuNmulAGQMiAhn/BWifAchGXiVCEd K2dkiY3IeTGJ5egHp+vK92CB/M+T3RRsQV0sbqMVa1WpGyl59K3uL9Fs98BtU0fAZkJUQr s5+zG1pNOoA4rkul0BrJHai/dCryX5cYQol2o6TO6rsHmo5vhGBvtn60sJq6+Q== 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 4dJKYz10ZKzclF for ; Sat, 29 Nov 2025 06:11:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id feb1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 29 Nov 2025 06:11:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Minsoo Choo From: Warner Losh Subject: git: f42421307b11 - main - sys: remove armv6/6.1 support from debug monitor 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f42421307b115345ea1a6c8fdf61fbb581e4400f Auto-Submitted: auto-generated Date: Sat, 29 Nov 2025 06:11:51 +0000 Message-Id: <692a8ea7.feb1.63d10382@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f42421307b115345ea1a6c8fdf61fbb581e4400f commit f42421307b115345ea1a6c8fdf61fbb581e4400f Author: Minsoo Choo AuthorDate: 2025-11-29 00:34:40 +0000 Commit: Warner Losh CommitDate: 2025-11-29 04:56:36 +0000 sys: remove armv6/6.1 support from debug monitor Signed-off-by: Minsoo Choo 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 */ @@ -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; case ID_DFR0_CP_DEBUG_M_V7: /* fall through */ case ID_DFR0_CP_DEBUG_M_V7_1: cp14_dbgdscr_v7_set(dbg_dscr | DBGSCR_MDBG_EN); @@ -823,18 +817,6 @@ dbg_arch_supported(void) uint32_t dbg_didr; switch (dbg_model) { - case ID_DFR0_CP_DEBUG_M_V6: - case ID_DFR0_CP_DEBUG_M_V6_1: - dbg_didr = cp14_dbgdidr_get(); - /* - * read-all-zeroes is used by QEMU - * to indicate that ARMv6 debug support - * is not implemented. Real hardware has at - * least version bits set - */ - if (dbg_didr == 0) - return (FALSE); - return (TRUE); case ID_DFR0_CP_DEBUG_M_V7: case ID_DFR0_CP_DEBUG_M_V7_1: /* fall through */ return (TRUE); @@ -875,16 +857,6 @@ dbg_reset_state(void) err = 0; switch (dbg_model) { - case ID_DFR0_CP_DEBUG_M_V6: - case ID_DFR0_CP_DEBUG_M_V6_1: /* fall through */ - /* - * Arch needs monitor mode selected and enabled - * to be able to access breakpoint/watchpoint registers. - */ - err = dbg_enable_monitor(); - if (err != 0) - return (err); - goto vectr_clr; case ID_DFR0_CP_DEBUG_M_V7: /* Is core power domain powered up? */ if ((cp14_dbgprsr_get() & DBGPRSR_PU) == 0) @@ -974,8 +946,6 @@ dbg_monitor_init(void) if (bootverbose) { db_printf("ARM Debug Architecture %s\n", - (dbg_model == ID_DFR0_CP_DEBUG_M_V6) ? "v6" : - (dbg_model == ID_DFR0_CP_DEBUG_M_V6_1) ? "v6.1" : (dbg_model == ID_DFR0_CP_DEBUG_M_V7) ? "v7" : (dbg_model == ID_DFR0_CP_DEBUG_M_V7_1) ? "v7.1" : "unknown"); }