7 files changed, 220 insertions, 5 deletions

diff --git a/arch/s390/oprofile/Makefile b/arch/s390/oprofile/Makefile
index d698cddcfbd..00d8fc8e442 100644
--- a/arch/s390/oprofile/Makefile
+++ b/arch/s390/oprofile/Makefile
@@ -6,4 +6,4 @@ DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \
                 oprofilefs.o oprofile_stats.o  \
                 timer_int.o )
 
-oprofile-y :=   $(DRIVER_OBJS) init.o backtrace.o hwsampler.o
+oprofile-y :=   $(DRIVER_OBJS) init.o backtrace.o hwsampler.o hwsampler_files.o
diff --git a/arch/s390/oprofile/hwsampler_files.c b/arch/s390/oprofile/hwsampler_files.c
new file mode 100644
index 00000000000..493f7cc4e86
--- /dev/null
+++ b/arch/s390/oprofile/hwsampler_files.c
@@ -0,0 +1,146 @@
+/**
+ * arch/s390/oprofile/hwsampler_files.c
+ *
+ * Copyright IBM Corp. 2010
+ * Author: Mahesh Salgaonkar (mahesh@linux.vnet.ibm.com)
+ */
+#include <linux/oprofile.h>
+#include <linux/errno.h>
+#include <linux/fs.h>
+
+#include "hwsampler.h"
+
+#define DEFAULT_INTERVAL        4096
+
+#define DEFAULT_SDBT_BLOCKS     1
+#define DEFAULT_SDB_BLOCKS      511
+
+static unsigned long oprofile_hw_interval = DEFAULT_INTERVAL;
+static unsigned long oprofile_min_interval;
+static unsigned long oprofile_max_interval;
+
+static unsigned long oprofile_sdbt_blocks = DEFAULT_SDBT_BLOCKS;
+static unsigned long oprofile_sdb_blocks = DEFAULT_SDB_BLOCKS;
+
+static unsigned long oprofile_hwsampler;
+
+static int oprofile_hwsampler_start(void)
+{
+        int retval;
+
+        retval = hwsampler_allocate(oprofile_sdbt_blocks, oprofile_sdb_blocks);
+        if (retval)
+                return retval;
+
+        retval = hwsampler_start_all(oprofile_hw_interval);
+        if (retval)
+                hwsampler_deallocate();
+
+        return retval;
+}
+
+static void oprofile_hwsampler_stop(void)
+{
+        hwsampler_stop_all();
+        hwsampler_deallocate();
+        return;
+}
+
+int oprofile_arch_set_hwsampler(struct oprofile_operations *ops)
+{
+        printk(KERN_INFO "oprofile: using hardware sampling\n");
+        ops->start = oprofile_hwsampler_start;
+        ops->stop = oprofile_hwsampler_stop;
+        ops->cpu_type = "timer";
+
+        return 0;
+}
+
+static ssize_t hwsampler_read(struct file *file, char __user *buf,
+                size_t count, loff_t *offset)
+{
+        return oprofilefs_ulong_to_user(oprofile_hwsampler, buf, count, offset);
+}
+
+static ssize_t hwsampler_write(struct file *file, char const __user *buf,
+                size_t count, loff_t *offset)
+{
+        unsigned long val;
+        int retval;
+
+        if (*offset)
+                return -EINVAL;
+
+        retval = oprofilefs_ulong_from_user(&val, buf, count);
+        if (retval)
+                return retval;
+
+        if (oprofile_hwsampler == val)
+                return -EINVAL;
+
+        retval = oprofile_set_hwsampler(val);
+
+        if (retval)
+                return retval;
+
+        oprofile_hwsampler = val;
+        return count;
+}
+
+static const struct file_operations hwsampler_fops = {
+        .read           = hwsampler_read,
+        .write          = hwsampler_write,
+};
+
+static int oprofile_create_hwsampling_files(struct super_block *sb,
+                                                struct dentry *root)
+{
+        struct dentry *hw_dir;
+
+        /* reinitialize default values */
+        oprofile_hwsampler = 1;
+
+        hw_dir = oprofilefs_mkdir(sb, root, "hwsampling");
+        if (!hw_dir)
+                return -EINVAL;
+
+        oprofilefs_create_file(sb, hw_dir, "hwsampler", &hwsampler_fops);
+        oprofilefs_create_ulong(sb, hw_dir, "hw_interval",
+                                &oprofile_hw_interval);
+        oprofilefs_create_ro_ulong(sb, hw_dir, "hw_min_interval",
+                                &oprofile_min_interval);
+        oprofilefs_create_ro_ulong(sb, hw_dir, "hw_max_interval",
+                                &oprofile_max_interval);
+        oprofilefs_create_ulong(sb, hw_dir, "hw_sdbt_blocks",
+                                &oprofile_sdbt_blocks);
+
+        return 0;
+}
+
+int oprofile_hwsampler_init(struct oprofile_operations* ops)
+{
+        if (hwsampler_setup())
+                return -ENODEV;
+
+        /*
+         * create hwsampler files only if hwsampler_setup() succeeds.
+         */
+        ops->create_files = oprofile_create_hwsampling_files;
+        oprofile_min_interval = hwsampler_query_min_interval();
+        if (oprofile_min_interval < 0) {
+                oprofile_min_interval = 0;
+                return -ENODEV;
+        }
+        oprofile_max_interval = hwsampler_query_max_interval();
+        if (oprofile_max_interval < 0) {
+                oprofile_max_interval = 0;
+                return -ENODEV;
+        }
+        oprofile_arch_set_hwsampler(ops);
+        return 0;
+}
+
+void oprofile_hwsampler_exit(void)
+{
+        hwsampler_shutdown();
+}
diff --git a/arch/s390/oprofile/init.c b/arch/s390/oprofile/init.c
index 7a995113b91..f6b3f724f59 100644
--- a/arch/s390/oprofile/init.c
+++ b/arch/s390/oprofile/init.c
@@ -11,16 +11,21 @@
 #include <linux/oprofile.h>
 #include <linux/init.h>
 #include <linux/errno.h>
+#include <linux/fs.h>
 
+extern int oprofile_hwsampler_init(struct oprofile_operations* ops);
+extern void oprofile_hwsampler_exit(void);
 
 extern void s390_backtrace(struct pt_regs * const regs, unsigned int depth);
 
 int __init oprofile_arch_init(struct oprofile_operations* ops)
 {
         ops->backtrace = s390_backtrace;
-        return -ENODEV;
+
+        return oprofile_hwsampler_init(ops);
 }
 
 void oprofile_arch_exit(void)
 {
+        oprofile_hwsampler_exit();
 }
diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
index f9bda64fcd1..43b01daa91e 100644
--- a/drivers/oprofile/oprof.c
+++ b/drivers/oprofile/oprof.c
@@ -239,6 +239,38 @@ int oprofile_set_ulong(unsigned long *addr, unsigned long val)
         return err;
 }
 
+#ifdef CONFIG_HAVE_HWSAMPLER
+int oprofile_set_hwsampler(unsigned long val)
+{
+        int err = 0;
+
+        mutex_lock(&start_mutex);
+
+        if (oprofile_started) {
+                err = -EBUSY;
+                goto out;
+        }
+
+        switch (val) {
+        case 1:
+                /* Switch to hardware sampling. */
+                __oprofile_timer_exit();
+                err = oprofile_arch_set_hwsampler(&oprofile_ops);
+                break;
+        case 0:
+                printk(KERN_INFO "oprofile: using timer interrupt.\n");
+                err = __oprofile_timer_init(&oprofile_ops);
+                break;
+        default:
+                err = -EINVAL;
+        }
+
+out:
+        mutex_unlock(&start_mutex);
+        return err;
+}
+#endif /* CONFIG_HAVE_HWSAMPLER */
+
 static int __init oprofile_init(void)
 {
         int err;
diff --git a/drivers/oprofile/oprof.h b/drivers/oprofile/oprof.h
index 177b73de5e5..5a6ceb1954a 100644
--- a/drivers/oprofile/oprof.h
+++ b/drivers/oprofile/oprof.h
@@ -35,7 +35,9 @@ struct dentry;
 
 void oprofile_create_files(struct super_block *sb, struct dentry *root);
 int oprofile_timer_init(struct oprofile_operations *ops);
+int __oprofile_timer_init(struct oprofile_operations *ops);
 void oprofile_timer_exit(void);
+void __oprofile_timer_exit(void);
 
 int oprofile_set_ulong(unsigned long *addr, unsigned long val);
 int oprofile_set_timeout(unsigned long time);
diff --git a/drivers/oprofile/timer_int.c b/drivers/oprofile/timer_int.c
index 010725117db..0099a458fd3 100644
--- a/drivers/oprofile/timer_int.c
+++ b/drivers/oprofile/timer_int.c
@@ -97,14 +97,13 @@ static struct notifier_block __refdata oprofile_cpu_notifier = {
         .notifier_call = oprofile_cpu_notify,
 };
 
-int __init oprofile_timer_init(struct oprofile_operations *ops)
+int  __oprofile_timer_init(struct oprofile_operations *ops)
 {
         int rc;
 
         rc = register_hotcpu_notifier(&oprofile_cpu_notifier);
         if (rc)
                 return rc;
-        ops->create_files = NULL;
         ops->setup = NULL;
         ops->shutdown = NULL;
         ops->start = oprofile_hrtimer_start;
@@ -113,7 +112,17 @@ int __init oprofile_timer_init(struct oprofile_operations *ops)
         return 0;
 }
 
-void __exit oprofile_timer_exit(void)
+int __init oprofile_timer_init(struct oprofile_operations *ops)
+{
+        return __oprofile_timer_init(ops);
+}
+
+void __oprofile_timer_exit(void)
 {
         unregister_hotcpu_notifier(&oprofile_cpu_notifier);
 }
+
+void __exit oprofile_timer_exit(void)
+{
+        __oprofile_timer_exit();
+}
diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
index 7f5cfd3b37d..b517d869e1a 100644
--- a/include/linux/oprofile.h
+++ b/include/linux/oprofile.h
@@ -91,6 +91,27 @@ int oprofile_arch_init(struct oprofile_operations * ops);
  */
 void oprofile_arch_exit(void);
 
+#ifdef CONFIG_HAVE_HWSAMPLER
+/**
+ * setup hardware sampler for oprofiling.
+ */
+
+int oprofile_set_hwsampler(unsigned long);
+
+/**
+ * hardware sampler module initialization for the s390 arch
+ */
+
+int oprofile_arch_set_hwsampler(struct oprofile_operations *ops);
+
+/**
+ * Add an s390 hardware sample.
+ */
+void oprofile_add_ext_hw_sample(unsigned long pc, struct pt_regs * const regs,
+        unsigned long event, int is_kernel,
+        struct task_struct *task);
+#endif /* CONFIG_HAVE_HWSAMPLER */
+
 /**
  * Add a sample. This may be called from any context.
  */