svn commit: r360265 - in stable/12/sys: dev/hwpmc sys

[Alexander Motin]

Author: mav
Date: Fri Apr 24 15:02:05 2020
New Revision: 360265
URL: https://svnweb.freebsd.org/changeset/base/360265

Log:
  MFC r359667 (by mw): Add hwpmc support for Intel Atom Goldmont microarchitecture
  
  Recognize new micro-architecture in hwpmc_intel driver. Based on Intel
  document 325462-071US. Tested with tools/test/hwpmc/pmctest.py
  on Atom E3930 SoC.

Modified:
  stable/12/sys/dev/hwpmc/hwpmc_intel.c
  stable/12/sys/sys/pmc.h
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dev/hwpmc/hwpmc_intel.c
==============================================================================
--- stable/12/sys/dev/hwpmc/hwpmc_intel.c	Fri Apr 24 14:55:07 2020	(r360264)
+++ stable/12/sys/dev/hwpmc/hwpmc_intel.c	Fri Apr 24 15:02:05 2020	(r360265)
@@ -203,6 +203,10 @@ pmc_intel_initialize(void)
 			cputype = PMC_CPU_INTEL_ATOM_SILVERMONT;
 			nclasses = 3;
 			break;
+		case 0x5C:	/* Per Intel document 325462-071US 10/2019. */
+			cputype = PMC_CPU_INTEL_ATOM_GOLDMONT;
+			nclasses = 3;
+			break;
 		}
 		break;
 	}
@@ -230,6 +234,7 @@ pmc_intel_initialize(void)
 		 */
 	case PMC_CPU_INTEL_ATOM:
 	case PMC_CPU_INTEL_ATOM_SILVERMONT:
+	case PMC_CPU_INTEL_ATOM_GOLDMONT:
 	case PMC_CPU_INTEL_BROADWELL:
 	case PMC_CPU_INTEL_BROADWELL_XEON:
 	case PMC_CPU_INTEL_SKYLAKE_XEON:
@@ -293,6 +298,7 @@ pmc_intel_finalize(struct pmc_mdep *md)
 	switch (md->pmd_cputype) {
 	case PMC_CPU_INTEL_ATOM:
 	case PMC_CPU_INTEL_ATOM_SILVERMONT:
+	case PMC_CPU_INTEL_ATOM_GOLDMONT:
 	case PMC_CPU_INTEL_BROADWELL:
 	case PMC_CPU_INTEL_BROADWELL_XEON:
 	case PMC_CPU_INTEL_SKYLAKE_XEON:

Modified: stable/12/sys/sys/pmc.h
==============================================================================
--- stable/12/sys/sys/pmc.h	Fri Apr 24 14:55:07 2020	(r360264)
+++ stable/12/sys/sys/pmc.h	Fri Apr 24 15:02:05 2020	(r360265)
@@ -110,6 +110,7 @@ extern char pmc_cpuid[PMC_CPUID_LEN];
 	__PMC_CPU(INTEL_BROADWELL_XEON, 0x97,   "Intel Broadwell Xeon") \
 	__PMC_CPU(INTEL_SKYLAKE, 0x98,   "Intel Skylake")		\
 	__PMC_CPU(INTEL_SKYLAKE_XEON, 0x99,   "Intel Skylake Xeon")	\
+	__PMC_CPU(INTEL_ATOM_GOLDMONT, 0x9A,   "Intel Atom Goldmont")	\
 	__PMC_CPU(INTEL_XSCALE,	0x100,	"Intel XScale")		\
 	__PMC_CPU(MIPS_24K,     0x200,  "MIPS 24K")		\
 	__PMC_CPU(MIPS_OCTEON,  0x201,  "Cavium Octeon")	\