From nobody Tue Jun 25 09:31:27 2024 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 4W7fjD1D9rz5P9xr; Tue, 25 Jun 2024 09:31:28 +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 4W7fjC6qHPz4Kwl; Tue, 25 Jun 2024 09:31:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719307888; 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=ooqJAe6H4TJnQmwCffzboHl/iZCZoz2JVqhDHceNAAE=; b=qWxVs+La5/brNVsaG8iNJ+zN8eGAW5Nt42gvUoggQkgTaTy/cQptEU7C6kes8v4Va06lyI mLZrWREfJA570qC4rR/YWo+DhxvKVTAUXaBXVFkyejsM1b9VqYGXCcZJpKhjbHSzBTA1Ve NxX+ioQLqVdT5ccFkv40RlvHkFck6FEyytpEW6eAS64NeDeJf0ifsgyO+1we6HmiSqzmsg 2B9fnkbog7KWGgvITELTYPhMYCyoVjVmBQZFD8kpqV0f5uB1/Na4uVusr8ksn1gXlibRVD osg65t49Zb4h/eAQ/OslJSJqpbbsPnKkjZrcyrubxXeBBvjeG0s6b7A5XshqiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719307888; a=rsa-sha256; cv=none; b=hhmEDyBZDUgu+UmjGj6Ro/FrQO+MaVmUMeGlMLw5SEJq1GtfoGSIzp+1WZZaD+pImV6n54 hhjxVA2u0OMlNx9A1zxLPiIikLY3Akoar1XfXk5ysiaYa8wS1PQSbtdp4BEy+jLouhso1W AeMA2zKby75MOHNHoieJ+2xp7HgQ7kxgBy2p1kRBvbDsG+9BOiWTTkNJ5hOyOW9nMI0ZDR 0JA56ceJpjHXlxFDuCVwujOqpiHIMCvniZV/DDdN81ny7oESc3KHykkmXD/aQ0LnO17tEK PkpVTtNpCCpiBK3JGmB71QKLunnB+JC93bT84jJncmgRFi5KStxQngfny2H/Ig== 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=1719307888; 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=ooqJAe6H4TJnQmwCffzboHl/iZCZoz2JVqhDHceNAAE=; b=CCWgh4epiFIdKWoaASeiyhmgAH66o92WM8rxg0LMtvJL0opRxNgewZPRL+RPGyJ+C9cyfB 6hwxNiN9+V5ydpd3D+aywHPSxAxnPXCDS1EjyNN5/bv5nHWgRiqWsSFRVXoP7U/A90qox6 vkAMDN5fPVOPgcPmwCtqWNMm4y/zNTdCME51d0/5J5+J/Cshxbr3b+NlfaEhFBvrtc8cxf MUUQS5NqCIxRyBk9Mv6I1ZBvAFF7J0U9Idfyb1fj5fJYyJw1r8BhnsshNs/MCpFfvLwckJ kfq4QqW9buOEnhnOq7Gv1aNw1RG9YZRnBK2FzsaUSMWL32WNeZt++rjDYaUFPg== 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 4W7fjC6QmQzvrf; Tue, 25 Jun 2024 09:31:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45P9VRtW006911; Tue, 25 Jun 2024 09:31:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45P9VRii006908; Tue, 25 Jun 2024 09:31:27 GMT (envelope-from git) Date: Tue, 25 Jun 2024 09:31:27 GMT Message-Id: <202406250931.45P9VRii006908@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: 915161b3d35e - main - hwpmc/arm64: fix the type for pm_arm64_evsel 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: 915161b3d35ed5a742e3a8d90d215a2d930dd199 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=915161b3d35ed5a742e3a8d90d215a2d930dd199 commit 915161b3d35ed5a742e3a8d90d215a2d930dd199 Author: Andrew Turner AuthorDate: 2024-06-25 08:41:37 +0000 Commit: Andrew Turner CommitDate: 2024-06-25 09:07:19 +0000 hwpmc/arm64: fix the type for pm_arm64_evsel It holds a 64-bit register, use a uint64_t. Reviewed by: mhorne Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D45526 --- sys/dev/hwpmc/hwpmc_arm64.c | 7 ++++--- sys/dev/hwpmc/hwpmc_arm64.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/dev/hwpmc/hwpmc_arm64.c b/sys/dev/hwpmc/hwpmc_arm64.c index af8d25b098c4..4b2fd5cc746f 100644 --- a/sys/dev/hwpmc/hwpmc_arm64.c +++ b/sys/dev/hwpmc/hwpmc_arm64.c @@ -163,7 +163,7 @@ static int arm64_allocate_pmc(int cpu, int ri, struct pmc *pm, const struct pmc_op_pmcallocate *a) { - uint32_t config; + uint64_t config; enum pmc_event pe; KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), @@ -201,7 +201,8 @@ arm64_allocate_pmc(int cpu, int ri, struct pmc *pm, } pm->pm_md.pm_arm64.pm_arm64_evsel = config; - PMCDBG2(MDP, ALL, 2, "arm64-allocate ri=%d -> config=0x%x", ri, config); + PMCDBG2(MDP, ALL, 2, "arm64-allocate ri=%d -> config=0x%lx", ri, + config); return (0); } @@ -299,7 +300,7 @@ arm64_config_pmc(int cpu, int ri, struct pmc *pm) static int arm64_start_pmc(int cpu, int ri, struct pmc *pm) { - uint32_t config; + uint64_t config; config = pm->pm_md.pm_arm64.pm_arm64_evsel; diff --git a/sys/dev/hwpmc/hwpmc_arm64.h b/sys/dev/hwpmc/hwpmc_arm64.h index e1f605a0371b..97909d8e7c92 100644 --- a/sys/dev/hwpmc/hwpmc_arm64.h +++ b/sys/dev/hwpmc/hwpmc_arm64.h @@ -42,7 +42,7 @@ #ifdef _KERNEL /* MD extension for 'struct pmc' */ struct pmc_md_arm64_pmc { - uint32_t pm_arm64_evsel; + uint64_t pm_arm64_evsel; }; #endif /* _KERNEL */ #endif /* _DEV_HWPMC_ARMV8_H_ */