Author: mmel
Date: Sun Jan 31 15:36:13 2016
New Revision: 295095
URL: https://svnweb.freebsd.org/changeset/base/295095
Log:
ARM: Next round of cpufunc.* cleaning. Nobody uses flush_brnchtgt* functions,
delete them.
Modified:
head/sys/arm/arm/cpufunc.c
head/sys/arm/arm/cpufunc_asm_fa526.S
head/sys/arm/include/cpufunc.h
Modified: head/sys/arm/arm/cpufunc.c
==============================================================================
--- head/sys/arm/arm/cpufunc.c Sun Jan 31 15:18:03 2016 (r295094)
+++ head/sys/arm/arm/cpufunc.c Sun Jan 31 15:36:13 2016 (r295095)
@@ -148,8 +148,6 @@ struct cpu_functions arm9_cpufuncs = {
cpufunc_nullop, /* flush_prefetchbuf */
armv4_drain_writebuf, /* drain_writebuf */
- cpufunc_nullop, /* flush_brnchtgt_C */
- (void *)cpufunc_nullop, /* flush_brnchtgt_E */
(void *)cpufunc_nullop, /* sleep */
@@ -210,8 +208,6 @@ struct cpu_functions armv5_ec_cpufuncs =
cpufunc_nullop, /* flush_prefetchbuf */
armv4_drain_writebuf, /* drain_writebuf */
- cpufunc_nullop, /* flush_brnchtgt_C */
- (void *)cpufunc_nullop, /* flush_brnchtgt_E */
(void *)cpufunc_nullop, /* sleep */
@@ -270,8 +266,6 @@ struct cpu_functions sheeva_cpufuncs = {
cpufunc_nullop, /* flush_prefetchbuf */
armv4_drain_writebuf, /* drain_writebuf */
- cpufunc_nullop, /* flush_brnchtgt_C */
- (void *)cpufunc_nullop, /* flush_brnchtgt_E */
sheeva_cpu_sleep, /* sleep */
@@ -330,8 +324,6 @@ struct cpu_functions pj4bv7_cpufuncs = {
cpufunc_nullop, /* flush_prefetchbuf */
armv7_drain_writebuf, /* drain_writebuf */
- cpufunc_nullop, /* flush_brnchtgt_C */
- (void *)cpufunc_nullop, /* flush_brnchtgt_E */
(void *)cpufunc_nullop, /* sleep */
@@ -392,8 +384,6 @@ struct cpu_functions xscale_cpufuncs = {
cpufunc_nullop, /* flush_prefetchbuf */
armv4_drain_writebuf, /* drain_writebuf */
- cpufunc_nullop, /* flush_brnchtgt_C */
- (void *)cpufunc_nullop, /* flush_brnchtgt_E */
xscale_cpu_sleep, /* sleep */
@@ -454,8 +444,6 @@ struct cpu_functions xscalec3_cpufuncs =
cpufunc_nullop, /* flush_prefetchbuf */
armv4_drain_writebuf, /* drain_writebuf */
- cpufunc_nullop, /* flush_brnchtgt_C */
- (void *)cpufunc_nullop, /* flush_brnchtgt_E */
xscale_cpu_sleep, /* sleep */
@@ -515,8 +503,6 @@ struct cpu_functions fa526_cpufuncs = {
fa526_flush_prefetchbuf, /* flush_prefetchbuf */
armv4_drain_writebuf, /* drain_writebuf */
- cpufunc_nullop, /* flush_brnchtgt_C */
- fa526_flush_brnchtgt_E, /* flush_brnchtgt_E */
fa526_cpu_sleep, /* sleep */
@@ -577,8 +563,6 @@ struct cpu_functions arm1176_cpufuncs =
arm11x6_flush_prefetchbuf, /* flush_prefetchbuf */
arm11_drain_writebuf, /* drain_writebuf */
- cpufunc_nullop, /* flush_brnchtgt_C */
- (void *)cpufunc_nullop, /* flush_brnchtgt_E */
arm11x6_sleep, /* sleep */
@@ -646,8 +630,6 @@ struct cpu_functions cortexa_cpufuncs =
cpufunc_nullop, /* flush_prefetchbuf */
armv7_drain_writebuf, /* drain_writebuf */
- cpufunc_nullop, /* flush_brnchtgt_C */
- (void *)cpufunc_nullop, /* flush_brnchtgt_E */
armv7_cpu_sleep, /* sleep */
Modified: head/sys/arm/arm/cpufunc_asm_fa526.S
==============================================================================
--- head/sys/arm/arm/cpufunc_asm_fa526.S Sun Jan 31 15:18:03 2016
(r295094)
+++ head/sys/arm/arm/cpufunc_asm_fa526.S Sun Jan 31 15:36:13 2016
(r295095)
@@ -200,12 +200,6 @@ ENTRY(fa526_icache_sync_range)
mov pc, lr
END(fa526_icache_sync_range)
-ENTRY(fa526_flush_brnchtgt_E)
- mov r0, #0
- mcr p15, 0, r0, c7, c5, 6 /* invalidate BTB cache */
- mov pc, lr
-END(fa526_flush_brnchtgt_E)
-
ENTRY(fa526_context_switch)
/*
* CF_CACHE_PURGE_ID will *ALWAYS* be called prior to this.
Modified: head/sys/arm/include/cpufunc.h
==============================================================================
--- head/sys/arm/include/cpufunc.h Sun Jan 31 15:18:03 2016
(r295094)
+++ head/sys/arm/include/cpufunc.h Sun Jan 31 15:36:13 2016
(r295095)
@@ -157,8 +157,6 @@ struct cpu_functions {
void (*cf_flush_prefetchbuf) (void);
void (*cf_drain_writebuf) (void);
- void (*cf_flush_brnchtgt_C) (void);
- void (*cf_flush_brnchtgt_E) (u_int va);
void (*cf_sleep) (int mode);
@@ -207,9 +205,6 @@ extern u_int cputype;
#define cpu_flush_prefetchbuf() cpufuncs.cf_flush_prefetchbuf()
#define cpu_drain_writebuf() cpufuncs.cf_drain_writebuf()
-#define cpu_flush_brnchtgt_C() cpufuncs.cf_flush_brnchtgt_C()
-#define cpu_flush_brnchtgt_E(e) cpufuncs.cf_flush_brnchtgt_E(e)
-
#define cpu_sleep(m) cpufuncs.cf_sleep(m)
#define cpu_setup() cpufuncs.cf_setup()
@@ -235,7 +230,6 @@ void fa526_cpu_sleep (int);
void fa526_tlb_flushI_SE (u_int);
void fa526_tlb_flushID_SE (u_int);
void fa526_flush_prefetchbuf (void);
-void fa526_flush_brnchtgt_E (u_int);
void fa526_icache_sync_all (void);
void fa526_icache_sync_range(vm_offset_t start, vm_size_t end);
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
