svn commit: r320115 - stable/10/sys/dev/hwpmc

[Andriy Gapon]

Author: avg
Date: Mon Jun 19 15:38:22 2017
New Revision: 320115
URL: https://svnweb.freebsd.org/changeset/base/320115

Log:
  MFC r311224: Fix PMC architecture check to handle later IPAs including Skylake

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

Modified: stable/10/sys/dev/hwpmc/hwpmc_core.c
==============================================================================
--- stable/10/sys/dev/hwpmc/hwpmc_core.c	Mon Jun 19 15:35:41 2017	(r320114)
+++ stable/10/sys/dev/hwpmc/hwpmc_core.c	Mon Jun 19 15:38:22 2017	(r320115)
@@ -2857,7 +2857,7 @@ pmc_core_initialize(struct pmc_mdep *md, int maxcpu, i
 	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",