From nobody Sun Jun 26 09:19:03 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 0F481878BF1; Sun, 26 Jun 2022 09:19:04 +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 4LW4zq6ZXTz4nDD; Sun, 26 Jun 2022 09:19:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656235143; 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=pmTIA15Nb9/UTk6R0hX2Mo8CRvajwbVQGt71p8G6tSc=; b=lPkz47bpylen22ZAXs1bKLDvGQrKBrxT3DUQ7+VtPK3IArx2oBrzugq021wxktBLuaANx6 VITXIIT/oIr/mTDf69lZqejFL66hcBrNH6rdiOTMYEJjpqsHka/SLCp2O43JF6w0voEBEO b9ABaPt4yh1m7bXKIEPuZEvNQcWfOon2X6U70VJ4ateMFzA4/wElLjS4nUjd1VBJoRCoGS a1F0N/ElCwyra9GQLnY4hlKXP56cuo6NGvOSzYvFOnmQ5+xb0xc5X0v9H+PNQuqgat4x/k nXix/GWy2elORQcSzy6xJPVp5KgP5nQj7UzHLFtPksUmhk6X/IUPt7Igplw8tQ== 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 BE81A13CCF; Sun, 26 Jun 2022 09:19:03 +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 25Q9J3ps044053; Sun, 26 Jun 2022 09:19:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25Q9J3Of044052; Sun, 26 Jun 2022 09:19:03 GMT (envelope-from git) Date: Sun, 26 Jun 2022 09:19:03 GMT Message-Id: <202206260919.25Q9J3Of044052@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Toomas Soome Subject: git: fdfeaa66b58a - main - Support of optional PMC classes. 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: tsoome X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fdfeaa66b58a49ee1bb40f9d447c610402231f20 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656235143; 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=pmTIA15Nb9/UTk6R0hX2Mo8CRvajwbVQGt71p8G6tSc=; b=iwbtZweeVM/Z+qS94P/3FGN7SPMQPC5D43hZ61IW4UijiDwOC8ycz7lAEl4MmcTTDN3oJf Ff4xZt4WSjkIQHRciS36yeHZQ8F4FrHiGkihYzjv8G58z9ClcjJHazx6g1ImSXbsROiNvO Sx/R4dufSCoYUFEkdD3zJC6tfzOeaet9IRcLUKF27v7jQxb2nDkim7awD5AmBb5VAQdILs 2OU8lXl7lEiuIhLvf0DAQ5gffDWIDmsy0E7EJX8b2D97t5p1sjHkCh39R33wNgCr+6ocgf GvBUMklc3qBg6kS3/w8yQ6/5g5h7NWlhZjaPoSJnasaAUgvJV22TK7+yAXHt/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656235143; a=rsa-sha256; cv=none; b=w+R6oYOiDy1MsjIBQEwoAk05Bo/8PzvjiCMY4V4+3sQZX+H0GCAqceVlLEnTeCb7SGkU0+ FfYzGmvUdTp8VDDg8IRkP0EDqWJHEWRDvEQf3jjmfSRYHWkzjXkSd80OskkCJkJ9/zSkA4 qqcXXJctRaw2FxDmCkR48dxUFxAFGaQV6YwvZ3NCiZfFKt+/E+uMtOEsmdii6tDvvW1wb7 wF+n2gowxeko9viHhqf4LcP8I6IQg5YTZhynpl0h3qG93YiT6m+rNc0RCG5vuJcjTLH7MJ RWgDpNF3/t5EQHqd6zfPlwN7NBMXxopD+thHbJMuueU6T8hP0gjgAjNjMkeOQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tsoome: URL: https://cgit.FreeBSD.org/src/commit/?id=fdfeaa66b58a49ee1bb40f9d447c610402231f20 commit fdfeaa66b58a49ee1bb40f9d447c610402231f20 Author: Aleksandr Rybalko AuthorDate: 2022-02-16 00:18:04 +0000 Commit: Toomas Soome CommitDate: 2022-06-26 05:55:09 +0000 Support of optional PMC classes. Reviewed by: mhorne Differential Revision: https://reviews.freebsd.org/D32316 --- sys/dev/hwpmc/hwpmc_arm64.c | 21 ++++++++++++++++++--- sys/dev/hwpmc/hwpmc_mod.c | 20 ++++++++++++++++++-- 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/sys/dev/hwpmc/hwpmc_arm64.c b/sys/dev/hwpmc/hwpmc_arm64.c index 03f85a593d1a..9b530a7b2ddf 100644 --- a/sys/dev/hwpmc/hwpmc_arm64.c +++ b/sys/dev/hwpmc/hwpmc_arm64.c @@ -531,7 +531,7 @@ pmc_arm64_initialize() { struct pmc_mdep *pmc_mdep; struct pmc_classdep *pcd; - int idcode, impcode; + int classes, idcode, impcode; int reg; uint64_t midr; @@ -561,8 +561,16 @@ pmc_arm64_initialize() arm64_pcpu = malloc(sizeof(struct arm64_cpu *) * pmc_cpu_max(), M_PMC, M_WAITOK | M_ZERO); - /* Just one class */ - pmc_mdep = pmc_mdep_alloc(1); + /* One AArch64 CPU class */ + classes = 1; + + /* Query presence of optional classes and set max class. */ + if (pmc_cmn600_nclasses() > 0) + classes = MAX(classes, PMC_MDEP_CLASS_INDEX_CMN600); + if (pmc_dmc620_nclasses() > 0) + classes = MAX(classes, PMC_MDEP_CLASS_INDEX_DMC620_C); + + pmc_mdep = pmc_mdep_alloc(classes); switch(impcode) { case PMCR_IMP_ARM: @@ -611,6 +619,13 @@ pmc_arm64_initialize() pmc_mdep->pmd_npmc += arm64_npmcs; + if (pmc_cmn600_nclasses() > 0) + pmc_cmn600_initialize(pmc_mdep); + if (pmc_dmc620_nclasses() > 0) { + pmc_dmc620_initialize_cd2(pmc_mdep); + pmc_dmc620_initialize_c(pmc_mdep); + } + return (pmc_mdep); } diff --git a/sys/dev/hwpmc/hwpmc_mod.c b/sys/dev/hwpmc/hwpmc_mod.c index 50b4f3bc9d3b..1a7f2869d9b9 100644 --- a/sys/dev/hwpmc/hwpmc_mod.c +++ b/sys/dev/hwpmc/hwpmc_mod.c @@ -5600,6 +5600,16 @@ pmc_initialize(void) return (ENOSYS); } + /* + * Refresh classes base ri. Optional classes may come in different + * order. + */ + for (ri = c = 0; c < md->pmd_nclass; c++) { + pcd = &md->pmd_classdep[c]; + pcd->pcd_ri = ri; + ri += pcd->pcd_num; + } + KASSERT(md->pmd_nclass >= 1 && md->pmd_npmc >= 1, ("[pmc,%d] no classes or pmcs", __LINE__)); @@ -5642,7 +5652,9 @@ pmc_initialize(void) if (md->pmd_pcpu_init) error = md->pmd_pcpu_init(md, cpu); for (n = 0; error == 0 && n < md->pmd_nclass; n++) - error = md->pmd_classdep[n].pcd_pcpu_init(md, cpu); + if (md->pmd_classdep[n].pcd_num > 0) + error = md->pmd_classdep[n].pcd_pcpu_init(md, + cpu); } pmc_restore_cpu_binding(&pb); @@ -5755,6 +5767,8 @@ pmc_initialize(void) if (error == 0) { printf(PMC_MODULE_NAME ":"); for (n = 0; n < (int) md->pmd_nclass; n++) { + if (md->pmd_classdep[n].pcd_num == 0) + continue; pcd = &md->pmd_classdep[n]; printf(" %s/%d/%d/0x%b", pmc_name_of_pmcclass(pcd->pcd_class), @@ -5877,7 +5891,9 @@ pmc_cleanup(void) continue; pmc_select_cpu(cpu); for (c = 0; c < md->pmd_nclass; c++) - md->pmd_classdep[c].pcd_pcpu_fini(md, cpu); + if (md->pmd_classdep[c].pcd_num > 0) + md->pmd_classdep[c].pcd_pcpu_fini(md, + cpu); if (md->pmd_pcpu_fini) md->pmd_pcpu_fini(md, cpu); }