Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e48cd4a authored by Allen Pais's avatar Allen Pais Committed by David S. Miller
Browse files

sparc64: properly name the cpu constants 



Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarAllen Pais <allen.pais@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0a23ea65

arch/sparc/include/asm/spitfire.h

+14 −0
Original line number Original line Diff line number Diff line
@@ -51,6 +51,20 @@ 
#define SUN4V_CHIP_SPARC_SN	0x8b

#define SUN4V_CHIP_SPARC_SN	0x8b

#define SUN4V_CHIP_UNKNOWN	0xff

#define SUN4V_CHIP_UNKNOWN	0xff





/*

 * The following CPU_ID_xxx constants are used

 * to identify the CPU type in the setup phase

 * (see head_64.S)

 */

#define CPU_ID_NIAGARA1		('1')

#define CPU_ID_NIAGARA2		('2')

#define CPU_ID_NIAGARA3		('3')

#define CPU_ID_NIAGARA4		('4')

#define CPU_ID_NIAGARA5		('5')

#define CPU_ID_M6		('6')

#define CPU_ID_M7		('7')

#define CPU_ID_SONOMA1		('N')



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLY__





enum ultra_tlb_layout {

enum ultra_tlb_layout {

arch/sparc/kernel/head_64.S

+8 −8
Original line number Original line Diff line number Diff line
@@ -424,22 +424,22 @@ EXPORT_SYMBOL(sun4v_chip_type) 
	 nop

	 nop





70:	ldub	[%g1 + 7], %g2

70:	ldub	[%g1 + 7], %g2

	cmp	%g2, '3'

	cmp	%g2, CPU_ID_NIAGARA3

	be,pt	%xcc, 5f

	be,pt	%xcc, 5f

	 mov	SUN4V_CHIP_NIAGARA3, %g4

	 mov	SUN4V_CHIP_NIAGARA3, %g4

	cmp	%g2, '4'

	cmp	%g2, CPU_ID_NIAGARA4

	be,pt	%xcc, 5f

	be,pt	%xcc, 5f

	 mov	SUN4V_CHIP_NIAGARA4, %g4

	 mov	SUN4V_CHIP_NIAGARA4, %g4

	cmp	%g2, '5'

	cmp	%g2, CPU_ID_NIAGARA5

	be,pt	%xcc, 5f

	be,pt	%xcc, 5f

	 mov	SUN4V_CHIP_NIAGARA5, %g4

	 mov	SUN4V_CHIP_NIAGARA5, %g4

	cmp	%g2, '6'

	cmp	%g2, CPU_ID_M6

	be,pt	%xcc, 5f

	be,pt	%xcc, 5f

	 mov	SUN4V_CHIP_SPARC_M6, %g4

	 mov	SUN4V_CHIP_SPARC_M6, %g4

	cmp	%g2, '7'

	cmp	%g2, CPU_ID_M7

	be,pt	%xcc, 5f

	be,pt	%xcc, 5f

	 mov	SUN4V_CHIP_SPARC_M7, %g4

	 mov	SUN4V_CHIP_SPARC_M7, %g4

	cmp	%g2, 'N'

	cmp	%g2, CPU_ID_SONOMA1

	be,pt	%xcc, 5f

	be,pt	%xcc, 5f

	 mov	SUN4V_CHIP_SPARC_SN, %g4

	 mov	SUN4V_CHIP_SPARC_SN, %g4

	ba,pt	%xcc, 49f

	ba,pt	%xcc, 49f
@@ -448,10 +448,10 @@ EXPORT_SYMBOL(sun4v_chip_type) 
91:	sethi	%hi(prom_cpu_compatible), %g1

91:	sethi	%hi(prom_cpu_compatible), %g1

	or	%g1, %lo(prom_cpu_compatible), %g1

	or	%g1, %lo(prom_cpu_compatible), %g1

	ldub	[%g1 + 17], %g2

	ldub	[%g1 + 17], %g2

	cmp	%g2, '1'

	cmp	%g2, CPU_ID_NIAGARA1

	be,pt	%xcc, 5f

	be,pt	%xcc, 5f

	 mov	SUN4V_CHIP_NIAGARA1, %g4

	 mov	SUN4V_CHIP_NIAGARA1, %g4

	cmp	%g2, '2'

	cmp	%g2, CPU_ID_NIAGARA2

	be,pt	%xcc, 5f

	be,pt	%xcc, 5f

	 mov	SUN4V_CHIP_NIAGARA2, %g4

	 mov	SUN4V_CHIP_NIAGARA2, %g4