[CELL] oprofile: add support to OProfile for profiling CELL BE SPUs

From: Maynard Johnson <mpjohn@us.ibm.com>

This patch updates the existing arch/powerpc/oprofile/op_model_cell.c
to add in the SPU profiling capabilities.  In addition, a 'cell' subdirectory
was added to arch/powerpc/oprofile to hold Cell-specific SPU profiling code.
Exports spu_set_profile_private_kref and spu_get_profile_private_kref which
are used by OProfile to store private profile information in spufs data
structures.

Also incorporated several fixes from other patches (rrn).  Check pointer
returned from kzalloc.  Eliminated unnecessary cast.  Better error
handling and cleanup in the related area.  64-bit unsigned long parameter
was being demoted to 32-bit unsigned int and eventually promoted back to
unsigned long.

Signed-off-by: Carl Love <carll@us.ibm.com>
Signed-off-by: Maynard Johnson <mpjohn@us.ibm.com>
Signed-off-by: Bob Nelson <rrnelson@us.ibm.com>
Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Acked-by: Paul Mackerras <paulus@samba.org>

3 files changed, 31 insertions, 20 deletions

diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
index edd6de995726..8134c7e198a5 100644
--- a/drivers/oprofile/buffer_sync.c
+++ b/drivers/oprofile/buffer_sync.c
@@ -26,8 +26,9 @@
 #include <linux/profile.h>
 #include <linux/module.h>
 #include <linux/fs.h>
+#include <linux/oprofile.h>
 #include <linux/sched.h>
- 
+
 #include "oprofile_stats.h"
 #include "event_buffer.h"
 #include "cpu_buffer.h"
diff --git a/drivers/oprofile/event_buffer.h b/drivers/oprofile/event_buffer.h
index 9b6a4ebd03e3..5076ed1ebd8f 100644
--- a/drivers/oprofile/event_buffer.h
+++ b/drivers/oprofile/event_buffer.h
@@ -19,28 +19,10 @@ void free_event_buffer(void);
  
 /* wake up the process sleeping on the event file */
 void wake_up_buffer_waiter(void);
- 
-/* Each escaped entry is prefixed by ESCAPE_CODE
- * then one of the following codes, then the
- * relevant data.
- */
-#define ESCAPE_CODE                     ~0UL
-#define CTX_SWITCH_CODE                 1
-#define CPU_SWITCH_CODE                 2
-#define COOKIE_SWITCH_CODE              3
-#define KERNEL_ENTER_SWITCH_CODE        4
-#define KERNEL_EXIT_SWITCH_CODE         5
-#define MODULE_LOADED_CODE              6
-#define CTX_TGID_CODE                   7
-#define TRACE_BEGIN_CODE                8
-#define TRACE_END_CODE                  9
- 
+
 #define INVALID_COOKIE ~0UL
 #define NO_COOKIE 0UL
 
-/* add data to the event buffer */
-void add_event_entry(unsigned long data);
- 
 extern const struct file_operations event_buffer_fops;
  
 /* mutex between sync_cpu_buffers() and the
diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
index e5162a64018b..2c645170f06e 100644
--- a/drivers/oprofile/oprof.c
+++ b/drivers/oprofile/oprof.c
@@ -53,9 +53,24 @@ int oprofile_setup(void)
          * us missing task deaths and eventually oopsing
          * when trying to process the event buffer.
          */
+        if (oprofile_ops.sync_start) {
+                int sync_ret = oprofile_ops.sync_start();
+                switch (sync_ret) {
+                case 0:
+                        goto post_sync;
+                case 1:
+                        goto do_generic;
+                case -1:
+                        goto out3;
+                default:
+                        goto out3;
+                }
+        }
+do_generic:
         if ((err = sync_start()))
                 goto out3;
 
+post_sync:
         is_setup = 1;
         mutex_unlock(&start_mutex);
         return 0;
@@ -118,7 +133,20 @@ out:
 void oprofile_shutdown(void)
 {
         mutex_lock(&start_mutex);
+        if (oprofile_ops.sync_stop) {
+                int sync_ret = oprofile_ops.sync_stop();
+                switch (sync_ret) {
+                case 0:
+                        goto post_sync;
+                case 1:
+                        goto do_generic;
+                default:
+                        goto post_sync;
+                }
+        }
+do_generic:
         sync_stop();
+post_sync:
         if (oprofile_ops.shutdown)
                 oprofile_ops.shutdown();
         is_setup = 0;