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

Commit fa465f8c authored by Anton Blanchard's avatar Anton Blanchard Committed by Paul Mackerras
Browse files

[PATCH] powerpc: Add oprofile calltrace support to all powerpc cpus 



Add calltrace support for other powerpc cpus. Tested on 7450.

Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 6c6bd754

arch/powerpc/oprofile/op_model_7450.c

+2 −2
Original line number Diff line number Diff line
@@ -176,13 +176,13 @@ static void fsl7450_handle_interrupt(struct pt_regs *regs, 
	mtmsr(mfmsr() | MSR_PMM);



	pc = mfspr(SPRN_SIAR);

	is_kernel = (pc >= KERNELBASE);

	is_kernel = is_kernel_addr(pc);



	for (i = 0; i < NUM_CTRS; ++i) {

		val = ctr_read(i);

		if (val < 0) {

			if (oprofile_running && ctr[i].enabled) {

				oprofile_add_pc(pc, is_kernel, i);

				oprofile_add_ext_sample(pc, regs, i, is_kernel);

				ctr_write(i, reset_value[i]);

			} else {

				ctr_write(i, 0);

arch/powerpc/oprofile/op_model_fsl_booke.c

+2 −2
Original line number Diff line number Diff line
@@ -154,13 +154,13 @@ static void fsl_booke_handle_interrupt(struct pt_regs *regs, 
	mtmsr(mfmsr() | MSR_PMM);



	pc = regs->nip;

	is_kernel = (pc >= KERNELBASE);

	is_kernel = is_kernel_addr(pc);



	for (i = 0; i < num_counters; ++i) {

		val = ctr_read(i);

		if (val < 0) {

			if (oprofile_running && ctr[i].enabled) {

				oprofile_add_pc(pc, is_kernel, i);

				oprofile_add_ext_sample(pc, regs, i, is_kernel);

				ctr_write(i, reset_value[i]);

			} else {

				ctr_write(i, 0);

arch/powerpc/oprofile/op_model_rs64.c

+4 −1
Original line number Diff line number Diff line
@@ -175,10 +175,13 @@ static void rs64_handle_interrupt(struct pt_regs *regs, 
				  struct op_counter_config *ctr)

{

	unsigned int mmcr0;

	int is_kernel;

	int val;

	int i;

	unsigned long pc = mfspr(SPRN_SIAR);



	is_kernel = is_kernel_addr(pc);



	/* set the PMM bit (see comment below) */

	mtmsrd(mfmsr() | MSR_PMM);
@@ -186,7 +189,7 @@ static void rs64_handle_interrupt(struct pt_regs *regs, 
		val = ctr_read(i);

		if (val < 0) {

			if (ctr[i].enabled) {

				oprofile_add_pc(pc, is_kernel_addr(pc), i);

				oprofile_add_ext_sample(pc, regs, i, is_kernel);

				ctr_write(i, reset_value[i]);

			} else {

				ctr_write(i, 0);