diff options
| author | Alexey Kardashevskiy <aik@ozlabs.ru> | 2014-06-04 22:50:43 +1000 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2014-06-16 13:24:43 +0200 |
| commit | c36c97f8804bbc2cd731f37a159ecdf618600871 (patch) | |
| tree | 39ca3ece62d803f2e8da9861d1b82efdc4d7de36 /target-ppc | |
| parent | 077850b037eea63d9b01db96dd0cb65a46dd0f0f (diff) | |
| download | qemu-c36c97f8804bbc2cd731f37a159ecdf618600871.zip qemu-c36c97f8804bbc2cd731f37a159ecdf618600871.tar.gz qemu-c36c97f8804bbc2cd731f37a159ecdf618600871.tar.bz2 | |
target-ppc: Add PMC7/8 to 970 class
Compared to PowerISA-compliant CPUs, 970 family has most of them plus
PMC7/8 which are only present on 970 but not on POWER5 and later CPUs.
Since we are changing SPRs for Book3s/970 families, let's add them too.
Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Reviewed-by: Tom Musta <tommusta@gmail.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'target-ppc')
| -rw-r--r-- | target-ppc/cpu.h | 4 | ||||
| -rw-r--r-- | target-ppc/translate_init.c | 26 |
2 files changed, 30 insertions, 0 deletions
diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h index 531124c..92e26c8 100644 --- a/target-ppc/cpu.h +++ b/target-ppc/cpu.h @@ -1484,9 +1484,11 @@ static inline int cpu_mmu_index (CPUPPCState *env) #define SPR_PERF9 (0x309) #define SPR_RCPU_L2U_RBA1 (0x309) #define SPR_MPC_MD_CASID (0x309) +#define SPR_970_UPMC7 (0X309) #define SPR_PERFA (0x30A) #define SPR_RCPU_L2U_RBA2 (0x30A) #define SPR_MPC_MD_AP (0x30A) +#define SPR_970_UPMC8 (0X30A) #define SPR_PERFB (0x30B) #define SPR_RCPU_L2U_RBA3 (0x30B) #define SPR_MPC_MD_EPN (0x30B) @@ -1519,7 +1521,9 @@ static inline int cpu_mmu_index (CPUPPCState *env) #define SPR_UPERF8 (0x318) #define SPR_POWER_PMC6 (0X318) #define SPR_UPERF9 (0x319) +#define SPR_970_PMC7 (0X319) #define SPR_UPERFA (0x31A) +#define SPR_970_PMC8 (0X31A) #define SPR_UPERFB (0x31B) #define SPR_POWER_MMCR0 (0X31B) #define SPR_UPERFC (0x31C) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index bffed90..568bf9c 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -7449,6 +7449,30 @@ static void gen_spr_book3s_pmu_user(CPUPPCState *env) 0x00000000); } +static void gen_spr_970_pmu_sup(CPUPPCState *env) +{ + spr_register(env, SPR_970_PMC7, "PMC7", + SPR_NOACCESS, SPR_NOACCESS, + &spr_read_generic, &spr_write_generic, + 0x00000000); + spr_register(env, SPR_970_PMC8, "PMC8", + SPR_NOACCESS, SPR_NOACCESS, + &spr_read_generic, &spr_write_generic, + 0x00000000); +} + +static void gen_spr_970_pmu_user(CPUPPCState *env) +{ + spr_register(env, SPR_970_UPMC7, "UPMC7", + &spr_read_ureg, SPR_NOACCESS, + &spr_read_ureg, &spr_write_ureg, + 0x00000000); + spr_register(env, SPR_970_UPMC8, "UPMC8", + &spr_read_ureg, SPR_NOACCESS, + &spr_read_ureg, &spr_write_ureg, + 0x00000000); +} + static void gen_spr_power5p_ear(CPUPPCState *env) { /* External access control */ @@ -7471,6 +7495,8 @@ static void init_proc_970 (CPUPPCState *env) gen_spr_970_hior(env); gen_low_BATs(env); gen_spr_book3s_common(env); + gen_spr_970_pmu_sup(env); + gen_spr_970_pmu_user(env); gen_spr_power5p_ear(env); |