svn commit: r311224 - head/sys/dev/hwpmc

George V. Neville-Neil gnn at FreeBSD.org
Wed Jan 4 02:15:04 UTC 2017


Author: gnn
Date: Wed Jan  4 02:15:03 2017
New Revision: 311224
URL: https://svnweb.freebsd.org/changeset/base/311224

Log:
  Fix PMC architecture check to handle later IPAs including Skylake
  Tested with tools/test/hwpmc/pmctest.py
  
  Obtained from:	Oliver Pinter
  MFC after:	1 week
  Differential Revision:	https://reviews.freebsd.org/D9036

Modified:
  head/sys/dev/hwpmc/hwpmc_core.c

Modified: head/sys/dev/hwpmc/hwpmc_core.c
==============================================================================
--- head/sys/dev/hwpmc/hwpmc_core.c	Wed Jan  4 01:58:38 2017	(r311223)
+++ head/sys/dev/hwpmc/hwpmc_core.c	Wed Jan  4 02:15:03 2017	(r311224)
@@ -2857,7 +2857,7 @@ pmc_core_initialize(struct pmc_mdep *md,
 	PMCDBG3(MDP,INI,1,"core-init cputype=%d ncpu=%d ipa-version=%d",
 	    core_cputype, maxcpu, ipa_version);
 
-	if (ipa_version < 1 || ipa_version > 3 ||
+	if (ipa_version < 1 || ipa_version > 4 ||
 	    (core_cputype != PMC_CPU_INTEL_CORE && ipa_version == 1)) {
 		/* Unknown PMC architecture. */
 		printf("hwpc_core: unknown PMC architecture: %d\n",


More information about the svn-src-all mailing list