sparc,leon: Introduce the sparc-leon CPU type.

Add sparc_leon enum, M_LEON|M_LEON3_SOC machine. Add compilation of leon.c in mm and kernel if CONFIG_SPARC_LEON is defined. Add sparc_leon dependent initialization to switch statements + head.S. Signed-off-by: Konrad Eisele <konrad@gaisler.com> Reviewed-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: David S. Miller <davem@davemloft.net>

sparc,leon: Introduce the sparc-leon CPU type.
Add sparc_leon enum, M_LEON|M_LEON3_SOC machine. Add compilation of leon.c in mm and kernel if CONFIG_SPARC_LEON is defined. Add sparc_leon dependent initialization to switch statements + head.S. Signed-off-by: Konrad Eisele <konrad@gaisler.com> Reviewed-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Konrad Eisele · David S. Miller
1 parent 97fb58fa9b
Showing 13 changed files with 43 additions and 1 deletions Side-by-side Diff
arch/sparc/include/asm/machines.h
arch/sparc/include/asm/pgtsrmmu.h
arch/sparc/include/asm/prom.h
arch/sparc/include/asm/system_32.h
arch/sparc/kernel/Makefile
arch/sparc/kernel/cpu.c
arch/sparc/kernel/head_32.S
arch/sparc/kernel/idprom.c
arch/sparc/kernel/irq_32.c
arch/sparc/kernel/setup_32.c
arch/sparc/mm/Makefile
arch/sparc/mm/init_32.c
arch/sparc/mm/loadmmu.c
@@ -15,7 +15,7 @@
 /* Current number of machines we know about that has an IDPROM
  * machtype entry including one entry for the 0x80 OBP machines.
  */
-#define NUM_SUN_MACHINES   15
+#define NUM_SUN_MACHINES   16
  
 /* The machine type in the idprom area looks like this:
  *
@@ -30,6 +30,7 @@
  
 #define SM_ARCH_MASK  0xf0
 #define SM_SUN4       0x20
+#define  M_LEON       0x30
 #define SM_SUN4C      0x50
 #define SM_SUN4M      0x70
 #define SM_SUN4M_OBP  0x80
@@ -40,6 +41,9 @@
 #define SM_4_110      0x02    /* Sun 4/100 series */
 #define SM_4_330      0x03    /* Sun 4/300 series */
 #define SM_4_470      0x04    /* Sun 4/400 series */
+
+/* Leon machines */
+#define M_LEON3_SOC   0x02    /* Leon3 SoC */
  
 /* Sun4c machines                Full Name              - PROM NAME */
 #define SM_4C_SS1     0x01    /* Sun4c SparcStation 1   - Sun 4/60  */
@@ -267,6 +267,7 @@
  
 }
  
+#ifndef CONFIG_SPARC_LEON
 static inline unsigned long srmmu_hwprobe(unsigned long vaddr)
 {
 	unsigned long retval;
@@ -278,6 +279,9 @@
  
 	return retval;
 }
+#else
+#define srmmu_hwprobe(addr) (srmmu_swprobe(addr, 0) & SRMMU_PTE_PMASK)
+#endif
  
 static inline int
 srmmu_get_pte (unsigned long addr)
@@ -118,6 +118,9 @@
 extern char *of_console_path;
 extern char *of_console_options;
  
+extern void (*prom_build_more)(struct device_node *dp, struct device_node ***nextp);
+extern char *build_full_name(struct device_node *dp);
+
 #endif /* __KERNEL__ */
 #endif /* _SPARC_PROM_H */
@@ -32,6 +32,7 @@
   sun4u       = 0x05, /* V8 ploos ploos */
   sun_unknown = 0x06,
   ap1000      = 0x07, /* almost a sun4m */
+  sparc_leon  = 0x08, /* Leon SoC */
 };
  
 /* Really, userland should not be looking at any of this... */
@@ -41,6 +41,8 @@
 obj-y                   += of_device_$(BITS).o
 obj-$(CONFIG_SPARC64)   += prom_irqtrans.o
  
+obj-$(CONFIG_SPARC_LEON)+= leon_kernel.o
+
 obj-$(CONFIG_SPARC64)   += reboot.o
 obj-$(CONFIG_SPARC64)   += sysfs.o
 obj-$(CONFIG_SPARC64)   += iommu.o
@@ -312,7 +312,12 @@
  
 	psr = get_psr();
 	put_psr(psr | PSR_EF);
+#ifdef CONFIG_SPARC_LEON
+	fpu_vers = 7;
+#else
 	fpu_vers = ((get_fsr() >> 17) & 0x7);
+#endif
+
 	put_psr(psr);
  
 	set_cpu_and_fpu(psr_impl, psr_vers, fpu_vers);
@@ -809,6 +809,11 @@
 		 nop
  
 got_prop:
+#ifdef CONFIG_SPARC_LEON
+	        /* no cpu-type check is needed, it is a SPARC-LEON */
+		ba sun4c_continue_boot
+		 nop
+#endif
 		set	cputypval, %o2
 		ldub	[%o2 + 0x4], %l1
  
@@ -31,6 +31,8 @@
 { .name = "Sun 4/200 Series",        .id_machtype = (SM_SUN4 | SM_4_260) },
 { .name = "Sun 4/300 Series",        .id_machtype = (SM_SUN4 | SM_4_330) },
 { .name = "Sun 4/400 Series",        .id_machtype = (SM_SUN4 | SM_4_470) },
+/* Now Leon */
+{ .name = "Leon3 System-on-a-Chip",  .id_machtype = (M_LEON | M_LEON3_SOC) },
 /* Now, Sun4c's */
 { .name = "Sun4c SparcStation 1",    .id_machtype = (SM_SUN4C | SM_4C_SS1) },
 { .name = "Sun4c SparcStation IPC",  .id_machtype = (SM_SUN4C | SM_4C_IPC) },
@@ -45,6 +45,7 @@
 #include <asm/pcic.h>
 #include <asm/cacheflush.h>
 #include <asm/irq_regs.h>
+#include <asm/leon.h>
  
 #include "kernel.h"
 #include "irq.h"
@@ -659,6 +660,10 @@
  
 	case sun4d:
 		sun4d_init_IRQ();
+		break;
+
+	case sparc_leon:
+		leon_init_IRQ();
 		break;
  
 	default:
@@ -235,6 +235,8 @@
 		sparc_cpu_model = sun4e;
 	if (!strcmp(&cputypval,"sun4u"))
 		sparc_cpu_model = sun4u;
+	if (!strncmp(&cputypval, "leon" , 4))
+		sparc_cpu_model = sparc_leon;
  
 	printk("ARCH: ");
 	switch(sparc_cpu_model) {
@@ -255,6 +257,9 @@
 		break;
 	case sun4u:
 		printk("SUN4U\n");
+		break;
+	case sparc_leon:
+		printk("LEON\n");
 		break;
 	default:
 		printk("UNKNOWN!\n");
@@ -11,6 +11,7 @@
 obj-y                   += generic_$(BITS).o
 obj-$(CONFIG_SPARC32)   += extable.o btfixup.o srmmu.o iommu.o io-unit.o
 obj-$(CONFIG_SPARC32)   += hypersparc.o viking.o tsunami.o swift.o
+obj-$(CONFIG_SPARC_LEON)+= leon_mm.o
  
 # Only used by sparc64
 obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
@@ -34,6 +34,7 @@
 #include <asm/pgalloc.h>	/* bug in asm-generic/tlb.h: check_pgt_cache */
 #include <asm/tlb.h>
 #include <asm/prom.h>
+#include <asm/leon.h>
  
 DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
  
@@ -326,6 +327,9 @@
 		sparc_unmapped_base = 0xe0000000;
 		BTFIXUPSET_SETHI(sparc_unmapped_base, 0xe0000000);
 		break;
+	case sparc_leon:
+		leon_init();
+		/* fall through */
 	case sun4m:
 	case sun4d:
 		srmmu_paging_init();
@@ -33,6 +33,7 @@
 		break;
 	case sun4m:
 	case sun4d:
+	case sparc_leon:
 		ld_mmu_srmmu();
 		break;
 	default:
...	...	@@ -15,7 +15,7 @@
15	15	/* Current number of machines we know about that has an IDPROM
16	16	* machtype entry including one entry for the 0x80 OBP machines.
17	17	*/
18		-#define NUM_SUN_MACHINES 15
	18	+#define NUM_SUN_MACHINES 16
19	19
20	20	/* The machine type in the idprom area looks like this:
21	21	*
...	...	@@ -30,6 +30,7 @@
30	30
31	31	#define SM_ARCH_MASK 0xf0
32	32	#define SM_SUN4 0x20
	33	+#define M_LEON 0x30
33	34	#define SM_SUN4C 0x50
34	35	#define SM_SUN4M 0x70
35	36	#define SM_SUN4M_OBP 0x80
...	...	@@ -40,6 +41,9 @@
40	41	#define SM_4_110 0x02 /* Sun 4/100 series */
41	42	#define SM_4_330 0x03 /* Sun 4/300 series */
42	43	#define SM_4_470 0x04 /* Sun 4/400 series */
	44	+
	45	+/* Leon machines */
	46	+#define M_LEON3_SOC 0x02 /* Leon3 SoC */
43	47
44	48	/* Sun4c machines Full Name - PROM NAME */
45	49	#define SM_4C_SS1 0x01 /* Sun4c SparcStation 1 - Sun 4/60 */
...	...	@@ -267,6 +267,7 @@
267	267
268	268	}
269	269
	270	+#ifndef CONFIG_SPARC_LEON
270	271	static inline unsigned long srmmu_hwprobe(unsigned long vaddr)
271	272	{
272	273	unsigned long retval;
...	...	@@ -278,6 +279,9 @@
278	279
279	280	return retval;
280	281	}
	282	+#else
	283	+#define srmmu_hwprobe(addr) (srmmu_swprobe(addr, 0) & SRMMU_PTE_PMASK)
	284	+#endif
281	285
282	286	static inline int
283	287	srmmu_get_pte (unsigned long addr)
...	...	@@ -118,6 +118,9 @@
118	118	extern char *of_console_path;
119	119	extern char *of_console_options;
120	120
	121	+extern void (prom_build_more)(struct device_node dp, struct device_node ***nextp);
	122	+extern char build_full_name(struct device_node dp);
	123	+
121	124	#endif /* __KERNEL__ */
122	125	#endif /* _SPARC_PROM_H */
...	...	@@ -32,6 +32,7 @@
32	32	sun4u = 0x05, /* V8 ploos ploos */
33	33	sun_unknown = 0x06,
34	34	ap1000 = 0x07, /* almost a sun4m */
	35	+ sparc_leon = 0x08, /* Leon SoC */
35	36	};
36	37
37	38	/* Really, userland should not be looking at any of this... */
...	...	@@ -41,6 +41,8 @@
41	41	obj-y += of_device_$(BITS).o
42	42	obj-$(CONFIG_SPARC64) += prom_irqtrans.o
43	43
	44	+obj-$(CONFIG_SPARC_LEON)+= leon_kernel.o
	45	+
44	46	obj-$(CONFIG_SPARC64) += reboot.o
45	47	obj-$(CONFIG_SPARC64) += sysfs.o
46	48	obj-$(CONFIG_SPARC64) += iommu.o
...	...	@@ -312,7 +312,12 @@
312	312
313	313	psr = get_psr();
314	314	put_psr(psr \| PSR_EF);
	315	+#ifdef CONFIG_SPARC_LEON
	316	+ fpu_vers = 7;
	317	+#else
315	318	fpu_vers = ((get_fsr() >> 17) & 0x7);
	319	+#endif
	320	+
316	321	put_psr(psr);
317	322
318	323	set_cpu_and_fpu(psr_impl, psr_vers, fpu_vers);
...	...	@@ -809,6 +809,11 @@
809	809	nop
810	810
811	811	got_prop:
	812	+#ifdef CONFIG_SPARC_LEON
	813	+ /* no cpu-type check is needed, it is a SPARC-LEON */
	814	+ ba sun4c_continue_boot
	815	+ nop
	816	+#endif
812	817	set cputypval, %o2
813	818	ldub [%o2 + 0x4], %l1
814	819
...	...	@@ -31,6 +31,8 @@
31	31	{ .name = "Sun 4/200 Series", .id_machtype = (SM_SUN4 \| SM_4_260) },
32	32	{ .name = "Sun 4/300 Series", .id_machtype = (SM_SUN4 \| SM_4_330) },
33	33	{ .name = "Sun 4/400 Series", .id_machtype = (SM_SUN4 \| SM_4_470) },
	34	+/* Now Leon */
	35	+{ .name = "Leon3 System-on-a-Chip", .id_machtype = (M_LEON \| M_LEON3_SOC) },
34	36	/* Now, Sun4c's */
35	37	{ .name = "Sun4c SparcStation 1", .id_machtype = (SM_SUN4C \| SM_4C_SS1) },
36	38	{ .name = "Sun4c SparcStation IPC", .id_machtype = (SM_SUN4C \| SM_4C_IPC) },
...	...	@@ -45,6 +45,7 @@
45	45	#include <asm/pcic.h>
46	46	#include <asm/cacheflush.h>
47	47	#include <asm/irq_regs.h>
	48	+#include <asm/leon.h>
48	49
49	50	#include "kernel.h"
50	51	#include "irq.h"
...	...	@@ -659,6 +660,10 @@
659	660
660	661	case sun4d:
661	662	sun4d_init_IRQ();
	663	+ break;
	664	+
	665	+ case sparc_leon:
	666	+ leon_init_IRQ();
662	667	break;
663	668
664	669	default:
...	...	@@ -235,6 +235,8 @@
235	235	sparc_cpu_model = sun4e;
236	236	if (!strcmp(&cputypval,"sun4u"))
237	237	sparc_cpu_model = sun4u;
	238	+ if (!strncmp(&cputypval, "leon" , 4))
	239	+ sparc_cpu_model = sparc_leon;
238	240
239	241	printk("ARCH: ");
240	242	switch(sparc_cpu_model) {
...	...	@@ -255,6 +257,9 @@
255	257	break;
256	258	case sun4u:
257	259	printk("SUN4U\n");
	260	+ break;
	261	+ case sparc_leon:
	262	+ printk("LEON\n");
258	263	break;
259	264	default:
260	265	printk("UNKNOWN!\n");