From nobody Wed May 28 13:35:12 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 4b6r8w5m8Nz5xVfd; Wed, 28 May 2025 13:35:12 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6r8w39gyz3MHh; Wed, 28 May 2025 13:35:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748439312; 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=ZqPoGo6Lk/kZvvdGaJu1zxDiOO1+SqRIP6PlsNNdtUQ=; b=o3SO+uHnO9tcgXCaDqzZeQlYRyUQGygCmdHQ6f4Z3jNVCtmqtIyw+AIF1EHtHd0rWeTD2E OqUtDyGm9vMfQH8MhfR8QtLLnlZKgVkE8vRr3z4/RWLPPwifoXEhEJgFqD/10aJb4M0NYm hgOxbBgyn0DFLK+miJQuyStBlG4moPc4GCtZgRL8aRDUXfPtdyMLFJXfIvhObWctAvnbbx CepQDGj74z8od+NIdDJfNPwnoDcYkiIgTkjHrpKq4vMJeViqXUMmv4kBrC7IrePReg4XQa iJnvshEquxQnla4TKGXSlhLPuTRtUqfWhw4vKrZ3JFKCUSo0O2WIFG1ofepCFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748439312; a=rsa-sha256; cv=none; b=YXEmx+ohQwQuxJFk+V5cIyENPvlzOMa0aU21OzPHP0YAkOfUl1AMD2fsUYASGSJbcW+GNl IGCp+A2BSVeQ5cyfeBVdu8lXa9opLrM3X0hule2M1buWO/dRJ6RTs9ezLZFUp86Upa85hf ufDmfIKEcjGBXIHF2poahMHcVui43wW7SngYF6Ohi7JIe5Kk31V7Ll/0JRpLmQHKu7V13H qQgvNrLGqUSAbnhmxKIAIDDSr6jdV4n6BuqMz/YSfxuqANvxVx3OMH75NKKV2FScn4M2e8 kRmfM8izQAY/SOLtF3mdnXeJWjjBE0TyWY2p9rfA3CS3VKuI4iyJznf7nqHjUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748439312; 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=ZqPoGo6Lk/kZvvdGaJu1zxDiOO1+SqRIP6PlsNNdtUQ=; b=wtVbVmew9TQcjyZ6KOOXwczbRs5cXkLk2BpDNNT69udAfxVqwQPwb4pRJ2nK5E7DQi/qfX rDyQOyBO2nDz3RqZl6f2GEvOM+3Co5DUCU9eTZhcjtzXko9HVgtSvf6P3G7SlGgyRwO18m NFMvWTf32KRf4jOuq1S2rdifd1jOr8JcTZ6ui2nMnxi8Xccj5OM9/F0ony3E6w4wIstnaR IKYAS3hygaVJj0THFi9F1l8fQDYShBNDBKAPqlerHlN2ssYnj3pNelgxYbLtlVjPBsisvo LvRNA8hR4bUHieiXE95L+Jcvg4hVtYiA7OW6Wcbw7DYVt2VPxi0Y/xMWvyTXWA== 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 4b6r8w2PCpzgg3; Wed, 28 May 2025 13:35:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54SDZClc017830; Wed, 28 May 2025 13:35:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SDZCqN017827; Wed, 28 May 2025 13:35:12 GMT (envelope-from git) Date: Wed, 28 May 2025 13:35:12 GMT Message-Id: <202505281335.54SDZCqN017827@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 1bf4adf8cc9a - main - hwpmc/arm64: Hard code the initial pmcr state 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1bf4adf8cc9a22a1bcb3eafaf0315b3175a65abe Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=1bf4adf8cc9a22a1bcb3eafaf0315b3175a65abe commit 1bf4adf8cc9a22a1bcb3eafaf0315b3175a65abe Author: Andrew Turner AuthorDate: 2025-05-27 19:55:44 +0000 Commit: Andrew Turner CommitDate: 2025-05-27 19:55:44 +0000 hwpmc/arm64: Hard code the initial pmcr state We can't the fields in PMCR_EL0 are configured in the way we expect. Rather than depending on prior configuration hard code the fields we want set. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D50434 --- sys/dev/hwpmc/hwpmc_arm64.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/dev/hwpmc/hwpmc_arm64.c b/sys/dev/hwpmc/hwpmc_arm64.c index 6b019bfcb419..310e43065716 100644 --- a/sys/dev/hwpmc/hwpmc_arm64.c +++ b/sys/dev/hwpmc/hwpmc_arm64.c @@ -501,9 +501,8 @@ arm64_pcpu_init(struct pmc_mdep *md, int cpu) WRITE_SPECIALREG(pmcntenclr_el0, 0xffffffff); WRITE_SPECIALREG(pmintenclr_el1, 0xffffffff); - /* Enable unit */ - pmcr = arm64_pmcr_read(); - pmcr |= PMCR_E; + /* Enable unit with a useful default state */ + pmcr = PMCR_LC | PMCR_C | PMCR_P | PMCR_E; if (arm64_64bit_events) pmcr |= PMCR_LP; arm64_pmcr_write(pmcr);