svn commit: r197733 - in head/sys/arm: arm xscale/i80321

[Rui Paulo]

Author: rpaulo
Date: Sat Oct  3 13:59:15 2009
New Revision: 197733
URL: http://svn.freebsd.org/changeset/base/197733

Log:
  Remove remaining bits of performance counter support.
  
  Submitted by:	Tom Judge <tom at tomjudge.com>

Modified:
  head/sys/arm/arm/cpufunc.c
  head/sys/arm/xscale/i80321/i80321_timer.c

Modified: head/sys/arm/arm/cpufunc.c
==============================================================================
--- head/sys/arm/arm/cpufunc.c	Sat Oct  3 13:17:21 2009	(r197732)
+++ head/sys/arm/arm/cpufunc.c	Sat Oct  3 13:59:15 2009	(r197733)
@@ -1088,18 +1088,6 @@ set_cpufuncs()
 
 		i80200_icu_init();
 
-		/*
-		 * Reset the Performance Monitoring Unit to a
-		 * pristine state:
-		 *	- CCNT, PMN0, PMN1 reset to 0
-		 *	- overflow indications cleared
-		 *	- all counters disabled
-		 */
-		__asm __volatile("mcr p14, 0, %0, c0, c0, 0"
-			:
-			: "r" (PMNC_P|PMNC_C|PMNC_PMN0_IF|PMNC_PMN1_IF|
-			       PMNC_CC_IF));
-
 #if defined(XSCALE_CCLKCFG)
 		/*
 		 * Crank CCLKCFG to maximum legal value.
@@ -1139,18 +1127,6 @@ set_cpufuncs()
 	if (cputype == CPU_ID_80321_400 || cputype == CPU_ID_80321_600 ||
 	    cputype == CPU_ID_80321_400_B0 || cputype == CPU_ID_80321_600_B0 ||
 	    cputype == CPU_ID_80219_400 || cputype == CPU_ID_80219_600) {
-		/*
-		 * Reset the Performance Monitoring Unit to a
-		 * pristine state:
-		 *	- CCNT, PMN0, PMN1 reset to 0
-		 *	- overflow indications cleared
-		 *	- all counters disabled
-		 */
-		__asm __volatile("mcr p14, 0, %0, c0, c0, 0"
-			:
-			: "r" (PMNC_P|PMNC_C|PMNC_PMN0_IF|PMNC_PMN1_IF|
-			       PMNC_CC_IF));
-
 		cpufuncs = xscale_cpufuncs;
 		cpu_reset_needs_v4_MMU_disable = 1;	/* XScale needs it */
 		get_cachetype_cp15();

Modified: head/sys/arm/xscale/i80321/i80321_timer.c
==============================================================================
--- head/sys/arm/xscale/i80321/i80321_timer.c	Sat Oct  3 13:17:21 2009	(r197732)
+++ head/sys/arm/xscale/i80321/i80321_timer.c	Sat Oct  3 13:59:15 2009	(r197733)
@@ -66,8 +66,6 @@ __FBSDID("$FreeBSD$");
 			       definitions overrides the ones from i80321reg.h
 			       */
 #endif
-#include <arm/xscale/xscalevar.h>
-
 #include "opt_timer.h"
 
 void (*i80321_hardclock_hook)(void) = NULL;