From nobody Wed Dec 3 05:32:11 2025 X-Original-To: dev-commits-src-main@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 4dLmVM2Jh5z6HfcW for ; Wed, 03 Dec 2025 05:32:11 +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 4dLmVM1nQJz3Dhv for ; Wed, 03 Dec 2025 05:32:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764739931; 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=WHCB8tGVNHvDfO0jv5xrz3FP5MqH1yzeILvXvp/kkMY=; b=ZTcJY/2Cj9OpOLIuthJgWNoNY/HAeiwy6qbHa/aCNE4G/afnFRVnFmLZZrd82hcidXQIBT c7RcUi/LXb1ad30BLmyWvdoZdc70EOvY3jZQ1jAPmjpeCsIz0s9SOwzetBgkVnsvLj1DHW tJVRjBePOSKGTHiMvGEMWL0IGor4Vg0vreBRlfwCXH0x+1YCKr4w3rXC0y7F2DvGnKqb7J Nx6hi3f4lKc7P7fgA5Yhwvr74rKq4qyveSYGQYGmmk4jygZOGScFV9vnxVMxe621mqxw8d C8Rj2WElcNiW11PAWyYYf+c39bWfSdos/Nt6QFThGaRbG7jNa9tUq4Z2MTWWMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764739931; 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=WHCB8tGVNHvDfO0jv5xrz3FP5MqH1yzeILvXvp/kkMY=; b=PQ/K4Yi6kOBGbYnQtyejr/IbUumiCUYEm91ZNyXTA+3h0ozxB7P+tjqlRz0A8O1c3CkPax Gau/yOCNvZbUu41Pq3rcBvQxt9N+b9gul28OvVJtQBK6kgHyjNd9I66kuWqSkEwcxp13Iw isYxwlpwFIm1ZpwvHNL5PcB/3BwsX6oXkaoddZ6CzFb0hrpcGW7DiFv8G771JU8P77F/fF OHxkxUqjDO7ZTYK9Y0RUAHkqzi2pptDecMZsd7lj/L2ZRmJfpUF7MREizb+6kA/Zga0f7g YpIGywnPyTv7KvV6RTjnrqUS/1A1l2dFCXfAZwUfP/qJ5DMvP+UM6oe7gRsUxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764739931; a=rsa-sha256; cv=none; b=W0Wp/PD0ijhAfym0NMSXgZR/1g/u61yG7ovdv6Y0jype6xRLth4KSN8j+EK4Nsq8z/gasp nNBd2foTDvOSJowFTH3XujnLy7qgrOpGm1tA/NwqcBa/qwWYZx7ouvg5WmO9lx17qb+ue9 9pzHYN8nSLQ1DSFP3doXmVcJio3dlf97U3EvRpp5U7IlzmFZaLiqmR31+eQ8qdFvqovYaE kW98MadP+pdsWwXAUBtTfCimPzx8Wvb8e+na22Yt0i8homOHFsdJtFXnVwLNC3nNxPxFrH /YTAIuLX68UUuH7bmLpe0pp/wpA9qkLSIVuqUGkCFCqgFHTJ/D52eG0iZmbeAg== 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 4dLmVM1FkBz8LB for ; Wed, 03 Dec 2025 05:32:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 8ec2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Dec 2025 05:32:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: b033e3684fd1 - main - armv7: Tweak some armv6 removals List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: b033e3684fd14c798405420449eb55e1d4f9df1e Auto-Submitted: auto-generated Date: Wed, 03 Dec 2025 05:32:11 +0000 Message-Id: <692fcb5b.8ec2.4d508639@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b033e3684fd14c798405420449eb55e1d4f9df1e commit b033e3684fd14c798405420449eb55e1d4f9df1e Author: Warner Losh AuthorDate: 2025-12-03 05:29:42 +0000 Commit: Warner Losh 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))