From nobody Fri Jun 03 02:57:05 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 5270A1B53BC0; Fri, 3 Jun 2022 02:57:06 +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 4LDnbk1gBPz3rHJ; Fri, 3 Jun 2022 02:57:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654225026; 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=ayyIXXBNXuxt/ao0ZpMYE1nWmBgONRZ+EZYa4rVInEo=; b=q02S4/BFUDccpKuTKxw7+R4iFTBa8t13HVIPbfHWneP7FivZlLwUy3VK4MPJjp3XL5PlM/ lX7zpn7hBXJKmiko0W59ky2+g06KHhV+Idkhw/UFG1tVqpSO13Q5Yp6nsaVPnwebdTPDBE tXgDA8nJjuT1l+YojHq2KZAm3y0OefQ/4vX8awvCN/s8yI2ZiFMaldtucuKPiRk+Dnfdz0 OdRgUXcYOMGKgZ8moUbnQjNIIztfCZ7grgvhFU9le8ADuhKFiaw8YhGhw6IlQD8mnBs5Qu Awaix5EY5GgsxB9IXD6Mdgh+kI7NQKrk1IA67UxWlG2sQ4eM0wq7iMWzy76JMg== 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 0DD3220E34; Fri, 3 Jun 2022 02:57:06 +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 2532v5Ol086828; Fri, 3 Jun 2022 02:57:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2532v524086827; Fri, 3 Jun 2022 02:57:05 GMT (envelope-from git) Date: Fri, 3 Jun 2022 02:57:05 GMT Message-Id: <202206030257.2532v524086827@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: 1326017849ee - main - hwpmc: Add IDs for few more Intel Atom CPUs. 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: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1326017849ee0536e415d69f150514d410b588ff Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654225026; 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=ayyIXXBNXuxt/ao0ZpMYE1nWmBgONRZ+EZYa4rVInEo=; b=AB7x4+vA086ywoT8d7mdMpAPTI3RYA8Sm7xeq2noUzKDeoeUYW6UXQZ3bGqK0p3IlLqU3H BwPdL8JKQO3vjiVOWCvKODJpRh7ljXl30ucQzP0ihD4QRtY3ZjyeyziG+FQsLPhZwRxO9t uW4s5oCqHZsR8mySXEPmjm4W26w6in3aHdCd0tmu+jYSK8uR9eTo07bz3G0Uyqxc10BmKk gfCzx50FHmC2ny8+OW97zngQoyGsN/fQp7uJbczR2XC4hkXWXnBqRMgOTtklNS7kz34rny 8MDv0JZBPKZ2hvhnE2Mb+bUbPbA0QuvDqiDMEfXuEtikjaUjPJX4WnqORa83nw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654225026; a=rsa-sha256; cv=none; b=Y1pkskZSHeP1TeSRrJDuUS0GpHJPJecy38KsqIuMjOXoMu5qweMIt5HY11DOWxoa/DCIhQ dpYnvSL25UFpy5Kk9vae2fvv5p15xqacw3cVornvSBlGexpJdLz2VtkaMsG8RiAR2ixWbp F1tDa+Rv4lZ+NooaF67cx1D7auKNJQk/uHrKhaAzvf3ZfDwVa0G/rwCIn5Z7RYbuoYh6Ry 6h9rl8aMozJdkE3pCoFNMTiGAphdJefw7+tPuQ5VOxBtKw/0y9lJfgB2XtdyUCy29QOp8c 52pFxgyAA6+vtNP1SNiXk0saq/nYW7skTilzfsL171x8Y8i50U7ZNgh3fdmcFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=1326017849ee0536e415d69f150514d410b588ff commit 1326017849ee0536e415d69f150514d410b588ff Author: Alexander Motin AuthorDate: 2022-06-03 02:55:42 +0000 Commit: Alexander Motin CommitDate: 2022-06-03 02:55:42 +0000 hwpmc: Add IDs for few more Intel Atom CPUs. MFC after: 1 month --- 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 5d6ca02ea792..8575abdea214 100644 --- a/sys/dev/hwpmc/hwpmc_core.c +++ b/sys/dev/hwpmc/hwpmc_core.c @@ -777,6 +777,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 b84044ea5c6c..372e77ecdee7 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") \