From nobody Wed May 28 13:35:04 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 4b6r8n3SRZz5xVC6; Wed, 28 May 2025 13:35:05 +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 4b6r8m4cdBz3Lw4; Wed, 28 May 2025 13:35:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748439304; 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=+UHGy37f8IlY03OeBQyKRUcas+pzDyIiqH9wdAiMB3s=; b=Feo0xTmOOkbusSDUb/plyQH1+xScEVfTOYNFbJzQl4E6rQ8Y7W6WUCyq+EZMfEPgnevepq QYL8ZTsa/FhWrcz7Ri8MZYL/q+P+ppZEnhBBw7TV2Oe/AbiLp8GX7fOAtCqTZvL+zkNsZu yjKhJso3GIMHU0cO5GLLusR4iIqDZDE5dNopIGrDV2o/G9HFGw7TygBs3PCMe5F+qLod4X 7cTK5UhVcT+gwrTL/EXpIAoX2HiZVLp3J4Qn3wsHmI+N03jjNfW3mf9v2uLTYDfNlBYtpp Zic3t+AxnzeDWT4+TGqZVORawCFg94T4f03CIm0FpCHfu0I5tBWaCMNMVHHryQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748439304; a=rsa-sha256; cv=none; b=sNy8sAx8cdMOWreOe688KDGHDSGeZhSQVE+k75CIR6tfDKYkFJEipCY3+eJzUUDJeiIPvK pgW2szsiAFGhMUd1II9BD7+XndXmK1r+5okNYNpinCmDu8OdP0OGs8w9cCfbIh2+K5fd/R 6VUIcUHaA0wRn+enQgDBBSs5JdlZssp3eDniZpKzOM3iUer8rBsOge9MI6HC8HsMHdEFcC sEhKVoGi6+7cxg6BlKH96inTcze/849KZsmsdBjQFqc0LLIlSUwDRx1OYVdFZUCHdZ13nv L7Bxj3b8xgZ8WhZbif6u+8aZng0HnS7lVN/9TszEzcW5LY5skoT1oeGnKzZyUA== 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=1748439304; 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=+UHGy37f8IlY03OeBQyKRUcas+pzDyIiqH9wdAiMB3s=; b=qChIci7VvGE+4CVbKc+Kfig4UWVh55FLm8kQxes3ZZA5ahSzQNJ4L+030cHj6c9mFg8eok 2Iz7bBZXExIFt7/SP5LX6KNc69p62LO2pyRKkzMPj8H0LH+u0w7VvJ6nBVzVdjmM1lwD+t iI8g2i+FYQljk4VKiBWb8gygFpPa5Lli62ntNN5i5u+fi8biGX3WhPj8KK/OuANmk5g+0J F6oZ+zJaJGolL7ARbvy9OTrEZh2Cken67A6tlB86WgegpI62D+sFLbmbSJ1WzIDbfYyidW jij3WFzv7EE3F2XfIiU+UXB3u4h/AktFMV/XLBUbC1FKYL/OLY7Zptfk2JTAWQ== 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 4b6r8m3yFyzg4J; Wed, 28 May 2025 13:35:04 +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 54SDZ4e9017597; Wed, 28 May 2025 13:35:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SDZ4mW017594; Wed, 28 May 2025 13:35:04 GMT (envelope-from git) Date: Wed, 28 May 2025 13:35:04 GMT Message-Id: <202505281335.54SDZ4mW017594@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: dbb620910f15 - main - hwpmc/arm64: PMCR_EL0 is a 64-bit register 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: dbb620910f1572be46e873ae352e18f60120b369 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=dbb620910f1572be46e873ae352e18f60120b369 commit dbb620910f1572be46e873ae352e18f60120b369 Author: Andrew Turner AuthorDate: 2025-05-27 19:54:59 +0000 Commit: Andrew Turner CommitDate: 2025-05-27 19:54:59 +0000 hwpmc/arm64: PMCR_EL0 is a 64-bit register Use uint64_t to store PMCR_EL0 as it's a 64-bit register and fields may be present in the upper 64-bits. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D50427 --- sys/dev/hwpmc/hwpmc_arm64.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/hwpmc/hwpmc_arm64.c b/sys/dev/hwpmc/hwpmc_arm64.c index 28745b4a3028..b547ad2fa53e 100644 --- a/sys/dev/hwpmc/hwpmc_arm64.c +++ b/sys/dev/hwpmc/hwpmc_arm64.c @@ -113,7 +113,7 @@ arm64_counter_disable(unsigned int pmc) /* * Performance Monitors Control Register */ -static uint32_t +static uint64_t arm64_pmcr_read(void) { uint32_t reg; @@ -124,7 +124,7 @@ arm64_pmcr_read(void) } static void -arm64_pmcr_write(uint32_t reg) +arm64_pmcr_write(uint64_t reg) { WRITE_SPECIALREG(pmcr_el0, reg); @@ -500,7 +500,7 @@ arm64_pcpu_init(struct pmc_mdep *md, int cpu) static int arm64_pcpu_fini(struct pmc_mdep *md, int cpu) { - uint32_t pmcr; + uint64_t pmcr; PMCDBG0(MDP, INI, 1, "arm64-pcpu-fini"); @@ -521,7 +521,7 @@ pmc_arm64_initialize(void) struct pmc_mdep *pmc_mdep; struct pmc_classdep *pcd; int classes, idcode, impcode; - int pmcr; + uint64_t pmcr; uint64_t midr; pmcr = arm64_pmcr_read();