svn commit: r311960 - stable/11/sys/dev/hwpmc

[George V. Neville-Neil]

Author: gnn
Date: Thu Jan 12 03:34:29 2017
New Revision: 311960
URL: https://svnweb.freebsd.org/changeset/base/311960

Log:
  MFC 311224
  
  Fix PMC architecture check to handle later IPAs including Skylake
  Tested with tools/test/hwpmc/pmctest.py
  
  Obtained from:	Oliver Pinter

Modified:
  stable/11/sys/dev/hwpmc/hwpmc_core.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/dev/hwpmc/hwpmc_core.c
==============================================================================
--- stable/11/sys/dev/hwpmc/hwpmc_core.c	Thu Jan 12 01:20:51 2017	(r311959)
+++ stable/11/sys/dev/hwpmc/hwpmc_core.c	Thu Jan 12 03:34:29 2017	(r311960)
@@ -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",