Commit 3b2db173 authored by Paul Burton's avatar Paul Burton Committed by Ralf Baechle
Browse files

MIPS: Remove unused R6000 support 



The kernel contains a small amount of incomplete code aimed at
supporting old R6000 CPUs. This is:

  - Unused, as no machine selects CONFIG_SYS_HAS_CPU_R6000.

  - Broken, since there are glaring errors such as r6000_fpu.S moving
    the FCSR register to t1, then ignoring it & instead saving t0 into
    struct sigcontext...

  - A maintenance headache, since it's code that nobody can test which
    nevertheless imposes constraints on code which it shares with other
    machines.

Remove this incomplete & broken R6000 CPU support in order to clean up
and in preparation for changes which will no longer need to consider
dragging the pretense of R6000 support along with them.

Signed-off-by: default avatarPaul Burton <paul.burton@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/16236/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 114c3708

arch/mips/Kconfig

+3 −14
Original line number Diff line number Diff line
@@ -1627,14 +1627,6 @@ config CPU_R5500 
	  NEC VR5500 and VR5500A series processors implement 64-bit MIPS IV

	  instruction set.



config CPU_R6000

	bool "R6000"

	depends on SYS_HAS_CPU_R6000

	select CPU_SUPPORTS_32BIT_KERNEL

	help

	  MIPS Technologies R6000 and R6000A series processors.  Note these

	  processors are extremely rare and the support for them is incomplete.



config CPU_NEVADA

	bool "RM52xx"

	depends on SYS_HAS_CPU_NEVADA
@@ -1950,9 +1942,6 @@ config SYS_HAS_CPU_R5432 
config SYS_HAS_CPU_R5500

	bool



config SYS_HAS_CPU_R6000

	bool



config SYS_HAS_CPU_NEVADA

	bool
@@ -2180,7 +2169,7 @@ config PAGE_SIZE_32KB 


config PAGE_SIZE_64KB

	bool "64kB"

	depends on !CPU_R3000 && !CPU_TX39XX && !CPU_R6000

	depends on !CPU_R3000 && !CPU_TX39XX

	help

	  Using 64kB page size will result in higher performance kernel at

	  the price of higher memory consumption.  This option is available on
@@ -2248,11 +2237,11 @@ config CPU_HAS_PREFETCH 


config CPU_GENERIC_DUMP_TLB

	bool

	default y if !(CPU_R3000 || CPU_R6000 || CPU_R8000 || CPU_TX39XX)

	default y if !(CPU_R3000 || CPU_R8000 || CPU_TX39XX)



config CPU_R4K_FPU

	bool

	default y if !(CPU_R3000 || CPU_R6000 || CPU_TX39XX || CPU_CAVIUM_OCTEON)

	default y if !(CPU_R3000 || CPU_TX39XX || CPU_CAVIUM_OCTEON)



config CPU_R4K_CACHE_TLB

	bool

arch/mips/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -151,7 +151,6 @@ cflags-y += -fno-stack-check 
#

cflags-$(CONFIG_CPU_R3000)	+= -march=r3000

cflags-$(CONFIG_CPU_TX39XX)	+= -march=r3900

cflags-$(CONFIG_CPU_R6000)	+= -march=r6000 -Wa,--trap

cflags-$(CONFIG_CPU_R4300)	+= -march=r4300 -Wa,--trap

cflags-$(CONFIG_CPU_VR41XX)	+= -march=r4100 -Wa,--trap

cflags-$(CONFIG_CPU_R4X00)	+= -march=r4600 -Wa,--trap

arch/mips/include/asm/cpu-type.h

+0 −5
Original line number Diff line number Diff line
@@ -151,11 +151,6 @@ static inline int __pure __get_cpu_type(const int cpu_type) 
	case CPU_R5500:

#endif



#ifdef CONFIG_SYS_HAS_CPU_R6000

	case CPU_R6000:

	case CPU_R6000A:

#endif



#ifdef CONFIG_SYS_HAS_CPU_NEVADA

	case CPU_NEVADA:

#endif

arch/mips/include/asm/cpu.h

+0 −5
Original line number Diff line number Diff line
@@ -285,11 +285,6 @@ enum cpu_type_enum { 
	CPU_R2000, CPU_R3000, CPU_R3000A, CPU_R3041, CPU_R3051, CPU_R3052,

	CPU_R3081, CPU_R3081E,



	/*

	 * R6000 class processors

	 */

	CPU_R6000, CPU_R6000A,



	/*

	 * R4000 class processors

	 */

arch/mips/include/asm/module.h

+0 −2
Original line number Diff line number Diff line
@@ -114,8 +114,6 @@ search_module_dbetables(unsigned long addr) 
#define MODULE_PROC_FAMILY "R5432 "

#elif defined CONFIG_CPU_R5500

#define MODULE_PROC_FAMILY "R5500 "

#elif defined CONFIG_CPU_R6000

#define MODULE_PROC_FAMILY "R6000 "

#elif defined CONFIG_CPU_NEVADA

#define MODULE_PROC_FAMILY "NEVADA "

#elif defined CONFIG_CPU_R8000

CRA Git | Maintained and supported by SUSTech CRA and CCSE