Skip to contentSkip to conversation

: Add R14K Support (generic)

PATCH In review Kumba 2 participants 4 messages Jan 23, 2006 – Jan 24, 2006 MIPS

lore
Share & tools
lore

Kumba

author
#0 lore raw

PATCH 1/1 : Add R14K Support (generic)

The attached patch essentially just copies what R12K does for R14K, and should allow systems running an R14K CPU actually boot. Granted, no machine currently in git can actually use R14K, but the patch is generic and non-invaisive, so I thought I'd shoot it to the list anyways. Minor notes below.

1) Octane is the closest system that can run Linux that supports the R14K CPU, but due to exhorbant prices, no one has, as of yet, managed to get their hands on either a full R14K system or the CPU module itself.

2) Due to item #1 above, this patch hasn't even been tested.

Comments Welcome.

--Kumba

--
Gentoo/MIPS Team Lead
Gentoo Foundation Board of Trustees

"Such is oft the course of deeds that move the wheels of the world: small hands do them because they must, while the eyes of the great are elsewhere." --Elrond

arch/mips/kernel/cpu-probe.c +9 -0
diff -Naurp linux-2.6.15.orig/arch/mips/kernel/cpu-probe.c linux-2.6.15/arch/mips/kernel/cpu-probe.c
@@ -494,6 +494,15 @@ static inline void cpu_probe_legacy(stru
 		             MIPS_CPU_LLSC;
 		c->tlbsize = 64;
 		break;
+	case PRID_IMP_R14000:
+		c->cputype = CPU_R14000;
+		c->isa_level = MIPS_CPU_ISA_IV;
+		c->options = MIPS_CPU_TLB | MIPS_CPU_4K_CACHE | MIPS_CPU_4KEX |
+		             MIPS_CPU_FPU | MIPS_CPU_32FPR |
+			     MIPS_CPU_COUNTER | MIPS_CPU_WATCH |
+		             MIPS_CPU_LLSC;
+		c->tlbsize = 64;
+		break;
 	}
 }
 
arch/mips/kernel/proc.c +1 -0
diff -Naurp linux-2.6.15.orig/arch/mips/kernel/proc.c linux-2.6.15/arch/mips/kernel/proc.c
@@ -42,6 +42,7 @@ static const char *cpu_name[] = {
 	[CPU_R8000]	= "R8000",
 	[CPU_R10000]	= "R10000",
 	[CPU_R12000]	= "R12000",
+	[CPU_R14000]	= "R14000",
 	[CPU_R4300]	= "R4300",
 	[CPU_R4650]	= "R4650",
 	[CPU_R4700]	= "R4700",
arch/mips/mm/c-r4k.c +4 -0
diff -Naurp linux-2.6.15.orig/arch/mips/mm/c-r4k.c linux-2.6.15/arch/mips/mm/c-r4k.c
@@ -291,6 +291,7 @@ static inline void local_r4k___flush_cac
 	case CPU_R4400MC:
 	case CPU_R10000:
 	case CPU_R12000:
+	case CPU_R14000:
 		r4k_blast_scache();
 	}
 }
@@ -832,6 +833,7 @@ static void __init probe_pcache(void)
 
 	case CPU_R10000:
 	case CPU_R12000:
+	case CPU_R14000:
 		icache_size = 1 << (12 + ((config & R10K_CONF_IC) >> 29));
 		c->icache.linesz = 64;
 		c->icache.ways = 2;
@@ -984,6 +986,7 @@ static void __init probe_pcache(void)
 	case CPU_25KF:
 	case CPU_R10000:
 	case CPU_R12000:
+	case CPU_R14000:
 	case CPU_SB1:
 		break;
 	case CPU_24K:
@@ -1110,6 +1113,7 @@ static void __init setup_scache(void)
 
 	case CPU_R10000:
 	case CPU_R12000:
+	case CPU_R14000:
 		scache_size = 0x80000 << ((config & R10K_CONF_SS) >> 16);
 		c->scache.linesz = 64 << ((config >> 13) & 1);
 		c->scache.ways = 2;
arch/mips/mm/pg-r4k.c +1 -0
diff -Naurp linux-2.6.15.orig/arch/mips/mm/pg-r4k.c linux-2.6.15/arch/mips/mm/pg-r4k.c
@@ -351,6 +351,7 @@ void __init build_clear_page(void)
 
 		case CPU_R10000:
 		case CPU_R12000:
+		case CPU_R14000:
 			pref_src_mode = Pref_LoadStreamed;
 			pref_dst_mode = Pref_StoreStreamed;
 			break;
arch/mips/mm/tlbex.c +1 -0
diff -Naurp linux-2.6.15.orig/arch/mips/mm/tlbex.c linux-2.6.15/arch/mips/mm/tlbex.c
@@ -852,6 +852,7 @@ static __init void build_tlb_write_entry
 
 	case CPU_R10000:
 	case CPU_R12000:
+	case CPU_R14000:
 	case CPU_4KC:
 	case CPU_SB1:
 	case CPU_SB1A:
include/asm-mips/cpu.h +3 -1
diff -Naurp linux-2.6.15.orig/include/asm-mips/cpu.h linux-2.6.15/include/asm-mips/cpu.h
@@ -51,6 +51,7 @@
 #define PRID_IMP_R4300		0x0b00
 #define PRID_IMP_VR41XX		0x0c00
 #define PRID_IMP_R12000		0x0e00
+#define PRID_IMP_R14000		0x0f00
 #define PRID_IMP_R8000		0x1000
 #define PRID_IMP_PR4450		0x1200
 #define PRID_IMP_R4600		0x2000
@@ -196,7 +197,8 @@
 #define CPU_34K			60
 #define CPU_PR4450		61
 #define CPU_SB1A		62
-#define CPU_LAST		62
+#define CPU_R14000		63
+#define CPU_LAST		63
 
 /*
  * ISA Level encodings
#1 lore raw
Quoted 1 line · Kumba

The attached patch essentially just copies what R12K does for R14K, and

should allow systems running an R14K CPU

Quoted 1 line

actually boot. Granted, no machine currently in git can actually use

R14K, but the patch is generic and

Quoted 1 line

non-invaisive, so I thought I'd shoot it to the list anyways. Minor

notes below.

Afaik it's not as trivial as this. The R14000 has some changes to the FPU which seem to require handling. I unfortunately know no details.

Ralf

author
#2 lore raw
Quoted 3 lines · Ralf Baechle

Afaik it's not as trivial as this. The R14000 has some changes to the FPU which seem to require handling. I unfortunately know no details.

My guess is a lot of the R14K and R16K details are still protected. I can't find any processor manuals on them. Hopefully, I'll be able to get a hold of an R14K eventually to figure out just how well this patch works (maybe it'll reveal enough to see what the FPU does differently). If only the prices on eVay drop...

--Kumba

Signature · 4 lines
Gentoo/MIPS Team Lead
Gentoo Foundation Board of Trustees

"Such is oft the course of deeds that move the wheels of the world: small hands do them because they must, while the eyes of the great are elsewhere."  --Elrond
#3 lore raw
Quoted 8 lines · Kumba
Quoted 2 lines

Afaik it's not as trivial as this. The R14000 has some changes to the FPU which seem to require handling. I unfortunately know no details.

My guess is a lot of the R14K and R16K details are still protected. I can't find any processor manuals on them. Hopefully, I'll be able to get a hold of an R14K eventually to figure out just how well this patch works (maybe it'll reveal enough to see what the FPU does differently). If only the prices on eVay drop...

R10000 and R12000 were available on the market. R14000 was probably more of a custom chip even though it was also being used in HP systems, I think that series was called Himalaya. Probably just nobody bother going through the necessary documentation etc. process to make it a "real" product.

Ralf