Introduce the sparc-leon CPU type.
PATCH 3/7 Introduce the sparc-leon CPU type.
From 6452f2ae1e76df7593175c73bd5248dbcbf5d212 Mon Sep 17 00:00:00 2001
From: Konrad Eisele <[email protected]>
Date: Tue, 9 Jun 2009 12:57:32 +0200
Subject: [PATCH 3/7] 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_LEON is defined. Add sparc_leon dependent initialization to switch statements + head.S.
--- arch/sparc/include/asm/machines.h | 6 +++++- arch/sparc/include/asm/system_32.h | 1 + arch/sparc/kernel/Makefile | 2 ++ arch/sparc/kernel/cpu.c | 5 +++++ arch/sparc/kernel/head_32.S | 8 ++++++++ arch/sparc/kernel/idprom.c | 2 ++ arch/sparc/kernel/irq_32.c | 5 +++++ arch/sparc/kernel/setup_32.c | 5 +++++ arch/sparc/mm/Makefile | 1 + arch/sparc/mm/init_32.c | 1 + arch/sparc/mm/loadmmu.c | 1 + 11 files changed, 36 insertions(+), 1 deletions(-)
arch/sparc/include/asm/machines.h +5 -1
@@ -15,7 +15,7 @@ struct Sun_Machine_Models {/* 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 NUM_SUN_MACHINES 15#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
@@ -41,6 +42,9 @@ #define SM_4_110 0x02 /* Sun 4/1#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 */ #define SM_4C_IPC 0x02/* Sun4c SparcStation IPC - Sun 4/40 */
arch/sparc/include/asm/system_32.h +1 -0
@@ -32,6 +32,7 @@ enum sparc_cpu { 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... */
arch/sparc/kernel/Makefile +2 -0
@@ -40,6 +40,8 @@ obj-y += prom_$(BITS). obj-y += of_device_$(BITS).o obj-$(CONFIG_SPARC64) += prom_irqtrans.o +obj-$(CONFIG_LEON) += leon.o + obj-$(CONFIG_SPARC64) += reboot.o obj-$(CONFIG_SPARC64) += sysfs.o obj-$(CONFIG_SPARC64) += iommu.o
arch/sparc/kernel/cpu.c +5 -0
@@ -312,7 +312,12 @@ void __cpuinit cpu_probe(void) psr =get_psr ();put_psr (psr |PSR_EF ); +#ifdef CONFIG_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);
arch/sparc/kernel/head_32.S +8 -0
@@ -814,6 +814,10 @@ got_prop: cmp %l1, ' ' be 1f +#if defined(CONFIG_LEON) + cmp %l1, '2' ! leon2 or compatible + be 1f +#endif cmp %l1, 'c' be 1f cmp %l1, 'm'
@@ -836,6 +840,10 @@ got_prop: be sun4m_init cmp %l1, 'd' ! Let us see how the beast will die be sun4d_init +#if defined(CONFIG_LEON) + cmp %l1, '2' ! leon2 or compatible + be sun4c_continue_boot +#endif nop /* Jump into mmu context zero. */
arch/sparc/kernel/idprom.c +2 -0
@@ -31,6 +31,8 @@ static struct Sun_Machine_Models Sun_Mac { .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 */ +{ "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) },
arch/sparc/kernel/irq_32.c +5 -0
@@ -639,6 +639,7 @@ void __init init_IRQ(void)extern void sun4c_init_IRQ (void );extern void sun4m_init_IRQ (void );extern void sun4d_init_IRQ (void ); +extern void leon_init_IRQ (void );switch (sparc_cpu_model) {case sun4c:
@@ -661,6 +662,10 @@ #endifsun4d_init_IRQ ();break ; +case sparc_leon: +leon_init_IRQ (); +break ; +default :prom_printf ("Cannot initialize IRQs on this Sun machine..." );break ;
arch/sparc/kernel/setup_32.c +5 -0
@@ -235,6 +235,8 @@ void __init setup_arch(char **cmdline_p) sparc_cpu_model = sun4e;if (!strcmp (&cputypval,"sun4u" )) sparc_cpu_model = sun4u; +if (!strcmp (&cputypval,"leon2" )) + sparc_cpu_model = sparc_leon;printk ("ARCH: " );switch (sparc_cpu_model) {
@@ -256,6 +258,9 @@ void __init setup_arch(char **cmdline_p)case sun4u:printk ("SUN4U\n" );break ; +case sparc_leon: +printk ("LEON\n" ); +break ;default :printk ("UNKNOWN!\n" );break ;
arch/sparc/mm/Makefile +1 -0
@@ -11,6 +11,7 @@ obj-$(CONFIG_SPARC32) += loadmmu.o 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_LEON) += leon.o # Only used by sparc64 obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
arch/sparc/mm/init_32.c +1 -0
@@ -328,6 +328,7 @@ void __init paging_init(void)break ;case sun4m:case sun4d: +case sparc_leon:srmmu_paging_init (); sparc_unmapped_base =0x50000000 ;BTFIXUPSET_SETHI (sparc_unmapped_base,0x50000000 );
arch/sparc/mm/loadmmu.c +1 -0
@@ -33,6 +33,7 @@ void __init load_mmu(void)break ;case sun4m:case sun4d: +case sparc_leon:ld_mmu_srmmu ();break ;default :
Signature · 1 line
1.4.2.1
From 6452f2ae1e76df7593175c73bd5248dbcbf5d212 Mon Sep 17 00:00:00 2001
From: Konrad Eisele <[email protected]>
Date: Tue, 9 Jun 2009 12:57:32 +0200
Subject: [PATCH 3/7] 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_LEON is defined. Add sparc_leon dependent initialization to switch statements + head.S.
--- arch/sparc/include/asm/machines.h | 6 +++++- arch/sparc/include/asm/system_32.h | 1 + arch/sparc/kernel/Makefile | 2 ++ arch/sparc/kernel/cpu.c | 5 +++++ arch/sparc/kernel/head_32.S | 8 ++++++++ arch/sparc/kernel/idprom.c | 2 ++ arch/sparc/kernel/irq_32.c | 5 +++++ arch/sparc/kernel/setup_32.c | 5 +++++ arch/sparc/mm/Makefile | 1 + arch/sparc/mm/init_32.c | 1 + arch/sparc/mm/loadmmu.c | 1 + 11 files changed, 36 insertions(+), 1 deletions(-)
arch/sparc/include/asm/machines.h +5 -1
@@ -15,7 +15,7 @@ struct Sun_Machine_Models {/* 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 NUM_SUN_MACHINES 15#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
@@ -41,6 +42,9 @@ #define SM_4_110 0x02 /* Sun 4/1#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 */ #define SM_4C_IPC 0x02/* Sun4c SparcStation IPC - Sun 4/40 */
arch/sparc/include/asm/system_32.h +1 -0
@@ -32,6 +32,7 @@ enum sparc_cpu { 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... */
arch/sparc/kernel/Makefile +2 -0
@@ -40,6 +40,8 @@ obj-y += prom_$(BITS). obj-y += of_device_$(BITS).o obj-$(CONFIG_SPARC64) += prom_irqtrans.o +obj-$(CONFIG_LEON) += leon.o + obj-$(CONFIG_SPARC64) += reboot.o obj-$(CONFIG_SPARC64) += sysfs.o obj-$(CONFIG_SPARC64) += iommu.o
arch/sparc/kernel/cpu.c +5 -0
@@ -312,7 +312,12 @@ void __cpuinit cpu_probe(void) psr =get_psr ();put_psr (psr |PSR_EF ); +#ifdef CONFIG_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);
arch/sparc/kernel/head_32.S +8 -0
@@ -814,6 +814,10 @@ got_prop: cmp %l1, ' ' be 1f +#if defined(CONFIG_LEON) + cmp %l1, '2' ! leon2 or compatible + be 1f +#endif cmp %l1, 'c' be 1f cmp %l1, 'm'
@@ -836,6 +840,10 @@ got_prop: be sun4m_init cmp %l1, 'd' ! Let us see how the beast will die be sun4d_init +#if defined(CONFIG_LEON) + cmp %l1, '2' ! leon2 or compatible + be sun4c_continue_boot +#endif nop /* Jump into mmu context zero. */
arch/sparc/kernel/idprom.c +2 -0
@@ -31,6 +31,8 @@ static struct Sun_Machine_Models Sun_Mac { .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 */ +{ "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) },
arch/sparc/kernel/irq_32.c +5 -0
@@ -639,6 +639,7 @@ void __init init_IRQ(void)extern void sun4c_init_IRQ (void );extern void sun4m_init_IRQ (void );extern void sun4d_init_IRQ (void ); +extern void leon_init_IRQ (void );switch (sparc_cpu_model) {case sun4c:
@@ -661,6 +662,10 @@ #endifsun4d_init_IRQ ();break ; +case sparc_leon: +leon_init_IRQ (); +break ; +default :prom_printf ("Cannot initialize IRQs on this Sun machine..." );break ;
arch/sparc/kernel/setup_32.c +5 -0
@@ -235,6 +235,8 @@ void __init setup_arch(char **cmdline_p) sparc_cpu_model = sun4e;if (!strcmp (&cputypval,"sun4u" )) sparc_cpu_model = sun4u; +if (!strcmp (&cputypval,"leon2" )) + sparc_cpu_model = sparc_leon;printk ("ARCH: " );switch (sparc_cpu_model) {
@@ -256,6 +258,9 @@ void __init setup_arch(char **cmdline_p)case sun4u:printk ("SUN4U\n" );break ; +case sparc_leon: +printk ("LEON\n" ); +break ;default :printk ("UNKNOWN!\n" );break ;
arch/sparc/mm/Makefile +1 -0
@@ -11,6 +11,7 @@ obj-$(CONFIG_SPARC32) += loadmmu.o 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_LEON) += leon.o # Only used by sparc64 obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
arch/sparc/mm/init_32.c +1 -0
@@ -328,6 +328,7 @@ void __init paging_init(void)break ;case sun4m:case sun4d: +case sparc_leon:srmmu_paging_init (); sparc_unmapped_base =0x50000000 ;BTFIXUPSET_SETHI (sparc_unmapped_base,0x50000000 );
arch/sparc/mm/loadmmu.c +1 -0
@@ -33,6 +33,7 @@ void __init load_mmu(void)break ;case sun4m:case sun4d: +case sparc_leon:ld_mmu_srmmu ();break ;default :
Signature · 1 line
1.4.2.1
Quoted 192 lines · Konrad Eisele
From
6452f2ae1e76df7593175c73bd5248dbcbf5d212Mon Sep 17 00:00:00 2001
From: Konrad Eisele <[email protected]>
Date: Tue, 9 Jun 2009 12:57:32 +0200
Subject: [PATCH 3/7] Introduce the sparc-leon CPU type. Addsparc_leonenum, M_LEON|M_LEON3_SOC machine. Add compilation ofleon.c
in mm and kernel ifCONFIG_LEONis defined. Addsparc_leondependent initialization to switch statements +head.S.Signed-off-by Konrad Eisele <[email protected]>--- arch/sparc/include/asm/machines.h | 6 +++++- arch/sparc/include/asm/system_32.h | 1 + arch/sparc/kernel/Makefile | 2 ++ arch/sparc/kernel/cpu.c | 5 +++++ arch/sparc/kernel/head_32.S | 8 ++++++++ arch/sparc/kernel/idprom.c | 2 ++ arch/sparc/kernel/irq_32.c | 5 +++++ arch/sparc/kernel/setup_32.c | 5 +++++ arch/sparc/mm/Makefile | 1 + arch/sparc/mm/init_32.c | 1 + arch/sparc/mm/loadmmu.c | 1 + 11 files changed, 36 insertions(+), 1 deletions(-)arch/sparc/include/asm/machines.h +5
-1@@ -15,7 +15,7 @@ struct Sun_Machine_Models {/* 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 NUM_SUN_MACHINES 15#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@@ -41,6 +42,9 @@ #define SM_4_110 0x02 /* Sun 4/1#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 */ #define SM_4C_IPC 0x02/* Sun4c SparcStation IPC - Sun 4/40 */ arch/sparc/include/asm/system_32.h +1
-0@@ -32,6 +32,7 @@ enum sparc_cpu { 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... */ arch/sparc/kernel/Makefile +2
-0@@ -40,6 +40,8 @@ obj-y += prom_$(BITS). obj-y += of_device_$(BITS).o obj-$(CONFIG_SPARC64) += prom_irqtrans.o +obj-$(CONFIG_LEON) += leon.o + obj-$(CONFIG_SPARC64) += reboot.o obj-$(CONFIG_SPARC64) += sysfs.o obj-$(CONFIG_SPARC64) += iommu.oarch/sparc/kernel/cpu.c +5
-0@@ -312,7 +312,12 @@ void __cpuinit cpu_probe(void) psr =get_psr ();put_psr (psr |PSR_EF ); +#ifdef CONFIG_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);arch/sparc/kernel/head_32.S +8
-0@@ -814,6 +814,10 @@ got_prop: cmp %l1, ' ' be 1f +#if defined(CONFIG_LEON) + cmp %l1, '2' ! leon2 or compatible + be 1f +#endif cmp %l1, 'c' be 1f cmp %l1, 'm'@@ -836,6 +840,10 @@ got_prop: be sun4m_init cmp %l1, 'd' ! Let us see how the beast will die be sun4d_init +#if defined(CONFIG_LEON) + cmp %l1, '2' ! leon2 or compatible + be sun4c_continue_boot +#endif noparch/sparc/kernel/head_32.S +0
-0/* Jump into mmu context zero. */arch/sparc/kernel/idprom.c +2
-0@@ -31,6 +31,8 @@ static struct Sun_Machine_Models Sun_Mac { .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 */ +{ "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) },arch/sparc/kernel/irq_32.c +5
-0@@ -639,6 +639,7 @@ void __init init_IRQ(void)extern void sun4c_init_IRQ (void );extern void sun4m_init_IRQ (void );extern void sun4d_init_IRQ (void ); +extern void leon_init_IRQ (void );switch (sparc_cpu_model) {case sun4c:@@ -661,6 +662,10 @@ #endifsun4d_init_IRQ ();break ; +case sparc_leon: +leon_init_IRQ (); +break ; +default :prom_printf ("Cannot initialize IRQs on this Sun machine..." );break ;arch/sparc/kernel/setup_32.c +5
-0@@ -235,6 +235,8 @@ void __init setup_arch(char **cmdline_p) sparc_cpu_model = sun4e;if (!strcmp (&cputypval,"sun4u" )) sparc_cpu_model = sun4u; +if (!strcmp (&cputypval,"leon2" )) + sparc_cpu_model = sparc_leon;printk ("ARCH: " );switch (sparc_cpu_model) {@@ -256,6 +258,9 @@ void __init setup_arch(char **cmdline_p)case sun4u:printk ("SUN4U\n" );break ; +case sparc_leon: +printk ("LEON\n" ); +break ;default :printk ("UNKNOWN!\n" );break ;arch/sparc/mm/Makefile +0
-0
arch/sparc/mm/Makefile obj-$(CONFIG_SPARC32) += loadmmu.o · line 14
Quoted 4 lines
arch/sparc/mm/Makefile +1
-0@@ -11,6 +11,7 @@ obj-$(CONFIG_SPARC32) += loadmmu.o 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_LEON) += leon.o
We have two leon.c (+leon.o), this is confusing.
Consider a better naming scheme.
leon_mm.c, leon_kernel.c for example.
PATCH 3/7 Introduce the sparc-leon CPU type. Add sparc_leon enum,
In reply to Konrad EiseleFrom: Konrad Eisele <[email protected]>
Quoted 4 lines
We have two
leon.c(+leon.o), this is confusing.
Consider a better naming scheme.
leon_mm.c,leon_kernel.cfor example.
Changed to leon_m.c and leon_k.c
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.
--- arch/sparc/include/asm/machines.h | 6 +++++- arch/sparc/include/asm/system_32.h | 1 + arch/sparc/kernel/Makefile | 2 ++ arch/sparc/kernel/cpu.c | 5 +++++ arch/sparc/kernel/head_32.S | 8 ++++++++ arch/sparc/kernel/idprom.c | 2 ++ arch/sparc/kernel/irq_32.c | 7 +++++++ arch/sparc/kernel/setup_32.c | 5 +++++ arch/sparc/mm/Makefile | 1 + arch/sparc/mm/init_32.c | 1 + arch/sparc/mm/loadmmu.c | 1 + 11 files changed, 38 insertions(+), 1 deletions(-)
arch/sparc/include/asm/machines.h +5 -1
@@ -15,7 +15,7 @@ struct Sun_Machine_Models {/* 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 NUM_SUN_MACHINES 15#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
@@ -41,6 +42,9 @@ #define SM_4_110 0x02 /* Sun 4/1#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 */ #define SM_4C_IPC 0x02/* Sun4c SparcStation IPC - Sun 4/40 */
arch/sparc/include/asm/system_32.h +1 -0
@@ -32,6 +32,7 @@ enum sparc_cpu { 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... */
arch/sparc/kernel/Makefile +2 -0
@@ -40,6 +40,8 @@ obj-y += prom_$(BITS). obj-y += of_device_$(BITS).o obj-$(CONFIG_SPARC64) += prom_irqtrans.o +obj-$(CONFIG_SPARC_LEON)+= leon_k.o + obj-$(CONFIG_SPARC64) += reboot.o obj-$(CONFIG_SPARC64) += sysfs.o obj-$(CONFIG_SPARC64) += iommu.o
arch/sparc/kernel/cpu.c +5 -0
@@ -312,7 +312,12 @@ void __cpuinit cpu_probe(void) 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);
arch/sparc/kernel/head_32.S +8 -0
@@ -814,6 +814,10 @@ got_prop: cmp %l1, ' ' be 1f +#ifdef CONFIG_SPARC_LEON + cmp %l1, '2' ! leon2 or compatible + be 1f +#endif cmp %l1, 'c' be 1f cmp %l1, 'm'
@@ -836,6 +840,10 @@ got_prop: be sun4m_init cmp %l1, 'd' ! Let us see how the beast will die be sun4d_init +#ifdef CONFIG_SPARC_LEON + cmp %l1, '2' ! leon2 or compatible + be sun4c_continue_boot +#endif nop /* Jump into mmu context zero. */
arch/sparc/kernel/idprom.c +2 -0
@@ -31,6 +31,8 @@ static struct Sun_Machine_Models Sun_Mac { .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 */ +{ "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) },
arch/sparc/kernel/irq_32.c +7 -0
@@ -639,6 +639,7 @@ void __init init_IRQ(void)extern void sun4c_init_IRQ (void );extern void sun4m_init_IRQ (void );extern void sun4d_init_IRQ (void ); +extern void leon_init_IRQ (void );switch (sparc_cpu_model) {case sun4c:
@@ -661,6 +662,12 @@ #endifsun4d_init_IRQ ();break ; +#ifdef CONFIG_SPARC_LEON +case sparc_leon: +leon_init_IRQ (); +break ; +#endif +default :prom_printf ("Cannot initialize IRQs on this Sun machine..." );break ;
arch/sparc/kernel/setup_32.c +5 -0
@@ -235,6 +235,8 @@ void __init setup_arch(char **cmdline_p) sparc_cpu_model = sun4e;if (!strcmp (&cputypval,"sun4u" )) sparc_cpu_model = sun4u; +if (!strcmp (&cputypval,"leon2" )) + sparc_cpu_model = sparc_leon;printk ("ARCH: " );switch (sparc_cpu_model) {
@@ -256,6 +258,9 @@ void __init setup_arch(char **cmdline_p)case sun4u:printk ("SUN4U\n" );break ; +case sparc_leon: +printk ("LEON\n" ); +break ;default :printk ("UNKNOWN!\n" );break ;
arch/sparc/mm/Makefile +1 -0
@@ -11,6 +11,7 @@ obj-$(CONFIG_SPARC32) += loadmmu.o 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_m.o # Only used by sparc64 obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
arch/sparc/mm/init_32.c +1 -0
@@ -328,6 +328,7 @@ void __init paging_init(void)break ;case sun4m:case sun4d: +case sparc_leon:srmmu_paging_init (); sparc_unmapped_base =0x50000000 ;BTFIXUPSET_SETHI (sparc_unmapped_base,0x50000000 );
arch/sparc/mm/loadmmu.c +1 -0
@@ -33,6 +33,7 @@ void __init load_mmu(void)break ;case sun4m:case sun4d: +case sparc_leon:ld_mmu_srmmu ();break ;default :
Signature · 1 line
1.4.2.1
Re: [PATCH 3/7] Introduce the sparc-leon CPU type. Add sparc_leon
In reply to Konrad EiseleQuoted 8 lines · On Wed, Jun 10, 2009 at 20:13, <[email protected]> wrote:
From: Konrad Eisele <[email protected]>
Quoted 4 lines
We have two
leon.c(+leon.o), this is confusing.
Consider a better naming scheme.
leon_mm.c,leon_kernel.cfor example.Changed to
leon_m.candleon_k.c
leon_m.c and leon_k.c are significantly better than the original names, however the reason that leon_mm.c and leon_kernel.c were suggested is that one can, at a glance, look at the file name and know what's going on in the file.
Not that these new names are bad, but if you re-spin these patches again, you might want to consider changing them.
Thanks,
Signature · 4 lines
Julian Calaby Email: [email protected] .Plan: http://sites.google.com/site/juliancalaby/
Re: [PATCH 3/7] Introduce the sparc-leon CPU type. Add sparc_leon
In reply to Konrad EiseleQuoted 14 lines · Julian Calaby
Quoted 7 lines · On Wed, Jun 10, 2009 at 20:13, <[email protected]> wrote:
From: Konrad Eisele <[email protected]>
Quoted 4 lines
We have two
leon.c(+leon.o), this is confusing.
Consider a better naming scheme.
leon_mm.c,leon_kernel.cfor example.Changed to
leon_m.candleon_k.c
leon_m.candleon_k.care significantly better than the original names, however the reason thatleon_mm.candleon_kernel.cwere suggested is that one can, at a glance, look at the file name and know what's going on in the file.
Quoted 5 lines
Not that these new names are bad, but if you re-spin these patches again, you might want to consider changing them.
Thanks,
Ok, I can do this. I thought the smaller the better. -- Konrad