MIPS: Add CONFIG_CPU_R5500 for NEC VR5500 series processors

We already have sufficient infrastructure to support VR5500 and VR5500A
series processors.  Here's a Makefile support to make it selectable by
ports, and enable it for NEC EMMA2RH Markeins board.

This patch also fixes a confused target help, and adds 1Gb PageMask bits
supported by VR5500 and its variants.

Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 3a83f2a1b240212108d48ec07ab3c5945393d6c4..16fc6155285a2de345ecd771eaded8d05948b71a 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -249,10 +249,9 @@ config MARKEINS
        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_SUPPORTS_LITTLE_ENDIAN
        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_SUPPORTS_LITTLE_ENDIAN

-       select SYS_HAS_CPU_R5000
+       select SYS_HAS_CPU_R5500

        help
        help

-         This enables support for the R5432-based NEC Mark-eins
-         boards with R5500 CPU.
+         This enables support for the NEC Mark-eins board with VR5500 CPU.

 
 config MACH_VR41XX
        bool "NEC VR4100 series based machines"
 
 config MACH_VR41XX
        bool "NEC VR4100 series based machines"


@@ -1123,6 +1122,16 @@ config CPU_R5432
        select CPU_SUPPORTS_32BIT_KERNEL
        select CPU_SUPPORTS_64BIT_KERNEL
 
        select CPU_SUPPORTS_32BIT_KERNEL
        select CPU_SUPPORTS_64BIT_KERNEL
 

+config CPU_R5500
+       bool "R5500"
+       depends on SYS_HAS_CPU_R5500
+       select CPU_HAS_LLSC
+       select CPU_SUPPORTS_32BIT_KERNEL
+       select CPU_SUPPORTS_64BIT_KERNEL
+       help
+         NEC VR5500 and VR5500A series processors implement 64-bit MIPS IV
+         instruction set.
+

 config CPU_R6000
        bool "R6000"
        depends on EXPERIMENTAL
 config CPU_R6000
        bool "R6000"
        depends on EXPERIMENTAL


@@ -1233,6 +1242,9 @@ config SYS_HAS_CPU_R5000
 config SYS_HAS_CPU_R5432
        bool
 
 config SYS_HAS_CPU_R5432
        bool
 

+config SYS_HAS_CPU_R5500
+       bool
+

 config SYS_HAS_CPU_R6000
        bool
 
 config SYS_HAS_CPU_R6000
        bool
 

diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index 8abac786c1f5803766e585e11c17d56d5790e2be..a21b12ce903da29e6106f1829686188436a58f03 100644 (file)
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -131,6 +131,8 @@ cflags-$(CONFIG_CPU_MIPS64_R2)      += $(call cc-option,-march=mips64r2,-mips64r2 -U_
 cflags-$(CONFIG_CPU_R5000)     += -march=r5000 -Wa,--trap
 cflags-$(CONFIG_CPU_R5432)     += $(call cc-option,-march=r5400,-march=r5000) \
                        -Wa,--trap
 cflags-$(CONFIG_CPU_R5000)     += -march=r5000 -Wa,--trap
 cflags-$(CONFIG_CPU_R5432)     += $(call cc-option,-march=r5400,-march=r5000) \
                        -Wa,--trap

+cflags-$(CONFIG_CPU_R5500)     += $(call cc-option,-march=r5500,-march=r5000) \
+                       -Wa,--trap

 cflags-$(CONFIG_CPU_NEVADA)    += $(call cc-option,-march=rm5200,-march=r5000) \
                        -Wa,--trap
 cflags-$(CONFIG_CPU_RM7000)    += $(call cc-option,-march=rm7000,-march=r5000) \
 cflags-$(CONFIG_CPU_NEVADA)    += $(call cc-option,-march=rm5200,-march=r5000) \
                        -Wa,--trap
 cflags-$(CONFIG_CPU_RM7000)    += $(call cc-option,-march=rm7000,-march=r5000) \

diff --git a/arch/mips/include/asm/mipsregs.h b/arch/mips/include/asm/mipsregs.h
index 979866000da43d6fe7f0c72a1862db93a3ff0c19..9316324d070d7529b8bc4961832b9b1b5531c82e 100644 (file)
--- a/arch/mips/include/asm/mipsregs.h
+++ b/arch/mips/include/asm/mipsregs.h
@@ -192,6 +192,7 @@
 #define PM_16M         0x01ffe000
 #define PM_64M         0x07ffe000
 #define PM_256M                0x1fffe000
 #define PM_16M         0x01ffe000
 #define PM_64M         0x07ffe000
 #define PM_256M                0x1fffe000

+#define PM_1G          0x7fffe000

 
 #endif
 
 
 #endif
 

diff --git a/arch/mips/include/asm/module.h b/arch/mips/include/asm/module.h
index de6d09ebbd800a94a8503e45f84b9bfe5f7ceeec..e2e09b2cd26579ea0220a69913188dc386b708b8 100644 (file)
--- a/arch/mips/include/asm/module.h
+++ b/arch/mips/include/asm/module.h
@@ -98,6 +98,8 @@ search_module_dbetables(unsigned long addr)
 #define MODULE_PROC_FAMILY "R5000 "
 #elif defined CONFIG_CPU_R5432
 #define MODULE_PROC_FAMILY "R5432 "
 #define MODULE_PROC_FAMILY "R5000 "
 #elif defined CONFIG_CPU_R5432
 #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
 #elif defined CONFIG_CPU_R6000
 #define MODULE_PROC_FAMILY "R6000 "
 #elif defined CONFIG_CPU_NEVADA

diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile
index d9da7112aaf8188b90eb88bde35f556cdd933887..b1372c27f1369d6fa50590dfe0f37a6cbd01b112 100644 (file)
--- a/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
@@ -33,6 +33,7 @@ obj-$(CONFIG_CPU_R4X00)               += r4k_fpu.o r4k_switch.o
 obj-$(CONFIG_CPU_R5000)                += r4k_fpu.o r4k_switch.o
 obj-$(CONFIG_CPU_R6000)                += r6000_fpu.o r4k_switch.o
 obj-$(CONFIG_CPU_R5432)                += r4k_fpu.o r4k_switch.o
 obj-$(CONFIG_CPU_R5000)                += r4k_fpu.o r4k_switch.o
 obj-$(CONFIG_CPU_R6000)                += r6000_fpu.o r4k_switch.o
 obj-$(CONFIG_CPU_R5432)                += r4k_fpu.o r4k_switch.o

+obj-$(CONFIG_CPU_R5500)                += r4k_fpu.o r4k_switch.o

 obj-$(CONFIG_CPU_R8000)                += r4k_fpu.o r4k_switch.o
 obj-$(CONFIG_CPU_RM7000)       += r4k_fpu.o r4k_switch.o
 obj-$(CONFIG_CPU_RM9000)       += r4k_fpu.o r4k_switch.o
 obj-$(CONFIG_CPU_R8000)                += r4k_fpu.o r4k_switch.o
 obj-$(CONFIG_CPU_RM7000)       += r4k_fpu.o r4k_switch.o
 obj-$(CONFIG_CPU_RM9000)       += r4k_fpu.o r4k_switch.o

diff --git a/arch/mips/lib/Makefile b/arch/mips/lib/Makefile
index 8810dfb915dd210e0f45d076be1e36e6af779404..dbcf6511b74e885a579bcab15563911e23b0078f 100644 (file)
--- a/arch/mips/lib/Makefile
+++ b/arch/mips/lib/Makefile
@@ -18,6 +18,7 @@ obj-$(CONFIG_CPU_R4300)               += dump_tlb.o
 obj-$(CONFIG_CPU_R4X00)                += dump_tlb.o
 obj-$(CONFIG_CPU_R5000)                += dump_tlb.o
 obj-$(CONFIG_CPU_R5432)                += dump_tlb.o
 obj-$(CONFIG_CPU_R4X00)                += dump_tlb.o
 obj-$(CONFIG_CPU_R5000)                += dump_tlb.o
 obj-$(CONFIG_CPU_R5432)                += dump_tlb.o

+obj-$(CONFIG_CPU_R5500)                += dump_tlb.o

 obj-$(CONFIG_CPU_R6000)                +=
 obj-$(CONFIG_CPU_R8000)                +=
 obj-$(CONFIG_CPU_RM7000)       += dump_tlb.o
 obj-$(CONFIG_CPU_R6000)                +=
 obj-$(CONFIG_CPU_R8000)                +=
 obj-$(CONFIG_CPU_RM7000)       += dump_tlb.o

diff --git a/arch/mips/lib/dump_tlb.c b/arch/mips/lib/dump_tlb.c
index 465ff0ec85b9316d151cca44786a92f0b41c85d7..779821cd54ab7a4d93346045262e0d23139d7196 100644 (file)
--- a/arch/mips/lib/dump_tlb.c
+++ b/arch/mips/lib/dump_tlb.c
@@ -25,6 +25,7 @@ static inline const char *msk2str(unsigned int mask)
        case PM_16M:    return "16Mb";
        case PM_64M:    return "64Mb";
        case PM_256M:   return "256Mb";
        case PM_16M:    return "16Mb";
        case PM_64M:    return "64Mb";
        case PM_256M:   return "256Mb";

+       case PM_1G:     return "1Gb";

 #endif
        }
        return "";
 #endif
        }
        return "";

diff --git a/arch/mips/mm/Makefile b/arch/mips/mm/Makefile
index 44e8dd8106bf47c774e239e8f550ed4ac6216801..95ba32b5b720e22f3b615a7f2de3f8ca228d8468 100644 (file)
--- a/arch/mips/mm/Makefile
+++ b/arch/mips/mm/Makefile
@@ -19,6 +19,7 @@ obj-$(CONFIG_CPU_R4300)               += c-r4k.o cex-gen.o tlb-r4k.o
 obj-$(CONFIG_CPU_R4X00)                += c-r4k.o cex-gen.o tlb-r4k.o
 obj-$(CONFIG_CPU_R5000)                += c-r4k.o cex-gen.o tlb-r4k.o
 obj-$(CONFIG_CPU_R5432)                += c-r4k.o cex-gen.o tlb-r4k.o
 obj-$(CONFIG_CPU_R4X00)                += c-r4k.o cex-gen.o tlb-r4k.o
 obj-$(CONFIG_CPU_R5000)                += c-r4k.o cex-gen.o tlb-r4k.o
 obj-$(CONFIG_CPU_R5432)                += c-r4k.o cex-gen.o tlb-r4k.o

+obj-$(CONFIG_CPU_R5500)                += c-r4k.o cex-gen.o tlb-r4k.o

 obj-$(CONFIG_CPU_R8000)                += c-r4k.o cex-gen.o tlb-r8k.o
 obj-$(CONFIG_CPU_RM7000)       += c-r4k.o cex-gen.o tlb-r4k.o
 obj-$(CONFIG_CPU_RM9000)       += c-r4k.o cex-gen.o tlb-r4k.o
 obj-$(CONFIG_CPU_R8000)                += c-r4k.o cex-gen.o tlb-r8k.o
 obj-$(CONFIG_CPU_RM7000)       += c-r4k.o cex-gen.o tlb-r4k.o
 obj-$(CONFIG_CPU_RM9000)       += c-r4k.o cex-gen.o tlb-r4k.o