From nobody Wed May 28 13:35:11 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 4b6r8v55wqz5xVcT; Wed, 28 May 2025 13:35: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6r8v1THtz3ML8; Wed, 28 May 2025 13:35:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748439311; 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=YhWLBXpwH5IK+t10/FMSMVdCYFRtl9dBhxprVM5u18k=; b=W1ghUp0B9fGBwL7uIZ68Fo/VI2U7H8ZAoI0gHylLX96waCMxX1eShlmbWEN1iWjT8De187 TYqmfvTCwFlp/tOEyYOHzfoAR1ImG8g+wyCEDBTAbIjdiw8eydYQ/7yWW+kLw/NkVcVX3L 6spq2z0+WFNguaKdbj+ve0S8BSZ0F+gY9gmZ7nEvdAdLJKu4lR48sHKgnxQs9hJ0GOr0XZ SnkjgsW1LZaupHOpzv8YbQlVInb31dLZcRzhf5yxRcVd7rhwHuojntD+aTZwlWF+kFkuKI FFRVg+uworOcRFt7Id01tdkrWPztJKBOiUJ3/YsmJuhKC8CD04jbwwi8JAr6qg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748439311; a=rsa-sha256; cv=none; b=TsAeZbZ7yenigY6FqF7IdO0NrTeVfEzp8fbCLB++ZDj2GwKN5cydQvM8N2pwkb2mVDLdo0 JIF1/B13ml+ZSHn22kfOL2sODnktGktXNY0TmsvONTY24w2bYMZeawQLa0++R649jceYQn GokYg24g6aF2cqi9INlt0fG9gfIREHD2KH4ot2DFjIPE4WTq66RbPKVLETaY3hKsQQYmCH fznep3neqnqwAt6/89gMMfnqNTlsmHbWU72mLHEgPGDv1DnVM2rdZiuS57jrYl1rHRI0Jo pnfjp/PwZk+cO/6qu0XyMcfEuHok1JJjiNcRqbpZxaX8YAaKQ7ve+/zqip59KQ== 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=1748439311; 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=YhWLBXpwH5IK+t10/FMSMVdCYFRtl9dBhxprVM5u18k=; b=BYnjX9IVTgZX8OtUUmECCUiZQkZs1TkuBAmORx2WvvQM6979pNq/x08XlsXhFPMflREpZT H+Gvap4sW9y1LLMXuMD/QJhhsQufPvQ85JYvgM0zlyznRIVmaG1MwZWw+1UiGcPgt6PZhY ctOl+ij59fIN6CaRn+2p+JvpzQaE7L6VgbZCQnkqE5zReoHIffMyBndS6C5KgsX5+2uzaJ Bc1Rr/vzUhVFtumCnH9CSGbCdOZr97HhOVYt5g3AVUDkb8yDGChk3K0XfSuwzNsWQdu5d+ WXXF74LHOKhZj3sAr3q5GDPCD6YmM+i/RyjVUG95GZigxHeAYCAK+SxsJotf9g== 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 4b6r8v11yfzg6Y; Wed, 28 May 2025 13:35:11 +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 54SDZBAL017798; Wed, 28 May 2025 13:35:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SDZBIn017795; Wed, 28 May 2025 13:35:11 GMT (envelope-from git) Date: Wed, 28 May 2025 13:35:11 GMT Message-Id: <202505281335.54SDZBIn017795@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: 166d8e4f4786 - main - hwpmc/arm64: Support 64-bit counters 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 166d8e4f47860e4d0f1826923134e226684a8a20 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=166d8e4f47860e4d0f1826923134e226684a8a20 commit 166d8e4f47860e4d0f1826923134e226684a8a20 Author: Andrew Turner AuthorDate: 2025-05-27 19:55:38 +0000 Commit: Andrew Turner CommitDate: 2025-05-27 19:55:38 +0000 hwpmc/arm64: Support 64-bit counters When FEAT_PMUv3p5 is implemented the event counters become 64-bit. The PMCR_EL0.LP field is set to move the overflow to be a 64-bit overflow. As such we ignore it when getting the value for the user as there is no space in a 64-bit variable to store is. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D50433 --- sys/dev/hwpmc/hwpmc_arm64.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/sys/dev/hwpmc/hwpmc_arm64.c b/sys/dev/hwpmc/hwpmc_arm64.c index 4f7cc16b9765..6b019bfcb419 100644 --- a/sys/dev/hwpmc/hwpmc_arm64.c +++ b/sys/dev/hwpmc/hwpmc_arm64.c @@ -39,6 +39,7 @@ #include "opt_acpi.h" static int arm64_npmcs; +static bool arm64_64bit_events __read_mostly = false; struct arm64_event_code_map { enum pmc_event pe_ev; @@ -247,8 +248,15 @@ 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; + /* + * If the counter is 32-bit increment the upper bits of the counter. + * It it is 64-bit then there is nothing we can do as tmp is already + * 64-bit. + */ + if (!arm64_64bit_events) { + tmp &= 0xffffffffu; + tmp += (uint64_t)pm->pm_pcpu_state[cpu].pps_overflowcnt << 32; + } intr_restore(s); PMCDBG2(MDP, REA, 2, "arm64-read id=%d -> %jd", ri, tmp); @@ -282,8 +290,10 @@ 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; + if (!arm64_64bit_events) { + pm->pm_pcpu_state[cpu].pps_overflowcnt = v >> 32; + v &= 0xffffffffu; + } arm64_pmcn_write(ri, v); return (0); @@ -494,6 +504,8 @@ arm64_pcpu_init(struct pmc_mdep *md, int cpu) /* Enable unit */ pmcr = arm64_pmcr_read(); pmcr |= PMCR_E; + if (arm64_64bit_events) + pmcr |= PMCR_LP; arm64_pmcr_write(pmcr); return (0); @@ -523,6 +535,7 @@ pmc_arm64_initialize(void) struct pmc_mdep *pmc_mdep; struct pmc_classdep *pcd; int classes, idcode, impcode; + uint64_t dfr; uint64_t pmcr; uint64_t midr; @@ -545,6 +558,12 @@ pmc_arm64_initialize(void) midr &= ~(CPU_VAR_MASK | CPU_REV_MASK); snprintf(pmc_cpuid, sizeof(pmc_cpuid), "0x%016lx", midr); + /* Check if we have 64-bit counters */ + if (get_kernel_reg(ID_AA64DFR0_EL1, &dfr)) { + if (ID_AA64DFR0_PMUVer_VAL(dfr) >= ID_AA64DFR0_PMUVer_3_5) + arm64_64bit_events = true; + } + /* * Allocate space for pointers to PMC HW descriptors and for * the MDEP structure used by MI code.