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

Commit 362ff7b2 authored by Jake Moilanen's avatar Jake Moilanen Committed by Paul Mackerras
Browse files

[POWERPC] Add 970GX cputable entry 



970GX cputable entry from Steve Winiecki.

Signed-off-by: default avatarJake Moilanen <moilanen@austin.ibm.com>

 arch/powerpc/kernel/cputable.c          |   15 +++++++++++++++
 arch/powerpc/oprofile/op_model_power4.c |    2 +-
 include/asm-powerpc/reg.h               |    1 +
 3 files changed, 17 insertions(+), 1 deletion(-)
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 7f8c4c50

arch/powerpc/kernel/cputable.c

+15 −0
Original line number Original line Diff line number Diff line
@@ -227,6 +227,21 @@ struct cpu_spec cpu_specs[] = { 
		.oprofile_type		= PPC_OPROFILE_POWER4,

		.oprofile_type		= PPC_OPROFILE_POWER4,

		.platform		= "ppc970",

		.platform		= "ppc970",

	},

	},

	{	/* PPC970GX */

		.pvr_mask		= 0xffff0000,

		.pvr_value		= 0x00450000,

		.cpu_name		= "PPC970GX",

		.cpu_features		= CPU_FTRS_PPC970,

		.cpu_user_features	= COMMON_USER_POWER4 |

			PPC_FEATURE_HAS_ALTIVEC_COMP,

		.icache_bsize		= 128,

		.dcache_bsize		= 128,

		.num_pmcs		= 8,

		.cpu_setup		= __setup_cpu_ppc970,

		.oprofile_cpu_type	= "ppc64/970",

		.oprofile_type		= PPC_OPROFILE_POWER4,

		.platform		= "ppc970",

	},

	{	/* Power5 GR */

	{	/* Power5 GR */

		.pvr_mask		= 0xffff0000,

		.pvr_mask		= 0xffff0000,

		.pvr_value		= 0x003a0000,

		.pvr_value		= 0x003a0000,

arch/powerpc/oprofile/op_model_power4.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -76,7 +76,7 @@ static inline int mmcra_must_set_sample(void) 
{

{

	if (__is_processor(PV_POWER4) || __is_processor(PV_POWER4p) ||

	if (__is_processor(PV_POWER4) || __is_processor(PV_POWER4p) ||

	    __is_processor(PV_970) || __is_processor(PV_970FX) ||

	    __is_processor(PV_970) || __is_processor(PV_970FX) ||

	    __is_processor(PV_970MP))

	    __is_processor(PV_970MP) || __is_processor(PV_970GX))

		return 1;

		return 1;





	return 0;

	return 0;

include/asm-powerpc/reg.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -591,6 +591,7 @@ 
#define PV_630		0x0040

#define PV_630		0x0040

#define PV_630p	0x0041

#define PV_630p	0x0041

#define PV_970MP	0x0044

#define PV_970MP	0x0044

#define PV_970GX	0x0045

#define PV_BE		0x0070

#define PV_BE		0x0070

#define PV_PA6T		0x0090

#define PV_PA6T		0x0090