svn commit: r232853 - in head/sys/mips: adm5120 alchemy atheros idt include malta nlm rmi rt305x sentry5 sibyte

Juli Mallett jmallett at FreeBSD.org
Mon Mar 12 07:34:16 UTC 2012


Author: jmallett
Date: Mon Mar 12 07:34:15 2012
New Revision: 232853
URL: http://svn.freebsd.org/changeset/base/232853

Log:
  Remove platform APIs which are not used by any code and which had only stub
  implementations or no implementation on all platforms.
  
  Some of these functions might be good ideas, but their semantics were unclear
  given the lack of implementation, and an unlucky porter could be fooled into
  trying to implement them or, worse, being baffled when something like
  platform_trap_enter() failed to be called.

Modified:
  head/sys/mips/adm5120/adm5120_machdep.c
  head/sys/mips/alchemy/alchemy_machdep.c
  head/sys/mips/atheros/ar71xx_machdep.c
  head/sys/mips/idt/idt_machdep.c
  head/sys/mips/include/hwfunc.h
  head/sys/mips/include/md_var.h
  head/sys/mips/include/trap.h
  head/sys/mips/malta/malta_machdep.c
  head/sys/mips/nlm/xlp_machdep.c
  head/sys/mips/rmi/xlr_machdep.c
  head/sys/mips/rt305x/rt305x_machdep.c
  head/sys/mips/sentry5/s5_machdep.c
  head/sys/mips/sibyte/sb_machdep.c

Modified: head/sys/mips/adm5120/adm5120_machdep.c
==============================================================================
--- head/sys/mips/adm5120/adm5120_machdep.c	Mon Mar 12 07:02:16 2012	(r232852)
+++ head/sys/mips/adm5120/adm5120_machdep.c	Mon Mar 12 07:34:15 2012	(r232853)
@@ -116,19 +116,6 @@ mips_init(void)
 }
 
 void
-platform_halt(void)
-{
-
-}
-
-
-void
-platform_identify(void)
-{
-
-}
-
-void
 platform_reset(void)
 {
 
@@ -137,18 +124,6 @@ platform_reset(void)
 }
 
 void
-platform_trap_enter(void)
-{
-
-}
-
-void
-platform_trap_exit(void)
-{
-
-}
-
-void
 platform_start(__register_t a0 __unused, __register_t a1 __unused, 
     __register_t a2 __unused, __register_t a3 __unused)
 {

Modified: head/sys/mips/alchemy/alchemy_machdep.c
==============================================================================
--- head/sys/mips/alchemy/alchemy_machdep.c	Mon Mar 12 07:02:16 2012	(r232852)
+++ head/sys/mips/alchemy/alchemy_machdep.c	Mon Mar 12 07:34:15 2012	(r232853)
@@ -117,19 +117,6 @@ mips_init(void)
 }
 
 void
-platform_halt(void)
-{
-
-}
-
-
-void
-platform_identify(void)
-{
-
-}
-
-void
 platform_reset(void)
 {
 
@@ -138,18 +125,6 @@ platform_reset(void)
 }
 
 void
-platform_trap_enter(void)
-{
-
-}
-
-void
-platform_trap_exit(void)
-{
-
-}
-
-void
 platform_start(__register_t a0 __unused, __register_t a1 __unused, 
     __register_t a2 __unused, __register_t a3 __unused)
 {

Modified: head/sys/mips/atheros/ar71xx_machdep.c
==============================================================================
--- head/sys/mips/atheros/ar71xx_machdep.c	Mon Mar 12 07:02:16 2012	(r232852)
+++ head/sys/mips/atheros/ar71xx_machdep.c	Mon Mar 12 07:34:15 2012	(r232853)
@@ -106,18 +106,6 @@ platform_cpu_init()
 }
 
 void
-platform_halt(void)
-{
-
-}
-
-void
-platform_identify(void)
-{
-
-}
-
-void
 platform_reset(void)
 {
 	ar71xx_device_stop(RST_RESET_FULL_CHIP);
@@ -126,18 +114,6 @@ platform_reset(void)
 		;
 }
 
-void
-platform_trap_enter(void)
-{
-
-}
-
-void
-platform_trap_exit(void)
-{
-
-}
-
 /*
  * Obtain the MAC address via the Redboot environment.
  */

Modified: head/sys/mips/idt/idt_machdep.c
==============================================================================
--- head/sys/mips/idt/idt_machdep.c	Mon Mar 12 07:02:16 2012	(r232852)
+++ head/sys/mips/idt/idt_machdep.c	Mon Mar 12 07:34:15 2012	(r232853)
@@ -82,19 +82,6 @@ platform_cpu_init()
 }
 
 void
-platform_halt(void)
-{
-
-}
-
-
-void
-platform_identify(void)
-{
-
-}
-
-void
 platform_reset(void)
 {
 	volatile unsigned int * p = (void *)0xb8008000;
@@ -111,18 +98,6 @@ platform_reset(void)
 }
 
 void
-platform_trap_enter(void)
-{
-
-}
-
-void
-platform_trap_exit(void)
-{
-
-}
-
-void
 platform_start(__register_t a0, __register_t a1,
     __register_t a2 __unused, __register_t a3 __unused)
 {

Modified: head/sys/mips/include/hwfunc.h
==============================================================================
--- head/sys/mips/include/hwfunc.h	Mon Mar 12 07:02:16 2012	(r232852)
+++ head/sys/mips/include/hwfunc.h	Mon Mar 12 07:34:15 2012	(r232853)
@@ -30,14 +30,11 @@
 
 #include <sys/_cpuset.h>
 
-struct trapframe;
 struct timecounter;
+
 /*
- * Hooks downward into hardware functionality.
+ * Hooks downward into platform functionality.
  */
-
-void platform_halt(void);
-void platform_intr(struct trapframe *);
 void platform_reset(void);
 void platform_start(__register_t, __register_t,  __register_t, __register_t);
 
@@ -48,7 +45,6 @@ unsigned platform_get_timecount(struct t
 
 /* For hardware specific CPU initialization */
 void platform_cpu_init(void);
-void platform_secondary_init(void);
 
 #ifdef SMP
 
@@ -100,6 +96,6 @@ extern void platform_cpu_mask(cpuset_t *
  */
 struct cpu_group *platform_smp_topo(void);
 
-
 #endif	/* SMP */
+
 #endif /* !_MACHINE_HWFUNC_H_ */

Modified: head/sys/mips/include/md_var.h
==============================================================================
--- head/sys/mips/include/md_var.h	Mon Mar 12 07:02:16 2012	(r232852)
+++ head/sys/mips/include/md_var.h	Mon Mar 12 07:34:15 2012	(r232853)
@@ -76,9 +76,6 @@ void	mips_pcpu0_init(void);
 void	mips_proc0_init(void);
 void	mips_postboot_fixup(void);
 
-/* Platform call-downs. */
-void	platform_identify(void);
-
 extern int busdma_swi_pending;
 void	busdma_swi(void);
 

Modified: head/sys/mips/include/trap.h
==============================================================================
--- head/sys/mips/include/trap.h	Mon Mar 12 07:02:16 2012	(r232852)
+++ head/sys/mips/include/trap.h	Mon Mar 12 07:34:15 2012	(r232853)
@@ -118,10 +118,4 @@ void MipsUserIntr(void);
 
 register_t trap(struct trapframe *);
 
-#ifndef LOCORE /* XXX */
-int check_address(void *);
-void platform_trap_enter(void);
-void platform_trap_exit(void);
-#endif
-
 #endif /* !_MACHINE_TRAP_H_ */

Modified: head/sys/mips/malta/malta_machdep.c
==============================================================================
--- head/sys/mips/malta/malta_machdep.c	Mon Mar 12 07:02:16 2012	(r232852)
+++ head/sys/mips/malta/malta_machdep.c	Mon Mar 12 07:34:15 2012	(r232853)
@@ -199,19 +199,6 @@ mips_init(void)
 #endif
 }
 
-void
-platform_halt(void)
-{
-
-}
-
-
-void
-platform_identify(void)
-{
-
-}
-
 /*
  * Perform a board-level soft-reset.
  * Note that this is not emulated by gxemul.
@@ -225,18 +212,6 @@ platform_reset(void)
 	*c = MALTA_GORESET;
 }
 
-void
-platform_trap_enter(void)
-{
-
-}
-
-void
-platform_trap_exit(void)
-{
-
-}
-
 static uint64_t
 malta_cpu_freq(void)
 {

Modified: head/sys/mips/nlm/xlp_machdep.c
==============================================================================
--- head/sys/mips/nlm/xlp_machdep.c	Mon Mar 12 07:02:16 2012	(r232852)
+++ head/sys/mips/nlm/xlp_machdep.c	Mon Mar 12 07:34:15 2012	(r232853)
@@ -561,22 +561,6 @@ platform_cpu_init()
 }
 
 void
-platform_identify(void)
-{
-
-	printf("XLP Eval Board\n");
-}
-
-/*
- * XXX Maybe return the state of the watchdog in enter, and pass it to
- * exit?  Like spl().
- */
-void
-platform_trap_enter(void)
-{
-}
-
-void
 platform_reset(void)
 {
 	uint64_t sysbase = nlm_get_sys_regbase(0);
@@ -586,11 +570,6 @@ platform_reset(void)
 		__asm __volatile("wait");
 }
 
-void
-platform_trap_exit(void)
-{
-}
-
 #ifdef SMP
 /*
  * XLP threads are started simultaneously when we enable threads, this will

Modified: head/sys/mips/rmi/xlr_machdep.c
==============================================================================
--- head/sys/mips/rmi/xlr_machdep.c	Mon Mar 12 07:02:16 2012	(r232852)
+++ head/sys/mips/rmi/xlr_machdep.c	Mon Mar 12 07:34:15 2012	(r232853)
@@ -517,19 +517,6 @@ platform_cpu_init()
 }
 
 void
-platform_identify(void)
-{
-
-	printf("Board [%d:%d], processor 0x%08x\n", (int)xlr_boot1_info.board_major_version,
-	    (int)xlr_boot1_info.board_minor_version, mips_rd_prid());
-}
-
-void
-platform_trap_enter(void)
-{
-}
-
-void
 platform_reset(void)
 {
 	xlr_reg_t *mmio = xlr_io_mmio(XLR_IO_GPIO_OFFSET);
@@ -538,11 +525,6 @@ platform_reset(void)
 	xlr_write_reg(mmio, 8, 1);
 }
 
-void
-platform_trap_exit(void)
-{
-}
-
 #ifdef SMP
 int xlr_ap_release[MAXCPU];
 

Modified: head/sys/mips/rt305x/rt305x_machdep.c
==============================================================================
--- head/sys/mips/rt305x/rt305x_machdep.c	Mon Mar 12 07:02:16 2012	(r232852)
+++ head/sys/mips/rt305x/rt305x_machdep.c	Mon Mar 12 07:34:15 2012	(r232853)
@@ -118,19 +118,6 @@ mips_init(void)
 }
 
 void
-platform_halt(void)
-{
-
-}
-
-
-void
-platform_identify(void)
-{
-
-}
-
-void
 platform_reset(void)
 {
 
@@ -139,18 +126,6 @@ platform_reset(void)
 }
 
 void
-platform_trap_enter(void)
-{
-
-}
-
-void
-platform_trap_exit(void)
-{
-
-}
-
-void
 platform_start(__register_t a0 __unused, __register_t a1 __unused, 
     __register_t a2 __unused, __register_t a3 __unused)
 {

Modified: head/sys/mips/sentry5/s5_machdep.c
==============================================================================
--- head/sys/mips/sentry5/s5_machdep.c	Mon Mar 12 07:02:16 2012	(r232852)
+++ head/sys/mips/sentry5/s5_machdep.c	Mon Mar 12 07:34:15 2012	(r232853)
@@ -144,19 +144,6 @@ mips_init(void)
 }
 
 void
-platform_halt(void)
-{
-
-}
-
-
-void
-platform_identify(void)
-{
-
-}
-
-void
 platform_reset(void)
 {
 
@@ -168,18 +155,6 @@ platform_reset(void)
 }
 
 void
-platform_trap_enter(void)
-{
-
-}
-
-void
-platform_trap_exit(void)
-{
-
-}
-
-void
 platform_start(__register_t a0, __register_t a1, __register_t a2,
 	       __register_t a3)
 {

Modified: head/sys/mips/sibyte/sb_machdep.c
==============================================================================
--- head/sys/mips/sibyte/sb_machdep.c	Mon Mar 12 07:02:16 2012	(r232852)
+++ head/sys/mips/sibyte/sb_machdep.c	Mon Mar 12 07:34:15 2012	(r232853)
@@ -272,19 +272,6 @@ mips_init(void)
 }
 
 void
-platform_halt(void)
-{
-
-}
-
-
-void
-platform_identify(void)
-{
-
-}
-
-void
 platform_reset(void)
 {
 	
@@ -295,18 +282,6 @@ platform_reset(void)
 	sb_system_reset();
 }
 
-void
-platform_trap_enter(void)
-{
-
-}
-
-void
-platform_trap_exit(void)
-{
-
-}
-
 static void
 kseg0_map_coherent(void)
 {


More information about the svn-src-all mailing list