From nobody Wed May 28 13:35:08 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 4b6r8s2RRxz5xVcL; Wed, 28 May 2025 13:35:09 +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 4b6r8r6gvNz3MBM; Wed, 28 May 2025 13:35:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748439309; 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=EDIQOMlN9/8dr9I6tVKto9nyYRIWNdUGbMyLGDwnTjg=; b=c4aQzUfpLv2258MRhT4bWmagn6pi8otfNxDNXPdS8Q341FZ27/79PTj62VJU+ss0IdY/v9 LvZBhvqiqnvG0AXinLvLghojm6R/9/96MfvQpCB8FHe5i3zSE5FrPwumMzJk1csdFW9+ad 0ia8wLJym6nXM25Ux1Lwo2ohNEqL1YD/gEqfPvU11d61szw9tMuAgtIn6ZUQySI272o7i0 RX0x3JI+OhvEgL+DDwufBJU78Ji4Mg8iGPX3zYoqwlPg+VjrjTFglf4PNq7XBy9ujddUE+ ag4wyHeTlRmSs8/foRWMaoFGHkTuFwt1qY0r6BcJTwfpHwkfvLKO6i66Ko3v0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748439309; a=rsa-sha256; cv=none; b=tkYenj+jFQLoZ3/roDRZv2WmuOE7jxHN5kZpdo5oaq3HUDTNfB9Aur33iXLihqOmyTfiKP V9rlrkFCavR2mEcSBrpymVd2jgOmedAXOgqNuvs9PV21tzfuEOBJx/iPQJy4CzJffXjmHI Nw88bHdrDhzSOLH6wW7glM2Cwo9bPbenURJw3JGj4cOw6GrxqNdFDM80/YhEo+jJxTbvB7 kyjLHQ9lnGa0A8CKO1ym8LAOT58dp5pjJPGMWDC2PkqI8BuA5k58lHJEhN7xsLT2RXryVA uR7MTdCpd71okMUj5beZZMJa7/q6sruNFLz0plocm242jBi9koGbLdYXswFXuQ== 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=1748439309; 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=EDIQOMlN9/8dr9I6tVKto9nyYRIWNdUGbMyLGDwnTjg=; b=T3PR1v3wHqrKxdbHstfU1czIyErEEwFIWtmHny+am/p5+l9ZwSXfGTvSkhrUKQmxM4eFpR LY7LPXYpfgsrc17C4B3CrcOmEfCaI/60BdbOZERpkN3avm6KGppPq6Yf5WeZfQ8tLE5z7D IhhRT1Ix5vhtEOei/hyaICSMRVqIezLvtri/ylrfe1rgi7mwwoBBWW8IvuSUOgltmSvRtq hvzG/ik11iOEWbujeZ4meBGjV45okzt+Dz21eIEVKGFOhRHHoWGDc1x6DlqFWB6SlAkOUg TCz1ERkJIR4jwPlQmGsCwkkQdiSnnLn7MRuhLv6+0HcPelEPi8C8tO0YiwI0DQ== 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 4b6r8r6GWTzg6X; Wed, 28 May 2025 13:35:08 +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 54SDZ8RT017734; Wed, 28 May 2025 13:35:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SDZ8CW017731; Wed, 28 May 2025 13:35:08 GMT (envelope-from git) Date: Wed, 28 May 2025 13:35:08 GMT Message-Id: <202505281335.54SDZ8CW017731@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: 48d41181ee1d - main - hwpmc/arm64: The PMXEVCNTR_EL0 register is 64-bit 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: 48d41181ee1d43e44cf9aa8332ccb8ad855026a9 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=48d41181ee1d43e44cf9aa8332ccb8ad855026a9 commit 48d41181ee1d43e44cf9aa8332ccb8ad855026a9 Author: Andrew Turner AuthorDate: 2025-05-27 19:55:27 +0000 Commit: Andrew Turner CommitDate: 2025-05-27 19:55:27 +0000 hwpmc/arm64: The PMXEVCNTR_EL0 register is 64-bit It may return data in the upper 32-bits when FEAT_PMUv3p5 is implemented so mask those bits off. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D50431 --- sys/dev/hwpmc/hwpmc_arm64.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/dev/hwpmc/hwpmc_arm64.c b/sys/dev/hwpmc/hwpmc_arm64.c index b547ad2fa53e..e51d3fa84828 100644 --- a/sys/dev/hwpmc/hwpmc_arm64.c +++ b/sys/dev/hwpmc/hwpmc_arm64.c @@ -135,7 +135,7 @@ arm64_pmcr_write(uint64_t reg) /* * Performance Count Register N */ -static uint32_t +static uint64_t arm64_pmcn_read(unsigned int pmc) { @@ -149,7 +149,7 @@ arm64_pmcn_read(unsigned int pmc) } static void -arm64_pmcn_write(unsigned int pmc, uint32_t reg) +arm64_pmcn_write(unsigned int pmc, uint64_t reg) { KASSERT(pmc < arm64_npmcs, ("%s: illegal PMC number %d", __func__, pmc)); @@ -247,6 +247,7 @@ arm64_read_pmc(int cpu, int ri, struct pmc *pm, pmc_value_t *v) /* Reread counter in case we raced. */ tmp = arm64_pmcn_read(ri); } + tmp &= 0xffffffffu; tmp += 0x100000000llu * pm->pm_pcpu_state[cpu].pps_overflowcnt; intr_restore(s); @@ -282,6 +283,7 @@ arm64_write_pmc(int cpu, int ri, struct pmc *pm, pmc_value_t v) PMCDBG3(MDP, WRI, 1, "arm64-write cpu=%d ri=%d v=%jx", cpu, ri, v); pm->pm_pcpu_state[cpu].pps_overflowcnt = v >> 32; + v &= 0xffffffffu; arm64_pmcn_write(ri, v); return (0);