summaryrefslogtreecommitdiffstats
path: root/sys/arm
diff options
context:
space:
mode:
authorrpaulo <rpaulo@FreeBSD.org>2009-10-02 11:10:05 +0000
committerrpaulo <rpaulo@FreeBSD.org>2009-10-02 11:10:05 +0000
commitd3d5e9896cd639a79d1b5723113258832f8bbfbc (patch)
treef540a870e93339a49a77c9063f32265f7d250b0e /sys/arm
parent707daf685f081da08b2c898e25b062476a80c0c4 (diff)
downloadFreeBSD-src-d3d5e9896cd639a79d1b5723113258832f8bbfbc.zip
FreeBSD-src-d3d5e9896cd639a79d1b5723113258832f8bbfbc.tar.gz
Remove performance counter headers. This code came from NetBSD, but our
hardware perf. counter support is different, so we don't need these files. Reviewed by: freebsd-arm (no comments)
Diffstat (limited to 'sys/arm')
-rw-r--r--sys/arm/arm/cpufunc.c29
-rw-r--r--sys/arm/xscale/xscalereg.h73
-rw-r--r--sys/arm/xscale/xscalevar.h48
3 files changed, 0 insertions, 150 deletions
diff --git a/sys/arm/arm/cpufunc.c b/sys/arm/arm/cpufunc.c
index 5832933..7389095 100644
--- a/sys/arm/arm/cpufunc.c
+++ b/sys/arm/arm/cpufunc.c
@@ -83,15 +83,6 @@ __FBSDID("$FreeBSD$");
#include <arm/xscale/ixp425/ixp425var.h>
#endif
-#if defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \
- defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342)
-#include <arm/xscale/xscalereg.h>
-#endif
-
-#if defined(PERFCTRS)
-struct arm_pmc_funcs *arm_pmc;
-#endif
-
/* PRIMARY CACHE VARIABLES */
int arm_picache_size;
int arm_picache_line_size;
@@ -1128,10 +1119,6 @@ set_cpufuncs()
: "r" (BCUCTL_E0|BCUCTL_E1|BCUCTL_EV));
cpufuncs = xscale_cpufuncs;
-#if defined(PERFCTRS)
- xscale_pmu_init();
-#endif
-
/*
* i80200 errata: Step-A0 and A1 have a bug where
* D$ dirty bits are not cleared on "invalidate by
@@ -1165,10 +1152,6 @@ set_cpufuncs()
PMNC_CC_IF));
cpufuncs = xscale_cpufuncs;
-#if defined(PERFCTRS)
- xscale_pmu_init();
-#endif
-
cpu_reset_needs_v4_MMU_disable = 1; /* XScale needs it */
get_cachetype_cp15();
pmap_pte_init_xscale();
@@ -1179,10 +1162,6 @@ set_cpufuncs()
#if defined(CPU_XSCALE_81342)
if (cputype == CPU_ID_81342) {
cpufuncs = xscalec3_cpufuncs;
-#if defined(PERFCTRS)
- xscale_pmu_init();
-#endif
-
cpu_reset_needs_v4_MMU_disable = 1; /* XScale needs it */
get_cachetype_cp15();
pmap_pte_init_xscale();
@@ -1196,10 +1175,6 @@ set_cpufuncs()
(cputype & ~CPU_ID_XSCALE_COREREV_MASK) == CPU_ID_PXA210) {
cpufuncs = xscale_cpufuncs;
-#if defined(PERFCTRS)
- xscale_pmu_init();
-#endif
-
cpu_reset_needs_v4_MMU_disable = 1; /* XScale needs it */
get_cachetype_cp15();
pmap_pte_init_xscale();
@@ -1215,10 +1190,6 @@ set_cpufuncs()
cputype == CPU_ID_IXP425_266 || cputype == CPU_ID_IXP435) {
cpufuncs = xscale_cpufuncs;
-#if defined(PERFCTRS)
- xscale_pmu_init();
-#endif
-
cpu_reset_needs_v4_MMU_disable = 1; /* XScale needs it */
get_cachetype_cp15();
pmap_pte_init_xscale();
diff --git a/sys/arm/xscale/xscalereg.h b/sys/arm/xscale/xscalereg.h
deleted file mode 100644
index 85e64d1..0000000
--- a/sys/arm/xscale/xscalereg.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* $NetBSD: xscalereg.h,v 1.2 2002/08/07 05:15:02 briggs Exp $ */
-
-/*-
- * Copyright (c) 2001 Wasabi Systems, Inc.
- * All rights reserved.
- *
- * Written by Jason R. Thorpe for Wasabi Systems, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed for the NetBSD Project by
- * Wasabi Systems, Inc.
- * 4. The name of Wasabi Systems, Inc. may not be used to endorse
- * or promote products derived from this software without specific prior
- * written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL WASABI SYSTEMS, INC
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-#ifndef _ARM_XSCALE_XSCALEREG_H_
-#define _ARM_XSCALE_XSCALEREG_H_
-
-/*
- * Register definitions for the Intel XScale processor core.
- */
-
-/*
- * Performance Monitoring Unit (CP14)
- *
- * CP14.0 Performance Monitor Control Register
- * CP14.1 Clock Counter
- * CP14.2 Performance Counter Register 0
- * CP14.3 Performance Counter Register 1
- */
-
-#define PMNC_E 0x00000001 /* enable counters */
-#define PMNC_P 0x00000002 /* reset both PMNs to 0 */
-#define PMNC_C 0x00000004 /* clock counter reset */
-#define PMNC_D 0x00000008 /* clock counter / 64 */
-#define PMNC_PMN0_IE 0x00000010 /* enable PMN0 interrupt */
-#define PMNC_PMN1_IE 0x00000020 /* enable PMN1 interrupt */
-#define PMNC_CC_IE 0x00000040 /* enable clock counter interrupt */
-#define PMNC_PMN0_IF 0x00000100 /* PMN0 overflow/interrupt */
-#define PMNC_PMN1_IF 0x00000200 /* PMN1 overflow/interrupt */
-#define PMNC_CC_IF 0x00000400 /* clock counter overflow/interrupt */
-#define PMNC_EVCNT0_MASK 0x000ff000 /* event to count for PMN0 */
-#define PMNC_EVCNT0_SHIFT 12
-#define PMNC_EVCNT1_MASK 0x0ff00000 /* event to count for PMN1 */
-#define PMNC_EVCNT1_SHIFT 20
-
-void xscale_pmu_init(void);
-
-#endif /* _ARM_XSCALE_XSCALEREG_H_ */
diff --git a/sys/arm/xscale/xscalevar.h b/sys/arm/xscale/xscalevar.h
deleted file mode 100644
index 32a510f..0000000
--- a/sys/arm/xscale/xscalevar.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* $NetBSD: xscalevar.h,v 1.1 2002/10/08 23:59:41 thorpej Exp $ */
-
-/*-
- * Copyright (c) 2002 Wasabi Systems, Inc.
- * All rights reserved.
- *
- * Written by Jason R. Thorpe for Wasabi Systems, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed for the NetBSD Project by
- * Wasabi Systems, Inc.
- * 4. The name of Wasabi Systems, Inc. may not be used to endorse
- * or promote products derived from this software without specific prior
- * written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL WASABI SYSTEMS, INC
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
- *
- */
-
-#ifndef _ARM_XSCALE_XSCALEVAR_H_
-#define _ARM_XSCALE_XSCALEVAR_H_
-
-/* Performance Monitoring Unit */
-void xscale_pmu_init(void);
-int xscale_pmc_dispatch(void *);
-
-#endif /* _ARM_XSCALE_XSCALEVAR_H_ */
OpenPOWER on IntegriCloud