Module Name: src
Committed By: matt
Date: Wed Jun 12 01:16:48 UTC 2013
Modified Files:
src/sys/arch/arm/arm: cpufunc.c
src/sys/arch/arm/arm32: cpu.c
src/sys/arch/arm/include: cpufunc.h
Log Message:
Nuke cpu_pfr, just use the armreg_pfr?_read inlines
To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.122 src/sys/arch/arm/arm/cpufunc.c
cvs rdiff -u -r1.95 -r1.96 src/sys/arch/arm/arm32/cpu.c
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/arm/include/cpufunc.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm/cpufunc.c
diff -u src/sys/arch/arm/arm/cpufunc.c:1.121 src/sys/arch/arm/arm/cpufunc.c:1.122
--- src/sys/arch/arm/arm/cpufunc.c:1.121 Wed Jun 12 00:35:34 2013
+++ src/sys/arch/arm/arm/cpufunc.c Wed Jun 12 01:16:48 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc.c,v 1.121 2013/06/12 00:35:34 matt Exp $ */
+/* $NetBSD: cpufunc.c,v 1.122 2013/06/12 01:16:48 matt Exp $ */
/*
* arm7tdmi support code Copyright (c) 2001 John Fremlin
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.121 2013/06/12 00:35:34 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.122 2013/06/12 01:16:48 matt Exp $");
#include "opt_compat_netbsd.h"
#include "opt_cpuoptions.h"
@@ -2080,7 +2080,7 @@ set_cpufuncs(void)
cputype == CPU_ID_MV88SV584X_V7 ||
cputype == CPU_ID_ARM_88SV581X_V6 ||
cputype == CPU_ID_ARM_88SV581X_V7) &&
- (cpu_pfr(0) & ARM_PFR0_THUMBEE_MASK)) {
+ (armreg_pfr0_read() & ARM_PFR0_THUMBEE_MASK)) {
cpufuncs = pj4bv7_cpufuncs;
get_cachetype_cp15();
pmap_pte_init_armv7();
Index: src/sys/arch/arm/arm32/cpu.c
diff -u src/sys/arch/arm/arm32/cpu.c:1.95 src/sys/arch/arm/arm32/cpu.c:1.96
--- src/sys/arch/arm/arm32/cpu.c:1.95 Wed Jun 12 00:44:39 2013
+++ src/sys/arch/arm/arm32/cpu.c Wed Jun 12 01:16:48 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.95 2013/06/12 00:44:39 matt Exp $ */
+/* $NetBSD: cpu.c,v 1.96 2013/06/12 01:16:48 matt Exp $ */
/*
* Copyright (c) 1995 Mark Brinicombe.
@@ -46,7 +46,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.95 2013/06/12 00:44:39 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.96 2013/06/12 01:16:48 matt Exp $");
#include <sys/systm.h>
#include <sys/conf.h>
@@ -74,7 +74,6 @@ uint32_t arm_cpu_marker __cacheline_alig
void identify_arm_cpu(device_t dv, struct cpu_info *);
void identify_cortex_caches(device_t dv);
void identify_features(device_t dv);
-u_int cpu_pfr(int num);
/*
* Identify the master (boot) CPU
@@ -579,26 +578,6 @@ print_cache_info(device_t dv, struct arm
}
}
-u_int
-cpu_pfr(int num)
-{
- u_int feat;
-
- switch (num) {
- case 0: feat = armreg_pfr0_read();
- break;
- case 1: feat = armreg_pfr1_read();
- break;
- default:
- panic("Processor Feature Register %d not implemented", num);
- break;
- }
-
- return (feat);
-}
-
-
-
void
identify_arm_cpu(device_t dv, struct cpu_info *ci)
{
Index: src/sys/arch/arm/include/cpufunc.h
diff -u src/sys/arch/arm/include/cpufunc.h:1.63 src/sys/arch/arm/include/cpufunc.h:1.64
--- src/sys/arch/arm/include/cpufunc.h:1.63 Sun May 19 15:51:10 2013
+++ src/sys/arch/arm/include/cpufunc.h Wed Jun 12 01:16:48 2013
@@ -221,8 +221,6 @@ void cpufunc_domains (u_int);
u_int cpufunc_faultstatus (void);
u_int cpufunc_faultaddress (void);
-u_int cpu_pfr (int);
-
#if defined(CPU_ARM2) || defined(CPU_ARM250) || defined(CPU_ARM3)
void arm3_cache_flush (void);
#endif /* CPU_ARM2 || CPU_ARM250 || CPU_ARM3 */
