Home » Mailing list archives » git-commits-head » 2008 » January » 31

[POWERPC] OProfile: fix cbe pm signal routing problem

Previous thread: [POWERPC] cell: handle kernel SLB setup in spu_base.c by Linux Kernel Mailing List on Wednesday, January 30, 2008 - 8:00 pm. (1 message)

Next thread: [POWERPC] pasemi: Implement MSI support by Linux Kernel Mailing List on Wednesday, January 30, 2008 - 8:01 pm. (1 message)
[view original message]
From: Linux Kernel Mailing List
Subject: [POWERPC] OProfile: fix cbe pm signal routing problem
Date: Wednesday, January 30, 2008 - 8:00 pm

Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=a1ef48...
Commit:     a1ef4849fdca379cf51cbacd337e8fa742437d26
Parent:     29641ce165e5f643b48988cb779c6ba97b647503
Author:     Bob Nelson <rrnelson@linux.vnet.ibm.com>
AuthorDate: Fri Aug 17 11:06:09 2007 -0500
Committer:  Arnd Bergmann <arnd@arndb.de>
CommitDate: Wed Dec 19 01:00:01 2007 +0100

    [POWERPC] OProfile: fix cbe pm signal routing problem
    
    Fix debug_bus_control and group_control PMU register values set up in
    set_pm_event().  Initialize variables before calling set_pm_event().
    Delete unused static array and code that initialized it.
    Rename constant to better reflect usage.
    
    Signed-off-by: Bob Nelson <rrnelson@us.ibm.com>
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 arch/powerpc/oprofile/op_model_cell.c |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/arch/powerpc/oprofile/op_model_cell.c b/arch/powerpc/oprofile/op_model_cell.c
index bb6bff5..1392977 100644
--- a/arch/powerpc/oprofile/op_model_cell.c
+++ b/arch/powerpc/oprofile/op_model_cell.c
@@ -61,7 +61,7 @@ static unsigned int spu_cycle_reset;
 #define NUM_THREADS 2         /* number of physical threads in
 			       * physical processor
 			       */
-#define NUM_TRACE_BUS_WORDS 4
+#define NUM_DEBUG_BUS_WORDS 4
 #define NUM_INPUT_BUS_WORDS 2
 
 #define MAX_SPU_COUNT 0xFFFFFF	/* maximum 24 bit LFSR value */
@@ -169,7 +169,6 @@ static DEFINE_SPINLOCK(virt_cntr_lock);
 
 static u32 ctr_enabled;
 
-static unsigned char trace_bus[NUM_TRACE_BUS_WORDS];
 static unsigned char input_bus[NUM_INPUT_BUS_WORDS];
 
 /*
@@ -298,7 +297,7 @@ static void set_pm_event(u32 ctr, int event, u32 unit_mask)
 
 	p->signal_group = event / 100;
 	p->bus_word = bus_word;
-	p->sub_unit = (unit_mask & 0x0000f000) >> 12;
+	p->sub_unit = GET_SUB_UNIT(unit_mask);
 
 	pm_regs.pm07_cntrl[ctr] = 0;
 	pm_regs.pm07_cntrl[ctr] |= ...
[ message continues ]
Previous thread: [POWERPC] cell: handle kernel SLB setup in spu_base.c by Linux Kernel Mailing List on Wednesday, January 30, 2008 - 8:00 pm. (1 message)

Next thread: [POWERPC] pasemi: Implement MSI support by Linux Kernel Mailing List on Wednesday, January 30, 2008 - 8:01 pm. (1 message)