From nobody Mon Jul 4 18:09:30 2022 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 865B11C3FA3C; Mon, 4 Jul 2022 18:09:33 +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 4LcDNC4F4Kz4kVV; Mon, 4 Jul 2022 18:09:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656958172; 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=G4qCZHjGnDj5NHhfoNWnj94CtkOKiCc86qISyMShAKI=; b=V+UDYNKorX7tF32sZI2IIj+WxiY5LhOXEbNCK7C3yafVSQlNaFHHnVfJmWx7tMqfFCT+jZ XNjlC85pxcnRFb3KJvbZzQ21Hdqvse04eC2nFI4z58w4BF5q4K9mgRnloVJGBfPFze0h/4 U2hyezHeX8BLi/gXXh78oj/5uhHb6zdiTH26U0kwkjWtHWNjqaB2t3a/+UpLUS9loxY1BX GxGC+Hmo/tORck9JiVjDGoz+YuR0F9EkQk1XbcjUIs1nWby1IHMzL9F4EB7zBpcBWUSLNq ltUcgNC1ar1Kw0B7mnlzmN2EJH6yFV4/JduZY5Zc5Bvg4XcBsvO+CPH0PpjQ/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 EDEF616096; Mon, 4 Jul 2022 18:09:30 +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 264I9UaY064583; Mon, 4 Jul 2022 18:09:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 264I9UM7064582; Mon, 4 Jul 2022 18:09:30 GMT (envelope-from git) Date: Mon, 4 Jul 2022 18:09:30 GMT Message-Id: <202207041809.264I9UM7064582@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: 56294dd6b124 - stable/13 - hwpmc: Add IDs for few more Intel Atom CPUs. 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 56294dd6b1248e516979e5ea2fbaf5794d4cecaf Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656958172; 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=G4qCZHjGnDj5NHhfoNWnj94CtkOKiCc86qISyMShAKI=; b=WaSEV1ths7WNooGJ/knwcRuJG+piAU9XW0Qzz6NbqUj1VGkARF2hN58mwTrqdl8HSRAkpf qzFzbgrfR1o+kDavl25Q5dpyyf6UkLSVpYzjALNnqmfm5Y1dKxhcDl3oKQPbI7JA2gRYut w1GNZx/ktDn8e3JUZ2DMLhRCcYGyU8FHYF7MYLzzGWQeQGbFUGbXEyW5xVoYWsg8JQW3RN sA7utFBu7POnBULPTDmxIVN2j2UeRTvWl6TxLHkLcaRVL5t7lYAg7WuLn2wfVSjDxmT91n KAm06fLcJeWok77xZqaullFW1y5mXiHjinfCnowHglGbV9iIKENkzAa0LGEd+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656958172; a=rsa-sha256; cv=none; b=GGR9E/bh8Wz+PFnfmudZg+GaZj/Is6ue5nP08F8Fr0+4jmjOCxouBP8T4BEqIePvKoeEiH eg3rarpcbqoR6JYVvy92Vw/oYFV1zBeXZfu7O0F5yn9tNPLcdFs8EKeUXBKZTTCxGykD4d ChbLHLcGODqRzuNHYNpYjOd+MhWGRx9Z0+0T/kkETANe+/rANWqzLWglVx3Me3Q1knHadP +enqi/kYqW3cH1Il5w6xW2G5IVLn99ReJzM8BBzTgxobgr7wA/5Rlw5XdOVmxObLxNs4NY e8cPiZPw3DIMjm+RDjcAEacKjN7JeasesxNt/sLn7Rgjj4LmDUmyNy3HWjrm6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=56294dd6b1248e516979e5ea2fbaf5794d4cecaf commit 56294dd6b1248e516979e5ea2fbaf5794d4cecaf Author: Alexander Motin AuthorDate: 2022-06-03 02:55:42 +0000 Commit: Alexander Motin CommitDate: 2022-07-04 17:48:10 +0000 hwpmc: Add IDs for few more Intel Atom CPUs. MFC after: 1 month (cherry picked from commit 1326017849ee0536e415d69f150514d410b588ff) --- sys/dev/hwpmc/hwpmc_core.c | 2 ++ sys/dev/hwpmc/hwpmc_intel.c | 21 +++++++++++++++++---- sys/sys/pmc.h | 2 ++ 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/sys/dev/hwpmc/hwpmc_core.c b/sys/dev/hwpmc/hwpmc_core.c index 22e6adbd778d..7c2a5bcd2a1b 100644 --- a/sys/dev/hwpmc/hwpmc_core.c +++ b/sys/dev/hwpmc/hwpmc_core.c @@ -781,6 +781,8 @@ iap_allocate_pmc(int cpu, int ri, struct pmc *pm, case PMC_CPU_INTEL_ATOM: case PMC_CPU_INTEL_ATOM_SILVERMONT: case PMC_CPU_INTEL_ATOM_GOLDMONT: + case PMC_CPU_INTEL_ATOM_GOLDMONT_P: + case PMC_CPU_INTEL_ATOM_TREMONT: case PMC_CPU_INTEL_SKYLAKE: case PMC_CPU_INTEL_SKYLAKE_XEON: case PMC_CPU_INTEL_ICELAKE: diff --git a/sys/dev/hwpmc/hwpmc_intel.c b/sys/dev/hwpmc/hwpmc_intel.c index f59b7b41ece9..894f9c07b622 100644 --- a/sys/dev/hwpmc/hwpmc_intel.c +++ b/sys/dev/hwpmc/hwpmc_intel.c @@ -118,10 +118,6 @@ pmc_intel_initialize(void) cputype = PMC_CPU_INTEL_CORE2EXTREME; nclasses = 3; break; - case 0x1C: /* Per Intel document 320047-002. */ - cputype = PMC_CPU_INTEL_ATOM; - nclasses = 3; - break; case 0x1A: case 0x1E: /* * Per Intel document 253669-032 9/2009, @@ -221,6 +217,14 @@ pmc_intel_initialize(void) cputype = PMC_CPU_INTEL_ALDERLAKE; nclasses = 3; break; + case 0x1C: /* Per Intel document 320047-002. */ + case 0x26: + case 0x27: + case 0x35: + case 0x36: + cputype = PMC_CPU_INTEL_ATOM; + nclasses = 3; + break; case 0x37: case 0x4A: case 0x4D: /* Per Intel document 330061-001 01/2014. */ @@ -234,6 +238,15 @@ pmc_intel_initialize(void) cputype = PMC_CPU_INTEL_ATOM_GOLDMONT; nclasses = 3; break; + case 0x7A: + cputype = PMC_CPU_INTEL_ATOM_GOLDMONT_P; + nclasses = 3; + break; + case 0x86: + case 0x96: + cputype = PMC_CPU_INTEL_ATOM_TREMONT; + nclasses = 3; + break; } break; } diff --git a/sys/sys/pmc.h b/sys/sys/pmc.h index 95107771694a..662c3f095304 100644 --- a/sys/sys/pmc.h +++ b/sys/sys/pmc.h @@ -114,6 +114,8 @@ extern char pmc_cpuid[PMC_CPUID_LEN]; __PMC_CPU(INTEL_ICELAKE, 0x9B, "Intel Icelake") \ __PMC_CPU(INTEL_ICELAKE_XEON, 0x9C, "Intel Icelake Xeon") \ __PMC_CPU(INTEL_ALDERLAKE, 0x9D, "Intel Alderlake") \ + __PMC_CPU(INTEL_ATOM_GOLDMONT_P, 0x9E, "Intel Atom Goldmont Plus") \ + __PMC_CPU(INTEL_ATOM_TREMONT, 0x9F, "Intel Atom Tremont") \ __PMC_CPU(INTEL_XSCALE, 0x100, "Intel XScale") \ __PMC_CPU(MIPS_24K, 0x200, "MIPS 24K") \ __PMC_CPU(MIPS_OCTEON, 0x201, "Cavium Octeon") \