diff options
author | Anton Blanchard <anton@samba.org> | 2006-03-26 20:00:45 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:44:16 -0500 |
commit | 15e812ad849e142e3dfc984d33c4d8042389f148 (patch) | |
tree | e2d50c583457e8c4b2d06eea9846c04d0f5629d7 /arch/powerpc/oprofile/op_model_power4.c | |
parent | fa465f8c7008c6cab32b05f3f1af57f7c86e8873 (diff) |
[PATCH] powerpc: Remove oprofile spinlock backtrace code
Remove oprofile spinlock backtrace code now we have proper calltrace
support. Also make MMCRA sihv and sipr bits a variable since they may
change in future cpus. Finally, MMCRA should be a 64bit quantity.
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/oprofile/op_model_power4.c')
-rw-r--r-- | arch/powerpc/oprofile/op_model_power4.c | 43 |
1 files changed, 9 insertions, 34 deletions
diff --git a/arch/powerpc/oprofile/op_model_power4.c b/arch/powerpc/oprofile/op_model_power4.c index 38db2efef3bc..4c2beab1fdc1 100644 --- a/arch/powerpc/oprofile/op_model_power4.c +++ b/arch/powerpc/oprofile/op_model_power4.c | |||
@@ -25,18 +25,14 @@ static unsigned long reset_value[OP_MAX_COUNTER]; | |||
25 | 25 | ||
26 | static int oprofile_running; | 26 | static int oprofile_running; |
27 | static int mmcra_has_sihv; | 27 | static int mmcra_has_sihv; |
28 | /* Unfortunately these bits vary between CPUs */ | ||
29 | static unsigned long mmcra_sihv = MMCRA_SIHV; | ||
30 | static unsigned long mmcra_sipr = MMCRA_SIPR; | ||
28 | 31 | ||
29 | /* mmcr values are set in power4_reg_setup, used in power4_cpu_setup */ | 32 | /* mmcr values are set in power4_reg_setup, used in power4_cpu_setup */ |
30 | static u32 mmcr0_val; | 33 | static u32 mmcr0_val; |
31 | static u64 mmcr1_val; | 34 | static u64 mmcr1_val; |
32 | static u32 mmcra_val; | 35 | static u64 mmcra_val; |
33 | |||
34 | /* | ||
35 | * Since we do not have an NMI, backtracing through spinlocks is | ||
36 | * only a best guess. In light of this, allow it to be disabled at | ||
37 | * runtime. | ||
38 | */ | ||
39 | static int backtrace_spinlocks; | ||
40 | 36 | ||
41 | static void power4_reg_setup(struct op_counter_config *ctr, | 37 | static void power4_reg_setup(struct op_counter_config *ctr, |
42 | struct op_system_config *sys, | 38 | struct op_system_config *sys, |
@@ -63,8 +59,6 @@ static void power4_reg_setup(struct op_counter_config *ctr, | |||
63 | mmcr1_val = sys->mmcr1; | 59 | mmcr1_val = sys->mmcr1; |
64 | mmcra_val = sys->mmcra; | 60 | mmcra_val = sys->mmcra; |
65 | 61 | ||
66 | backtrace_spinlocks = sys->backtrace_spinlocks; | ||
67 | |||
68 | for (i = 0; i < cur_cpu_spec->num_pmcs; ++i) | 62 | for (i = 0; i < cur_cpu_spec->num_pmcs; ++i) |
69 | reset_value[i] = 0x80000000UL - ctr[i].count; | 63 | reset_value[i] = 0x80000000UL - ctr[i].count; |
70 | 64 | ||
@@ -197,25 +191,6 @@ static void __attribute_used__ kernel_unknown_bucket(void) | |||
197 | { | 191 | { |
198 | } | 192 | } |
199 | 193 | ||
200 | static unsigned long check_spinlock_pc(struct pt_regs *regs, | ||
201 | unsigned long profile_pc) | ||
202 | { | ||
203 | unsigned long pc = instruction_pointer(regs); | ||
204 | |||
205 | /* | ||
206 | * If both the SIAR (sampled instruction) and the perfmon exception | ||
207 | * occurred in a spinlock region then we account the sample to the | ||
208 | * calling function. This isnt 100% correct, we really need soft | ||
209 | * IRQ disable so we always get the perfmon exception at the | ||
210 | * point at which the SIAR is set. | ||
211 | */ | ||
212 | if (backtrace_spinlocks && in_lock_functions(pc) && | ||
213 | in_lock_functions(profile_pc)) | ||
214 | return regs->link; | ||
215 | else | ||
216 | return profile_pc; | ||
217 | } | ||
218 | |||
219 | /* | 194 | /* |
220 | * On GQ and newer the MMCRA stores the HV and PR bits at the time | 195 | * On GQ and newer the MMCRA stores the HV and PR bits at the time |
221 | * the SIAR was sampled. We use that to work out if the SIAR was sampled in | 196 | * the SIAR was sampled. We use that to work out if the SIAR was sampled in |
@@ -228,17 +203,17 @@ static unsigned long get_pc(struct pt_regs *regs) | |||
228 | 203 | ||
229 | /* Cant do much about it */ | 204 | /* Cant do much about it */ |
230 | if (!mmcra_has_sihv) | 205 | if (!mmcra_has_sihv) |
231 | return check_spinlock_pc(regs, pc); | 206 | return pc; |
232 | 207 | ||
233 | mmcra = mfspr(SPRN_MMCRA); | 208 | mmcra = mfspr(SPRN_MMCRA); |
234 | 209 | ||
235 | /* Were we in the hypervisor? */ | 210 | /* Were we in the hypervisor? */ |
236 | if (firmware_has_feature(FW_FEATURE_LPAR) && (mmcra & MMCRA_SIHV)) | 211 | if (firmware_has_feature(FW_FEATURE_LPAR) && (mmcra & mmcra_sihv)) |
237 | /* function descriptor madness */ | 212 | /* function descriptor madness */ |
238 | return *((unsigned long *)hypervisor_bucket); | 213 | return *((unsigned long *)hypervisor_bucket); |
239 | 214 | ||
240 | /* We were in userspace, nothing to do */ | 215 | /* We were in userspace, nothing to do */ |
241 | if (mmcra & MMCRA_SIPR) | 216 | if (mmcra & mmcra_sipr) |
242 | return pc; | 217 | return pc; |
243 | 218 | ||
244 | #ifdef CONFIG_PPC_RTAS | 219 | #ifdef CONFIG_PPC_RTAS |
@@ -257,7 +232,7 @@ static unsigned long get_pc(struct pt_regs *regs) | |||
257 | /* function descriptor madness */ | 232 | /* function descriptor madness */ |
258 | return *((unsigned long *)kernel_unknown_bucket); | 233 | return *((unsigned long *)kernel_unknown_bucket); |
259 | 234 | ||
260 | return check_spinlock_pc(regs, pc); | 235 | return pc; |
261 | } | 236 | } |
262 | 237 | ||
263 | static int get_kernel(unsigned long pc) | 238 | static int get_kernel(unsigned long pc) |
@@ -268,7 +243,7 @@ static int get_kernel(unsigned long pc) | |||
268 | is_kernel = is_kernel_addr(pc); | 243 | is_kernel = is_kernel_addr(pc); |
269 | } else { | 244 | } else { |
270 | unsigned long mmcra = mfspr(SPRN_MMCRA); | 245 | unsigned long mmcra = mfspr(SPRN_MMCRA); |
271 | is_kernel = ((mmcra & MMCRA_SIPR) == 0); | 246 | is_kernel = ((mmcra & mmcra_sipr) == 0); |
272 | } | 247 | } |
273 | 248 | ||
274 | return is_kernel; | 249 | return is_kernel; |