From nobody Mon Oct 10 22:34:37 2022 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 4MmYcs34Xcz4f9xZ; Mon, 10 Oct 2022 22:34:37 +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 4MmYcs2cvYz3XLR; Mon, 10 Oct 2022 22:34:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665441277; 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=XTvP+FtSJdAu8oUAKq18aJIa3muX/jCugad4DOKSvJ4=; b=BmcKAysv3tmDEztcD9//PRFOPLhZckOd9NZRuEPvkOImen25+vNTwyyrx4eQe7HW6VJXz+ R5n9ME28lbaza6AbAoFd9mfsiq4ZX8d1gNuHE+NuyOf0k+UUVyIbCDFbD0cerCm0iyTRTh ofi+EW9HFTNZdTz+n0QbSzODq+9lfHS7NIJddAd+vgjWrsMyO4I+9Kg+f2IiIJyHk7KkGG zJl265smdVjV6CtBHu7CkGQHxkXcTQpAKoWdRe/2n5+X0/wt3TfTNCmluQkfGtKoRX7ECf eYdqGtkOtc1bDqdqZNYbHfNzT6Fvd31nHPe+VbYgr3CVOk8Sda52nCd/Dw64/Q== 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 4MmYcs1gF8zmGk; Mon, 10 Oct 2022 22:34:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29AMYbAo059122; Mon, 10 Oct 2022 22:34:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29AMYbgU059121; Mon, 10 Oct 2022 22:34:37 GMT (envelope-from git) Date: Mon, 10 Oct 2022 22:34:37 GMT Message-Id: <202210102234.29AMYbgU059121@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 28ff96115d95 - main - hwpmc: Move DMC-620 and CMN-600 events to allow for full Armv8.0 space 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 28ff96115d95311affd38fab243574806af5e784 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665441277; 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=XTvP+FtSJdAu8oUAKq18aJIa3muX/jCugad4DOKSvJ4=; b=LOALPaRkg/t86qO8Hd39X+9hlxyMGakClED/hlC0a/I7X+OpvYYDm70G7zUJyXrFFATSR6 buDFlBeyO35VKg1MgH7dwo+k88dLdjM15/DskZJkU+h7vgBe93tQ7dEGuP5sxvrYZpuhMN BlpnyeIHBh3MyhcyDYLIUbxPyUTJ/0XsEr1N+d54m9s/+eQzkDv9Xs4kE3Y2g6URRyNeBL hge2RwkS9dwNybtan+ikifvDeg+YkuzoGpcBZvXGky4Wdq6cHWgGep7LHxOOaf9BfobgNI ZTwCEz488brc6xruQgIUUQLBZx0DuQkkV1ogYtrA048fvkbcchs7/NRhUlUchQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665441277; a=rsa-sha256; cv=none; b=KQ91oTAeBifxm7zwiISEriHXoNCAPChVV9g9QKlUNMwoZGUbPMDVwEVnlnB37a7Hx4oNvV ji08kdYXdgkeIdkBaatLQ8wGrPZxGKynuJtY5kUWtRnvT9Ybg9yICeEMUK3m/HZvjNtUxr WDOXNOl8R4/QmpE2xcFRsqRe2/a9qI0MxCjdsmmqUcaRMBwmRlK3JMuRIZldTlpnQExXJV I+LZFmVR7wK4Vnk1B5UePVLBBOl6OKsVZTWaWzD3LE4lVRsoGE49jzv2osXTwlZ4T7WVBz B00Ypo5UyTHTqjyxwdReINedqwB5LA0pCPKWQQrAI9dewbrTdwz4SMQvHoIJbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=28ff96115d95311affd38fab243574806af5e784 commit 28ff96115d95311affd38fab243574806af5e784 Author: Jessica Clarke AuthorDate: 2022-10-10 22:30:07 +0000 Commit: Jessica Clarke CommitDate: 2022-10-10 22:30:07 +0000 hwpmc: Move DMC-620 and CMN-600 events to allow for full Armv8.0 space The documented encoding space for Armv8 was only 8 bits, but v8.0 has always had a 10-bit encoding space for its events, and downstream in CheriBSD we relied on this full space. This worked until the DMC-620 and CMN-600 events were added, trampling on what should have been reserved for Armv8.0 right from the start. Thus, renumber the DMC-620 and CMN-600 events to not do this before they make it into a stable release, allowing for the full Armv8.0 encoding space to be used without having to split it across two different regions. Note that Armv8.1 grows the encoding space to 16 bits, which doesn't fit well with our current approach. No attempt is made to allow for these events in this change, only the ones that have always been valid (according to the hardware) from the first commit of Armv8 support to hwpmc. Reviewed by: arichardson, tsoome Differential Revision: https://reviews.freebsd.org/D36925 --- sys/dev/hwpmc/pmc_events.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/dev/hwpmc/pmc_events.h b/sys/dev/hwpmc/pmc_events.h index e16b4f744853..c84ce7eee4c1 100644 --- a/sys/dev/hwpmc/pmc_events.h +++ b/sys/dev/hwpmc/pmc_events.h @@ -1707,10 +1707,10 @@ __PMC_EV_ALIAS("unhalted-core-cycles", IAP_ARCH_UNH_COR_CYC) * 0x13200 0x00FF free (was IBM POWER8 events) * 0x13300 0x00FF Freescale e500 events * 0x14000 0x0100 ARMv7 events - * 0x14100 0x0100 ARMv8 events - * 0x14200 0x0020 ARM DMC-620 clkdiv2 events - * 0x14220 0x0080 ARM DMC-620 clk events - * 0x14300 0x0100 ARM CMN-600 events + * 0x14100 0x0400 ARMv8 events + * 0x14500 0x0020 ARM DMC-620 clkdiv2 events + * 0x14520 0x0080 ARM DMC-620 clk events + * 0x14600 0x0100 ARM CMN-600 events * 0x20000 0x1000 Software events */ #define __PMC_EVENTS() \ @@ -1734,11 +1734,11 @@ __PMC_EV_ALIAS("unhalted-core-cycles", IAP_ARCH_UNH_COR_CYC) __PMC_EV_ARMV7() \ __PMC_EV_BLOCK(ARMV8, 0x14100) \ __PMC_EV_ARMV8() \ - __PMC_EV_BLOCK(DMC620_PMU_CD2, 0x14200) \ + __PMC_EV_BLOCK(DMC620_PMU_CD2, 0x14500) \ __PMC_EV_DMC620_PMU_CD2() \ - __PMC_EV_BLOCK(DMC620_PMU_C, 0x14220) \ + __PMC_EV_BLOCK(DMC620_PMU_C, 0x14520) \ __PMC_EV_DMC620_PMU_C() \ - __PMC_EV_BLOCK(CMN600_PMU, 0x14300) \ + __PMC_EV_BLOCK(CMN600_PMU, 0x14600) \ __PMC_EV_CMN600_PMU() #define PMC_EVENT_FIRST PMC_EV_TSC_TSC