svn commit: r305675 - in stable: 10/sys/dev/hwpmc 11/sys/dev/hwpmc 9/sys/dev/hwpmc

[John Baldwin]

Author: jhb
Date: Fri Sep  9 21:19:31 2016
New Revision: 305675
URL: https://svnweb.freebsd.org/changeset/base/305675

Log:
  MFC 303720: Apply the fix from r232612 to fixed function counters.

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

Changes in other areas also in this revision:
Modified:
  stable/10/sys/dev/hwpmc/hwpmc_core.c
  stable/11/sys/dev/hwpmc/hwpmc_core.c
Directory Properties:
  stable/10/   (props changed)
  stable/11/   (props changed)

Modified: stable/9/sys/dev/hwpmc/hwpmc_core.c
==============================================================================
--- stable/9/sys/dev/hwpmc/hwpmc_core.c	Fri Sep  9 21:00:07 2016	(r305674)
+++ stable/9/sys/dev/hwpmc/hwpmc_core.c	Fri Sep  9 21:19:31 2016	(r305675)
@@ -355,7 +355,7 @@ iaf_read_pmc(int cpu, int ri, pmc_value_
 	if (PMC_IS_SAMPLING_MODE(PMC_TO_MODE(pm)))
 		*v = iaf_perfctr_value_to_reload_count(tmp);
 	else
-		*v = tmp;
+		*v = tmp & ((1ULL << core_iaf_width) - 1);
 
 	PMCDBG(MDP,REA,1, "iaf-read cpu=%d ri=%d msr=0x%x -> v=%jx", cpu, ri,
 	    IAF_RI_TO_MSR(ri), *v);