Page MenuHomeFreeBSD
Files F175185658

D45958.diff
No OneTemporary
Actions

D45958.diff
View Options

diff --git a/sys/arm/arm/cpufunc.c b/sys/arm/arm/cpufunc.c
--- a/sys/arm/arm/cpufunc.c
+++ b/sys/arm/arm/cpufunc.c
@@ -67,9 +67,6 @@
#ifdef CPU_MV_PJ4B
static void pj4bv7_setup(void);
#endif
-#if defined(CPU_ARM1176)
-static void arm11x6_setup(void);
-#endif
#if defined(CPU_CORTEXA) || defined(CPU_KRAIT)
static void cortexa_setup(void);
#endif
@@ -91,22 +88,6 @@
};
#endif /* CPU_MV_PJ4B */
-#if defined(CPU_ARM1176)
-struct cpu_functions arm1176_cpufuncs = {
- /* Cache operations */
- .cf_l2cache_wbinv_all = (void *)cpufunc_nullop,
- .cf_l2cache_wbinv_range = (void *)cpufunc_nullop,
- .cf_l2cache_inv_range = (void *)cpufunc_nullop,
- .cf_l2cache_wb_range = (void *)cpufunc_nullop,
- .cf_l2cache_drain_writebuf = (void *)cpufunc_nullop,
-
- /* Other functions */
- .cf_sleep = arm11x6_sleep,
-
- /* Soft functions */
- .cf_setup = arm11x6_setup
-};
-#endif /*CPU_ARM1176 */
#if defined(CPU_CORTEXA) || defined(CPU_KRAIT)
struct cpu_functions cortexa_cpufuncs = {
@@ -210,13 +191,6 @@
cputype = cp15_midr_get();
cputype &= CPU_ID_CPU_MASK;
-#if defined(CPU_ARM1176)
- if (cputype == CPU_ID_ARM1176JZS) {
- cpufuncs = arm1176_cpufuncs;
- get_cachetype_cp15();
- goto out;
- }
-#endif /* CPU_ARM1176 */
#if defined(CPU_CORTEXA) || defined(CPU_KRAIT)
switch(cputype & CPU_ID_SCHEME_MASK) {
case CPU_ID_CORTEXA5:
@@ -262,9 +236,7 @@
*/
-#if defined(CPU_ARM1176) \
- || defined(CPU_MV_PJ4B) \
- || defined(CPU_CORTEXA) || defined(CPU_KRAIT)
+#if defined(CPU_MV_PJ4B) || defined(CPU_CORTEXA) || defined(CPU_KRAIT)
static __inline void
cpu_scc_setup_ccnt(void)
{
@@ -277,10 +249,6 @@
/* Set PMUSERENR[0] to allow userland access */
cp15_pmuserenr_set(1);
#endif
-#if defined(CPU_ARM1176)
- /* Set PMCR[2,0] to enable counters and reset CCNT */
- cp15_pmcr_set(5);
-#else
/* Set up the PMCCNTR register as a cyclecounter:
* Set PMINTENCLR to 0xFFFFFFFF to block interrupts
* Set PMCR[2,0] to enable counters and reset CCNT
@@ -288,41 +256,9 @@
cp15_pminten_clr(0xFFFFFFFF);
cp15_pmcr_set(5);
cp15_pmcnten_set(0x80000000);
-#endif
}
#endif
-#if defined(CPU_ARM1176)
-static void
-arm11x6_setup(void)
-{
- uint32_t auxctrl, auxctrl_wax;
- uint32_t tmp, tmp2;
- uint32_t cpuid;
-
- cpuid = cp15_midr_get();
-
- auxctrl = 0;
- auxctrl_wax = ~0;
-
- /*
- * Enable an errata workaround
- */
- if ((cpuid & CPU_ID_CPU_MASK) == CPU_ID_ARM1176JZS) { /* ARM1176JZSr0 */
- auxctrl = ARM1176_AUXCTL_PHD;
- auxctrl_wax = ~ARM1176_AUXCTL_PHD;
- }
-
- tmp = cp15_actlr_get();
- tmp2 = tmp;
- tmp &= auxctrl_wax;
- tmp |= auxctrl;
- if (tmp != tmp2)
- cp15_actlr_set(tmp);
-
- cpu_scc_setup_ccnt();
-}
-#endif /* CPU_ARM1176 */
#ifdef CPU_MV_PJ4B
static void
diff --git a/sys/arm/include/cpufunc.h b/sys/arm/include/cpufunc.h
--- a/sys/arm/include/cpufunc.h
+++ b/sys/arm/include/cpufunc.h
@@ -97,9 +97,6 @@
void pj4b_config (void);
#endif
-#if defined(CPU_ARM1176)
-void arm11x6_sleep (int); /* no ref. for errata */
-#endif
/*

File Metadata

Mime Type
text/plain
Expires
Fri, Oct 9, 10:48 PM (11 h, 48 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
40510251
Default Alt Text
D45958.diff (2 KB)

Event Timeline