diff options
| author | Jake Moilanen <moilanen@austin.ibm.com> | 2006-10-18 10:47:22 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-10-23 18:23:17 +1000 |
| commit | 362ff7b2ac0234152b4a334dd006b77f4fa2ab23 (patch) | |
| tree | 4b9d3c03c119b0216ff04b744c8901823e61d10b /arch | |
| parent | 7f8c4c50bda13d27afc03679d25aa1fcac8df551 (diff) | |
| download | kernel_samsung_aries-362ff7b2ac0234152b4a334dd006b77f4fa2ab23.zip kernel_samsung_aries-362ff7b2ac0234152b4a334dd006b77f4fa2ab23.tar.gz kernel_samsung_aries-362ff7b2ac0234152b4a334dd006b77f4fa2ab23.tar.bz2 | |
[POWERPC] Add 970GX cputable entry
970GX cputable entry from Steve Winiecki.
Signed-off-by: Jake 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: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/kernel/cputable.c | 15 | ||||
| -rw-r--r-- | arch/powerpc/oprofile/op_model_power4.c | 2 |
2 files changed, 16 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c index 95382f9..f23aad6 100644 --- a/arch/powerpc/kernel/cputable.c +++ b/arch/powerpc/kernel/cputable.c @@ -227,6 +227,21 @@ struct cpu_spec cpu_specs[] = { .oprofile_type = PPC_OPROFILE_POWER4, .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 */ .pvr_mask = 0xffff0000, .pvr_value = 0x003a0000, diff --git a/arch/powerpc/oprofile/op_model_power4.c b/arch/powerpc/oprofile/op_model_power4.c index 506f6b7..6a927ef 100644 --- a/arch/powerpc/oprofile/op_model_power4.c +++ b/arch/powerpc/oprofile/op_model_power4.c @@ -76,7 +76,7 @@ static inline int mmcra_must_set_sample(void) { if (__is_processor(PV_POWER4) || __is_processor(PV_POWER4p) || __is_processor(PV_970) || __is_processor(PV_970FX) || - __is_processor(PV_970MP)) + __is_processor(PV_970MP) || __is_processor(PV_970GX)) return 1; return 0; |