Linux-2.6.12-rc2v2.6.12-rc2

Initial git repository build. I'm not bothering with the full history,
even though we have it. We can create a separate "historical" git
archive of that later if we want to, and in the meantime it's about
3.2GB when imported into git - space that would just make the early
git days unnecessarily complicated, when we don't have a lot of good
infrastructure for it.

Let it rip!

5 files changed, 427 insertions, 0 deletions

diff --git a/arch/ppc/oprofile/Kconfig b/arch/ppc/oprofile/Kconfig
new file mode 100644
index 000000000000..19d37730b664
--- /dev/null
+++ b/arch/ppc/oprofile/Kconfig
@@ -0,0 +1,23 @@
+
+menu "Profiling support"
+        depends on EXPERIMENTAL
+
+config PROFILING
+        bool "Profiling support (EXPERIMENTAL)"
+        help
+          Say Y here to enable the extended profiling support mechanisms used
+          by profilers such as OProfile.
+
+
+config OPROFILE
+        tristate "OProfile system profiling (EXPERIMENTAL)"
+        depends on PROFILING
+        help
+          OProfile is a profiling system capable of profiling the
+          whole system, include the kernel, kernel modules, libraries,
+          and applications.
+
+          If unsure, say N.
+
+endmenu
+
diff --git a/arch/ppc/oprofile/Makefile b/arch/ppc/oprofile/Makefile
new file mode 100644
index 000000000000..e2218d32a4eb
--- /dev/null
+++ b/arch/ppc/oprofile/Makefile
@@ -0,0 +1,14 @@
+obj-$(CONFIG_OPROFILE) += oprofile.o
+
+DRIVER_OBJS := $(addprefix ../../../drivers/oprofile/, \
+                oprof.o cpu_buffer.o buffer_sync.o \
+                event_buffer.o oprofile_files.o \
+                oprofilefs.o oprofile_stats.o \
+                timer_int.o )
+
+oprofile-y := $(DRIVER_OBJS) common.o
+
+ifeq ($(CONFIG_FSL_BOOKE),y)
+        oprofile-y += op_model_fsl_booke.o
+endif
+
diff --git a/arch/ppc/oprofile/common.c b/arch/ppc/oprofile/common.c
new file mode 100644
index 000000000000..3169c67abea7
--- /dev/null
+++ b/arch/ppc/oprofile/common.c
@@ -0,0 +1,161 @@
+/*
+ * PPC 32 oprofile support
+ * Based on PPC64 oprofile support
+ * Copyright (C) 2004 Anton Blanchard <anton@au.ibm.com>, IBM
+ *
+ * Copyright (C) Freescale Semiconductor, Inc 2004
+ *
+ * Author: Andy Fleming
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#include <linux/oprofile.h>
+#include <linux/slab.h>
+#include <linux/init.h>
+#include <linux/smp.h>
+#include <linux/errno.h>
+#include <asm/ptrace.h>
+#include <asm/system.h>
+#include <asm/perfmon.h>
+#include <asm/cputable.h>
+
+#include "op_impl.h"
+
+static struct op_ppc32_model *model;
+
+static struct op_counter_config ctr[OP_MAX_COUNTER];
+static struct op_system_config sys;
+
+static void op_handle_interrupt(struct pt_regs *regs)
+{
+        model->handle_interrupt(regs, ctr);
+}
+
+static int op_ppc32_setup(void)
+{
+        /* Install our interrupt handler into the existing hook.  */
+        if(request_perfmon_irq(&op_handle_interrupt))
+                return -EBUSY;
+
+        mb();
+
+        /* Pre-compute the values to stuff in the hardware registers.  */
+        model->reg_setup(ctr, &sys, model->num_counters);
+
+#if 0
+        /* FIXME: Make multi-cpu work */
+        /* Configure the registers on all cpus.  */
+        on_each_cpu(model->reg_setup, NULL, 0, 1);
+#endif
+
+        return 0;
+}
+
+static void op_ppc32_shutdown(void)
+{
+        mb();
+
+        /* Remove our interrupt handler. We may be removing this module. */
+        free_perfmon_irq();
+}
+
+static void op_ppc32_cpu_start(void *dummy)
+{
+        model->start(ctr);
+}
+
+static int op_ppc32_start(void)
+{
+        on_each_cpu(op_ppc32_cpu_start, NULL, 0, 1);
+        return 0;
+}
+
+static inline void op_ppc32_cpu_stop(void *dummy)
+{
+        model->stop();
+}
+
+static void op_ppc32_stop(void)
+{
+        on_each_cpu(op_ppc32_cpu_stop, NULL, 0, 1);
+}
+
+static int op_ppc32_create_files(struct super_block *sb, struct dentry *root)
+{
+        int i;
+
+        for (i = 0; i < model->num_counters; ++i) {
+                struct dentry *dir;
+                char buf[3];
+
+                snprintf(buf, sizeof buf, "%d", i);
+                dir = oprofilefs_mkdir(sb, root, buf);
+
+                oprofilefs_create_ulong(sb, dir, "enabled", &ctr[i].enabled);
+                oprofilefs_create_ulong(sb, dir, "event", &ctr[i].event);
+                oprofilefs_create_ulong(sb, dir, "count", &ctr[i].count);
+                oprofilefs_create_ulong(sb, dir, "kernel", &ctr[i].kernel);
+                oprofilefs_create_ulong(sb, dir, "user", &ctr[i].user);
+
+                /* FIXME: Not sure if this is used */
+                oprofilefs_create_ulong(sb, dir, "unit_mask", &ctr[i].unit_mask);
+        }
+
+        oprofilefs_create_ulong(sb, root, "enable_kernel", &sys.enable_kernel);
+        oprofilefs_create_ulong(sb, root, "enable_user", &sys.enable_user);
+
+        /* Default to tracing both kernel and user */
+        sys.enable_kernel = 1;
+        sys.enable_user = 1;
+
+        return 0;
+}
+
+static struct oprofile_operations oprof_ppc32_ops = {
+        .create_files   = op_ppc32_create_files,
+        .setup          = op_ppc32_setup,
+        .shutdown       = op_ppc32_shutdown,
+        .start          = op_ppc32_start,
+        .stop           = op_ppc32_stop,
+        .cpu_type       = NULL          /* To be filled in below. */
+};
+
+int __init oprofile_arch_init(struct oprofile_operations *ops)
+{
+        char *name;
+        int cpu_id = smp_processor_id();
+
+#ifdef CONFIG_FSL_BOOKE
+        model = &op_model_fsl_booke;
+#else
+        return -ENODEV;
+#endif
+
+        name = kmalloc(32, GFP_KERNEL);
+
+        if (NULL == name)
+                return -ENOMEM;
+
+        sprintf(name, "ppc/%s", cur_cpu_spec[cpu_id]->cpu_name);
+
+        oprof_ppc32_ops.cpu_type = name;
+
+        model->num_counters = cur_cpu_spec[cpu_id]->num_pmcs;
+
+        *ops = oprof_ppc32_ops;
+
+        printk(KERN_INFO "oprofile: using %s performance monitoring.\n",
+               oprof_ppc32_ops.cpu_type);
+
+        return 0;
+}
+
+void oprofile_arch_exit(void)
+{
+        kfree(oprof_ppc32_ops.cpu_type);
+        oprof_ppc32_ops.cpu_type = NULL;
+}
diff --git a/arch/ppc/oprofile/op_impl.h b/arch/ppc/oprofile/op_impl.h
new file mode 100644
index 000000000000..bc336dc971e3
--- /dev/null
+++ b/arch/ppc/oprofile/op_impl.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2004 Anton Blanchard <anton@au.ibm.com>, IBM
+ *
+ * Based on alpha version.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#ifndef OP_IMPL_H
+#define OP_IMPL_H 1
+
+#define OP_MAX_COUNTER 8
+
+/* Per-counter configuration as set via oprofilefs.  */
+struct op_counter_config {
+        unsigned long enabled;
+        unsigned long event;
+        unsigned long count;
+        unsigned long kernel;
+        unsigned long user;
+        unsigned long unit_mask;
+};
+
+/* System-wide configuration as set via oprofilefs.  */
+struct op_system_config {
+        unsigned long enable_kernel;
+        unsigned long enable_user;
+};
+
+/* Per-arch configuration */
+struct op_ppc32_model {
+        void (*reg_setup) (struct op_counter_config *,
+                           struct op_system_config *,
+                           int num_counters);
+        void (*start) (struct op_counter_config *);
+        void (*stop) (void);
+        void (*handle_interrupt) (struct pt_regs *,
+                                  struct op_counter_config *);
+        int num_counters;
+};
+
+#endif /* OP_IMPL_H */
diff --git a/arch/ppc/oprofile/op_model_fsl_booke.c b/arch/ppc/oprofile/op_model_fsl_booke.c
new file mode 100644
index 000000000000..fc9c859358c6
--- /dev/null
+++ b/arch/ppc/oprofile/op_model_fsl_booke.c
@@ -0,0 +1,184 @@
+/*
+ * oprofile/op_model_e500.c
+ *
+ * Freescale Book-E oprofile support, based on ppc64 oprofile support
+ * Copyright (C) 2004 Anton Blanchard <anton@au.ibm.com>, IBM
+ *
+ * Copyright (c) 2004 Freescale Semiconductor, Inc
+ *
+ * Author: Andy Fleming
+ * Maintainer: Kumar Gala <Kumar.Gala@freescale.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#include <linux/oprofile.h>
+#include <linux/init.h>
+#include <linux/smp.h>
+#include <asm/ptrace.h>
+#include <asm/system.h>
+#include <asm/processor.h>
+#include <asm/cputable.h>
+#include <asm/reg_booke.h>
+#include <asm/page.h>
+#include <asm/perfmon.h>
+
+#include "op_impl.h"
+
+static unsigned long reset_value[OP_MAX_COUNTER];
+
+static int num_counters;
+static int oprofile_running;
+
+static inline unsigned int ctr_read(unsigned int i)
+{
+        switch(i) {
+                case 0:
+                        return mfpmr(PMRN_PMC0);
+                case 1:
+                        return mfpmr(PMRN_PMC1);
+                case 2:
+                        return mfpmr(PMRN_PMC2);
+                case 3:
+                        return mfpmr(PMRN_PMC3);
+                default:
+                        return 0;
+        }
+}
+
+static inline void ctr_write(unsigned int i, unsigned int val)
+{
+        switch(i) {
+                case 0:
+                        mtpmr(PMRN_PMC0, val);
+                        break;
+                case 1:
+                        mtpmr(PMRN_PMC1, val);
+                        break;
+                case 2:
+                        mtpmr(PMRN_PMC2, val);
+                        break;
+                case 3:
+                        mtpmr(PMRN_PMC3, val);
+                        break;
+                default:
+                        break;
+        }
+}
+
+
+static void fsl_booke_reg_setup(struct op_counter_config *ctr,
+                             struct op_system_config *sys,
+                             int num_ctrs)
+{
+        int i;
+
+        num_counters = num_ctrs;
+
+        /* freeze all counters */
+        pmc_stop_ctrs();
+
+        /* Our counters count up, and "count" refers to
+         * how much before the next interrupt, and we interrupt
+         * on overflow.  So we calculate the starting value
+         * which will give us "count" until overflow.
+         * Then we set the events on the enabled counters */
+        for (i = 0; i < num_counters; ++i) {
+                reset_value[i] = 0x80000000UL - ctr[i].count;
+
+                init_pmc_stop(i);
+
+                set_pmc_event(i, ctr[i].event);
+
+                set_pmc_user_kernel(i, ctr[i].user, ctr[i].kernel);
+        }
+}
+
+static void fsl_booke_start(struct op_counter_config *ctr)
+{
+        int i;
+
+        mtmsr(mfmsr() | MSR_PMM);
+
+        for (i = 0; i < num_counters; ++i) {
+                if (ctr[i].enabled) {
+                        ctr_write(i, reset_value[i]);
+                        /* Set Each enabled counterd to only
+                         * count when the Mark bit is not set */
+                        set_pmc_marked(i, 1, 0);
+                        pmc_start_ctr(i, 1);
+                } else {
+                        ctr_write(i, 0);
+
+                        /* Set the ctr to be stopped */
+                        pmc_start_ctr(i, 0);
+                }
+        }
+
+        /* Clear the freeze bit, and enable the interrupt.
+         * The counters won't actually start until the rfi clears
+         * the PMM bit */
+        pmc_start_ctrs(1);
+
+        oprofile_running = 1;
+
+        pr_debug("start on cpu %d, pmgc0 %x\n", smp_processor_id(),
+                        mfpmr(PMRN_PMGC0));
+}
+
+static void fsl_booke_stop(void)
+{
+        /* freeze counters */
+        pmc_stop_ctrs();
+
+        oprofile_running = 0;
+
+        pr_debug("stop on cpu %d, pmgc0 %x\n", smp_processor_id(),
+                        mfpmr(PMRN_PMGC0));
+
+        mb();
+}
+
+
+static void fsl_booke_handle_interrupt(struct pt_regs *regs,
+                                    struct op_counter_config *ctr)
+{
+        unsigned long pc;
+        int is_kernel;
+        int val;
+        int i;
+
+        /* set the PMM bit (see comment below) */
+        mtmsr(mfmsr() | MSR_PMM);
+
+        pc = regs->nip;
+        is_kernel = (pc >= KERNELBASE);
+
+        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);
+                                ctr_write(i, reset_value[i]);
+                        } else {
+                                ctr_write(i, 0);
+                        }
+                }
+        }
+
+        /* The freeze bit was set by the interrupt. */
+        /* Clear the freeze bit, and reenable the interrupt.
+         * The counters won't actually start until the rfi clears
+         * the PMM bit */
+        pmc_start_ctrs(1);
+}
+
+struct op_ppc32_model op_model_fsl_booke = {
+        .reg_setup              = fsl_booke_reg_setup,
+        .start                  = fsl_booke_start,
+        .stop                   = fsl_booke_stop,
+        .handle_interrupt       = fsl_booke_handle_interrupt,
+};