svn commit: r295145 - in head/sys/arm: arm include

[Michal Meloun]

Author: mmel
Date: Tue Feb  2 10:50:32 2016
New Revision: 295145
URL: https://svnweb.freebsd.org/changeset/base/295145

Log:
  ARM: Remove last unused function, cpu_flush_prefetchbuf(),
  from cpu_functions table.

Modified:
  head/sys/arm/arm/cpufunc.c
  head/sys/arm/arm/cpufunc_asm_arm11x6.S
  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	Tue Feb  2 10:39:18 2016	(r295144)
+++ head/sys/arm/arm/cpufunc.c	Tue Feb  2 10:50:32 2016	(r295145)
@@ -140,7 +140,6 @@ struct cpu_functions arm9_cpufuncs = {
 
 	/* Other functions */
 
-	cpufunc_nullop,			/* flush_prefetchbuf	*/
 	armv4_drain_writebuf,		/* drain_writebuf	*/
 
 	(void *)cpufunc_nullop,		/* sleep		*/
@@ -194,7 +193,6 @@ struct cpu_functions armv5_ec_cpufuncs =
 
 	/* Other functions */
 
-	cpufunc_nullop,			/* flush_prefetchbuf	*/
 	armv4_drain_writebuf,		/* drain_writebuf	*/
 
 	(void *)cpufunc_nullop,		/* sleep		*/
@@ -246,7 +244,6 @@ struct cpu_functions sheeva_cpufuncs = {
 
 	/* Other functions */
 
-	cpufunc_nullop,			/* flush_prefetchbuf	*/
 	armv4_drain_writebuf,		/* drain_writebuf	*/
 
 	sheeva_cpu_sleep,		/* sleep		*/
@@ -298,7 +295,6 @@ struct cpu_functions pj4bv7_cpufuncs = {
 
 	/* Other functions */
 
-	cpufunc_nullop,			/* flush_prefetchbuf	*/
 	armv7_drain_writebuf,		/* drain_writebuf	*/
 
 	(void *)cpufunc_nullop,		/* sleep		*/
@@ -352,7 +348,6 @@ struct cpu_functions xscale_cpufuncs = {
 
 	/* Other functions */
 
-	cpufunc_nullop,			/* flush_prefetchbuf	*/
 	armv4_drain_writebuf,		/* drain_writebuf	*/
 
 	xscale_cpu_sleep,		/* sleep		*/
@@ -406,7 +401,6 @@ struct cpu_functions xscalec3_cpufuncs =
 
 	/* Other functions */
 
-	cpufunc_nullop,			/* flush_prefetchbuf	*/
 	armv4_drain_writebuf,		/* drain_writebuf	*/
 
 	xscale_cpu_sleep,		/* sleep		*/
@@ -459,7 +453,6 @@ struct cpu_functions fa526_cpufuncs = {
 
 	/* Other functions */
 
-	fa526_flush_prefetchbuf,	/* flush_prefetchbuf	*/
 	armv4_drain_writebuf,		/* drain_writebuf	*/
 
 	fa526_cpu_sleep,		/* sleep		*/
@@ -513,7 +506,6 @@ struct cpu_functions arm1176_cpufuncs = 
 
 	/* Other functions */
 
-	arm11x6_flush_prefetchbuf,      /* flush_prefetchbuf    */
 	arm11_drain_writebuf,           /* drain_writebuf       */
 
 	arm11x6_sleep,                  /* sleep                */
@@ -574,7 +566,6 @@ struct cpu_functions cortexa_cpufuncs = 
 
 	/* Other functions */
 
-	cpufunc_nullop,                 /* flush_prefetchbuf    */
 	armv7_drain_writebuf,           /* drain_writebuf       */
 
 	armv7_cpu_sleep,                /* sleep                */

Modified: head/sys/arm/arm/cpufunc_asm_arm11x6.S
==============================================================================
--- head/sys/arm/arm/cpufunc_asm_arm11x6.S	Tue Feb  2 10:39:18 2016	(r295144)
+++ head/sys/arm/arm/cpufunc_asm_arm11x6.S	Tue Feb  2 10:50:32 2016	(r295145)
@@ -138,11 +138,6 @@ ENTRY_NP(arm11x6_icache_sync_all)
 	RET
 END(arm11x6_icache_sync_all)
 
-ENTRY_NP(arm11x6_flush_prefetchbuf)
-	mcr	p15, 0, r0, c7, c5, 4	/* Flush Prefetch Buffer */
-	RET
-END(arm11x6_flush_prefetchbuf)
-
 ENTRY_NP(arm11x6_icache_sync_range)
 	add	r1, r1, r0
 	sub	r1, r1, #1

Modified: head/sys/arm/arm/cpufunc_asm_fa526.S
==============================================================================
--- head/sys/arm/arm/cpufunc_asm_fa526.S	Tue Feb  2 10:39:18 2016	(r295144)
+++ head/sys/arm/arm/cpufunc_asm_fa526.S	Tue Feb  2 10:50:32 2016	(r295145)
@@ -72,12 +72,6 @@ ENTRY(fa526_cpu_sleep)
 	mov	pc, lr
 END(fa526_cpu_sleep)
 
-ENTRY(fa526_flush_prefetchbuf)
-	mov	r0, #0
-	mcr	p15, 0, r0, c7, c5, 4	/* Pre-fetch flush */
-	mov	pc, lr
-END(fa526_flush_prefetchbuf)
-
 /*
  * Cache functions
  */

Modified: head/sys/arm/include/cpufunc.h
==============================================================================
--- head/sys/arm/include/cpufunc.h	Tue Feb  2 10:39:18 2016	(r295144)
+++ head/sys/arm/include/cpufunc.h	Tue Feb  2 10:50:32 2016	(r295145)
@@ -149,7 +149,6 @@ struct cpu_functions {
 
 	/* Other functions */
 
-	void	(*cf_flush_prefetchbuf)	(void);
 	void	(*cf_drain_writebuf)	(void);
 
 	void	(*cf_sleep)		(int mode);
@@ -191,7 +190,6 @@ extern u_int cputype;
 #define cpu_l2cache_wbinv_range(a, s) cpufuncs.cf_l2cache_wbinv_range((a), (s))
 #define cpu_l2cache_drain_writebuf() cpufuncs.cf_l2cache_drain_writebuf()
 
-#define	cpu_flush_prefetchbuf()	cpufuncs.cf_flush_prefetchbuf()
 #define	cpu_drain_writebuf()	cpufuncs.cf_drain_writebuf()
 #define cpu_sleep(m)		cpufuncs.cf_sleep(m)
 
@@ -215,7 +213,6 @@ void	fa526_setttb		(u_int ttb);
 void	fa526_context_switch	(void);
 void	fa526_cpu_sleep		(int);
 void	fa526_tlb_flushID_SE	(u_int);
-void	fa526_flush_prefetchbuf	(void);
 
 void	fa526_icache_sync_all	(void);
 void	fa526_icache_sync_range(vm_offset_t start, vm_size_t end);
@@ -327,7 +324,6 @@ void    arm11x6_setttb                  
 void    arm11x6_idcache_wbinv_all       (void);
 void    arm11x6_dcache_wbinv_all        (void);
 void    arm11x6_icache_sync_all         (void);
-void    arm11x6_flush_prefetchbuf       (void);
 void    arm11x6_icache_sync_range       (vm_offset_t, vm_size_t);
 void    arm11x6_idcache_wbinv_range     (vm_offset_t, vm_size_t);
 void    arm11x6_setup                   (void);