From nobody Wed Apr 13 23:09:44 2022 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 8DF3E1B41348; Wed, 13 Apr 2022 23:09:45 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KdywS57Jqz4lsQ; Wed, 13 Apr 2022 23:09:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649891384; 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=5rKKiH7fMu2A5XTS9e941UU1Pw+YsVUpIDkhNV83zLc=; b=JxVdKXZbLmlW8kXY23Nckg8OyFXNg3vcCa+9MLQoAyFeHgpNZpjttHSkjOQBYjYkYlLlio VlPSFoDBNRQvBHAQlhpKewsOEB3qqAqmeSCK+Gx24gn/d/AmaHfc0YFdB0p72ajsKDBqr4 mrPsQd1/2S6B0tkUTs2KZ9qHzvLZGQcJPi+ACsxfY552mKHFHt0ln3TJCj20WlSgA7cjc1 A+cL+F1c6bfn5s1b/Hcm+e1ffOoX0lkQ5TbsKvjFZ5WSAAC8CawDDSMqe4MTpsqHYW5/ha J2oeOw6lZV2czdeUVBDb7WdaZ1TGWzyUffHf/b/UAvCnlKjit9UzxLoNF0Epdg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2FB1814CF7; Wed, 13 Apr 2022 23:09:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23DN9imd074763; Wed, 13 Apr 2022 23:09:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23DN9iW1074762; Wed, 13 Apr 2022 23:09:44 GMT (envelope-from git) Date: Wed, 13 Apr 2022 23:09:44 GMT Message-Id: <202204132309.23DN9iW1074762@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: d101d5732143 - main - arm dbg: Use PCPU_GET(cpuid) directly in assertions. 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d101d5732143455d98bf756d728bb2f5a1947a9b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649891384; 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=5rKKiH7fMu2A5XTS9e941UU1Pw+YsVUpIDkhNV83zLc=; b=bEVWshyQO2gEiWXtUjaF8MXvpFrg1gwT8XVwcSTT9TCbh7j/obVpsgiVME8hljjCTRLOZh RTpjiUdlL1fsxkBz5p4Ge0WT/f9ROpMUMrsoUyA8eP5k+MJxJ97yvkdnUeRgk8PHhsHmfv LbUx8PXjWl2q4En79tXvqriTFkKXDuzTkowBgLbYDh3nAcSzv1XLwSRisv3FAfIMAaQKet LTMHvV2k1Yb/5y1eLs+zNeZ51NNuj86wJbQ81IZjWJ+mbuorny5I9V1qgXvp7k79ho2nld 2CbSGvt/Pb4DAitHjkHx4JJRgCDw16V3WkckZwQK4qL7vGNVuHMX4SxNsLZzog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649891384; a=rsa-sha256; cv=none; b=EJJhBOJwhBO6CsRYsMyHlyzY2YZCNK4wmk6Z+liAgJ2MF2uOAE5SVzjlVrINOqaXiQVlfE 5KMU/Bzw/Kl/QQtGsa3bqVnRQb9wl1yT3eyTYlgHLiSAY4Rcj7FJ24eVgAPG6pGLPYtB6G NXJpwaFJIBmg1oEt1L+LfKRGTWEUtKwsW9hrjv5MPascI6vlNryP6Z95xt88+2oIe/AsDd 5X65Lop8B7jLLScoECOVVBQ9KIKsFNloZYyB7nvSDoB56umAbjZPzfGRES2kCdavbnkkFm rxLhjrfVXEQKJCukdPGFgc3sPwFoPvFA+5yAwEegxVnYTOrq8e7VDSMvrg639Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=d101d5732143455d98bf756d728bb2f5a1947a9b commit d101d5732143455d98bf756d728bb2f5a1947a9b Author: John Baldwin AuthorDate: 2022-04-13 23:08:21 +0000 Commit: John Baldwin CommitDate: 2022-04-13 23:08:21 +0000 arm dbg: Use PCPU_GET(cpuid) directly in assertions. --- sys/arm/arm/debug_monitor.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sys/arm/arm/debug_monitor.c b/sys/arm/arm/debug_monitor.c index 7f4dd829b4f9..1d00c0473dde 100644 --- a/sys/arm/arm/debug_monitor.c +++ b/sys/arm/arm/debug_monitor.c @@ -1013,7 +1013,6 @@ CTASSERT(sizeof(struct dbreg) == sizeof(((struct pcpu *)NULL)->pc_dbreg)); void dbg_monitor_init_secondary(void) { - u_int cpuid; int err; /* * This flag is set on the primary CPU @@ -1022,8 +1021,6 @@ dbg_monitor_init_secondary(void) if (!dbg_capable()) return; - cpuid = PCPU_GET(cpuid); - err = dbg_reset_state(); if (err != 0) { /* @@ -1031,7 +1028,7 @@ dbg_monitor_init_secondary(void) * WPs/BPs will not work correctly on this CPU. */ KASSERT(0, ("%s: Failed to reset Debug Architecture " - "state on CPU%d", __func__, cpuid)); + "state on CPU%d", __func__, PCPU_GET(cpuid))); /* Disable HW debug capabilities for all CPUs */ atomic_set_int(&dbg_capable_var, 0); return; @@ -1039,7 +1036,7 @@ dbg_monitor_init_secondary(void) err = dbg_enable_monitor(); if (err != 0) { KASSERT(0, ("%s: Failed to enable Debug Monitor" - " on CPU%d", __func__, cpuid)); + " on CPU%d", __func__, PCPU_GET(cpuid))); atomic_set_int(&dbg_capable_var, 0); } }