[PATCH -mm 1/4] MIPS: Detect BCM947xx CPUs

[PATCH -mm 1/4] MIPS: Detect BCM947xx CPUs

[Aurelien Jarno]

The patch below against 2.6.23-rc1-mm2 adds a few constants for BCM947xx
CPUs and detect them in cpu-probe.c and tlbex.c. Note that the BCM4710 
does not support the wait instruction, this is not a mistake in the 
code.

This part is not dependent of other patches (though useless without 
them), and could already be merged in the current linux-mips git tree.

Cc: Michael Buesch <mb@bu3sch.de>
Cc: Waldemar Brodkorb <wbx@openwrt.org>
Cc: Felix Fietkau <nbd@openwrt.org>
Cc: Florian Schirmer <jolt@tuxbox.org>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -159,6 +159,7 @@
 	case CPU_5KC:
 	case CPU_25KF:
 	case CPU_PR4450:
+	case CPU_BCM3302:
 		cpu_wait = r4k_wait;
 		break;
 
@@ -786,6 +787,22 @@
 }
 
 
+static inline void cpu_probe_broadcom(struct cpuinfo_mips *c)
+{
+	decode_configs(c);
+	switch (c->processor_id & 0xff00) {
+	case PRID_IMP_BCM3302:
+		c->cputype = CPU_BCM3302;
+		break;
+	case PRID_IMP_BCM4710:
+		c->cputype = CPU_BCM4710;
+		break;
+	default:
+		c->cputype = CPU_UNKNOWN;
+		break;
+	}
+}
+
 __init void cpu_probe(void)
 {
 	struct cpuinfo_mips *c = &current_cpu_data;
@@ -808,6 +825,9 @@
 	case PRID_COMP_SIBYTE:
 		cpu_probe_sibyte(c);
 		break;
+	case PRID_COMP_BROADCOM:
+		cpu_probe_broadcom(c);
+		break;
 	case PRID_COMP_SANDCRAFT:
 		cpu_probe_sandcraft(c);
 		break;
--- a/arch/mips/kernel/proc.c	
+++ b/arch/mips/kernel/proc.c
@@ -82,6 +82,8 @@
 	[CPU_VR4181]	= "NEC VR4181",
 	[CPU_VR4181A]	= "NEC VR4181A",
 	[CPU_SR71000]	= "Sandcraft SR71000",
+	[CPU_BCM3302]	= "Broadcom BCM3302",
+	[CPU_BCM4710]	= "Broadcom BCM4710",
 	[CPU_PR4450]	= "Philips PR4450",
 	[CPU_LOONGSON2]	= "ICT Loongson-2",
 };
--- a/arch/mips/mm/tlbex.c	
+++ b/arch/mips/mm/tlbex.c
@@ -893,6 +893,8 @@
 	case CPU_4KSC:
 	case CPU_20KC:
 	case CPU_25KF:
+ 	case CPU_BCM3302:
+ 	case CPU_BCM4710:
 	case CPU_LOONGSON2:
 		tlbw(p);
 		break;
--- a/include/asm-mips/bootinfo.h
+++ b/include/asm-mips/bootinfo.h
@@ -221,6 +221,12 @@
 #define MACH_GROUP_WINDRIVER   28	/* Windriver boards */
 #define MACH_WRPPMC             1
 
+/*
+ * Valid machtype for group Broadcom
+ */
+#define MACH_GROUP_BRCM		23	/* Broadcom			*/
+#define  MACH_BCM947XX		1	/* Broadcom BCM947xx		*/
+
 #define CL_SIZE			COMMAND_LINE_SIZE
 
 const char *get_system_type(void);
--- a/include/asm-mips/cpu.h	
+++ b/include/asm-mips/cpu.h
@@ -106,6 +106,13 @@
 #define PRID_IMP_SR71000        0x0400
 
 /*
+ * These are the PRID's for when 23:16 == PRID_COMP_BROADCOM
+ */
+
+#define PRID_IMP_BCM4710	0x4000
+#define PRID_IMP_BCM3302	0x9000
+
+/*
  * Definitions for 7:0 on legacy processors
  */
 
@@ -217,8 +224,9 @@
 #define CPU_R14000		64
 #define CPU_LOONGSON1           65
 #define CPU_LOONGSON2           66
-
-#define CPU_LAST		66
+#define CPU_BCM3302		67
+#define CPU_BCM4710		68
+#define CPU_LAST		68
 
 /*
  * ISA Level encodings

-- 
  .''`.  Aurelien Jarno	            | GPG: 1024D/F1BCDB73
 : :' :  Debian developer           | Electrical Engineer
 `. `'   aurel32@debian.org         | aurelien@aurel32.net
   `-    people.debian.org/~aurel32 | www.aurel32.net

Re: [PATCH -mm 1/4] MIPS: Detect BCM947xx CPUs

[Michael Buesch]

On Monday 06 August 2007, Aurelien Jarno wrote:
> The patch below against 2.6.23-rc1-mm2 adds a few constants for BCM947xx
> CPUs and detect them in cpu-probe.c and tlbex.c. Note that the BCM4710 
> does not support the wait instruction, this is not a mistake in the 
> code.
> 
> This part is not dependent of other patches (though useless without 
> them), and could already be merged in the current linux-mips git tree.
> 
> Cc: Michael Buesch <mb@bu3sch.de>
> Cc: Waldemar Brodkorb <wbx@openwrt.org>
> Cc: Felix Fietkau <nbd@openwrt.org>
> Cc: Florian Schirmer <jolt@tuxbox.org>
> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

Acked-by: Michael Buesch <mb@bu3sch.de>

For Andrew: This is the arch code, which actually uses the
ssb-mips code we introduced earlier.

> --- a/arch/mips/kernel/cpu-probe.c
> +++ b/arch/mips/kernel/cpu-probe.c
> @@ -159,6 +159,7 @@
>  	case CPU_5KC:
>  	case CPU_25KF:
>  	case CPU_PR4450:
> +	case CPU_BCM3302:
>  		cpu_wait = r4k_wait;
>  		break;
>  
> @@ -786,6 +787,22 @@
>  }
>  
>  
> +static inline void cpu_probe_broadcom(struct cpuinfo_mips *c)
> +{
> +	decode_configs(c);
> +	switch (c->processor_id & 0xff00) {
> +	case PRID_IMP_BCM3302:
> +		c->cputype = CPU_BCM3302;
> +		break;
> +	case PRID_IMP_BCM4710:
> +		c->cputype = CPU_BCM4710;
> +		break;
> +	default:
> +		c->cputype = CPU_UNKNOWN;
> +		break;
> +	}
> +}
> +
>  __init void cpu_probe(void)
>  {
>  	struct cpuinfo_mips *c = &current_cpu_data;
> @@ -808,6 +825,9 @@
>  	case PRID_COMP_SIBYTE:
>  		cpu_probe_sibyte(c);
>  		break;
> +	case PRID_COMP_BROADCOM:
> +		cpu_probe_broadcom(c);
> +		break;
>  	case PRID_COMP_SANDCRAFT:
>  		cpu_probe_sandcraft(c);
>  		break;
> --- a/arch/mips/kernel/proc.c	
> +++ b/arch/mips/kernel/proc.c
> @@ -82,6 +82,8 @@
>  	[CPU_VR4181]	= "NEC VR4181",
>  	[CPU_VR4181A]	= "NEC VR4181A",
>  	[CPU_SR71000]	= "Sandcraft SR71000",
> +	[CPU_BCM3302]	= "Broadcom BCM3302",
> +	[CPU_BCM4710]	= "Broadcom BCM4710",
>  	[CPU_PR4450]	= "Philips PR4450",
>  	[CPU_LOONGSON2]	= "ICT Loongson-2",
>  };
> --- a/arch/mips/mm/tlbex.c	
> +++ b/arch/mips/mm/tlbex.c
> @@ -893,6 +893,8 @@
>  	case CPU_4KSC:
>  	case CPU_20KC:
>  	case CPU_25KF:
> + 	case CPU_BCM3302:
> + 	case CPU_BCM4710:
>  	case CPU_LOONGSON2:
>  		tlbw(p);
>  		break;
> --- a/include/asm-mips/bootinfo.h
> +++ b/include/asm-mips/bootinfo.h
> @@ -221,6 +221,12 @@
>  #define MACH_GROUP_WINDRIVER   28	/* Windriver boards */
>  #define MACH_WRPPMC             1
>  
> +/*
> + * Valid machtype for group Broadcom
> + */
> +#define MACH_GROUP_BRCM		23	/* Broadcom			*/
> +#define  MACH_BCM947XX		1	/* Broadcom BCM947xx		*/
> +
>  #define CL_SIZE			COMMAND_LINE_SIZE
>  
>  const char *get_system_type(void);
> --- a/include/asm-mips/cpu.h	
> +++ b/include/asm-mips/cpu.h
> @@ -106,6 +106,13 @@
>  #define PRID_IMP_SR71000        0x0400
>  
>  /*
> + * These are the PRID's for when 23:16 == PRID_COMP_BROADCOM
> + */
> +
> +#define PRID_IMP_BCM4710	0x4000
> +#define PRID_IMP_BCM3302	0x9000
> +
> +/*
>   * Definitions for 7:0 on legacy processors
>   */
>  
> @@ -217,8 +224,9 @@
>  #define CPU_R14000		64
>  #define CPU_LOONGSON1           65
>  #define CPU_LOONGSON2           66
> -
> -#define CPU_LAST		66
> +#define CPU_BCM3302		67
> +#define CPU_BCM4710		68
> +#define CPU_LAST		68
>  
>  /*
>   * ISA Level encodings
> 

Re: [PATCH -mm 1/4] MIPS: Detect BCM947xx CPUs

[Florian Schirmer]

Hi,

Aurelien Jarno wrote:
> The patch below against 2.6.23-rc1-mm2 adds a few constants for BCM947xx
> CPUs and detect them in cpu-probe.c and tlbex.c. Note that the BCM4710 
> does not support the wait instruction, this is not a mistake in the 
> code.
>
> This part is not dependent of other patches (though useless without 
> them), and could already be merged in the current linux-mips git tree.
>
> Cc: Michael Buesch <mb@bu3sch.de>
> Cc: Waldemar Brodkorb <wbx@openwrt.org>
> Cc: Felix Fietkau <nbd@openwrt.org>
> Cc: Florian Schirmer <jolt@tuxbox.org>
> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
>
>   

Looks good.

Acked-by: Florian Schirmer <jolt@tuxbox.org>

Best,
  Florian


> --- a/arch/mips/kernel/cpu-probe.c
> +++ b/arch/mips/kernel/cpu-probe.c
> @@ -159,6 +159,7 @@
>  	case CPU_5KC:
>  	case CPU_25KF:
>  	case CPU_PR4450:
> +	case CPU_BCM3302:
>  		cpu_wait = r4k_wait;
>  		break;
>  
> @@ -786,6 +787,22 @@
>  }
>  
>  
> +static inline void cpu_probe_broadcom(struct cpuinfo_mips *c)
> +{
> +	decode_configs(c);
> +	switch (c->processor_id & 0xff00) {
> +	case PRID_IMP_BCM3302:
> +		c->cputype = CPU_BCM3302;
> +		break;
> +	case PRID_IMP_BCM4710:
> +		c->cputype = CPU_BCM4710;
> +		break;
> +	default:
> +		c->cputype = CPU_UNKNOWN;
> +		break;
> +	}
> +}
> +
>  __init void cpu_probe(void)
>  {
>  	struct cpuinfo_mips *c = &current_cpu_data;
> @@ -808,6 +825,9 @@
>  	case PRID_COMP_SIBYTE:
>  		cpu_probe_sibyte(c);
>  		break;
> +	case PRID_COMP_BROADCOM:
> +		cpu_probe_broadcom(c);
> +		break;
>  	case PRID_COMP_SANDCRAFT:
>  		cpu_probe_sandcraft(c);
>  		break;
> --- a/arch/mips/kernel/proc.c	
> +++ b/arch/mips/kernel/proc.c
> @@ -82,6 +82,8 @@
>  	[CPU_VR4181]	= "NEC VR4181",
>  	[CPU_VR4181A]	= "NEC VR4181A",
>  	[CPU_SR71000]	= "Sandcraft SR71000",
> +	[CPU_BCM3302]	= "Broadcom BCM3302",
> +	[CPU_BCM4710]	= "Broadcom BCM4710",
>  	[CPU_PR4450]	= "Philips PR4450",
>  	[CPU_LOONGSON2]	= "ICT Loongson-2",
>  };
> --- a/arch/mips/mm/tlbex.c	
> +++ b/arch/mips/mm/tlbex.c
> @@ -893,6 +893,8 @@
>  	case CPU_4KSC:
>  	case CPU_20KC:
>  	case CPU_25KF:
> + 	case CPU_BCM3302:
> + 	case CPU_BCM4710:
>  	case CPU_LOONGSON2:
>  		tlbw(p);
>  		break;
> --- a/include/asm-mips/bootinfo.h
> +++ b/include/asm-mips/bootinfo.h
> @@ -221,6 +221,12 @@
>  #define MACH_GROUP_WINDRIVER   28	/* Windriver boards */
>  #define MACH_WRPPMC             1
>  
> +/*
> + * Valid machtype for group Broadcom
> + */
> +#define MACH_GROUP_BRCM		23	/* Broadcom			*/
> +#define  MACH_BCM947XX		1	/* Broadcom BCM947xx		*/
> +
>  #define CL_SIZE			COMMAND_LINE_SIZE
>  
>  const char *get_system_type(void);
> --- a/include/asm-mips/cpu.h	
> +++ b/include/asm-mips/cpu.h
> @@ -106,6 +106,13 @@
>  #define PRID_IMP_SR71000        0x0400
>  
>  /*
> + * These are the PRID's for when 23:16 == PRID_COMP_BROADCOM
> + */
> +
> +#define PRID_IMP_BCM4710	0x4000
> +#define PRID_IMP_BCM3302	0x9000
> +
> +/*
>   * Definitions for 7:0 on legacy processors
>   */
>  
> @@ -217,8 +224,9 @@
>  #define CPU_R14000		64
>  #define CPU_LOONGSON1           65
>  #define CPU_LOONGSON2           66
> -
> -#define CPU_LAST		66
> +#define CPU_BCM3302		67
> +#define CPU_BCM4710		68
> +#define CPU_LAST		68
>  
>  /*
>   * ISA Level encodings
>
>