Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wirel...
[sfrench/cifs-2.6.git] / arch / mips / kernel / process.c
index 951bf9ca3ce955f02018bf4bfb46cad7aec52c35..04e5b38d327de7e5bee477f43aeb3e8d46abb985 100644 (file)
 #include <asm/elf.h>
 #include <asm/isadep.h>
 #include <asm/inst.h>
-#ifdef CONFIG_MIPS_MT_SMTC
-#include <asm/mipsmtregs.h>
-extern void smtc_idle_loop_hook(void);
-#endif /* CONFIG_MIPS_MT_SMTC */
+#include <asm/stacktrace.h>
 
 /*
  * The idle thread. There's no useful work to be done, so just try to conserve
@@ -56,6 +53,8 @@ ATTRIB_NORET void cpu_idle(void)
        while (1) {
                while (!need_resched()) {
 #ifdef CONFIG_MIPS_MT_SMTC
+                       extern void smtc_idle_loop_hook(void);
+
                        smtc_idle_loop_hook();
 #endif /* CONFIG_MIPS_MT_SMTC */
                        if (cpu_wait)
@@ -114,7 +113,7 @@ void start_thread(struct pt_regs * regs, unsigned long pc, unsigned long sp)
        status |= KU_USER;
        regs->cp0_status = status;
        clear_used_math();
-       lose_fpu();
+       clear_fpu_owner();
        if (cpu_has_dsp)
                __init_dsp();
        regs->cp0_epc = pc;
@@ -273,13 +272,15 @@ long kernel_thread(int (*fn)(void *), void *arg, unsigned long flags)
        return do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0, &regs, 0, NULL, NULL);
 }
 
-static struct mips_frame_info {
-       void *func;
-       unsigned long func_size;
-       int frame_size;
-       int pc_offset;
-} *schedule_frame, mfinfo[64];
-static int mfinfo_num;
+/*
+ *
+ */
+struct mips_frame_info {
+       void            *func;
+       unsigned long   func_size;
+       int             frame_size;
+       int             pc_offset;
+};
 
 static inline int is_ra_save_ins(union mips_instruction *ip)
 {
@@ -311,12 +312,19 @@ static inline int is_sp_move_ins(union mips_instruction *ip)
 static int get_frame_info(struct mips_frame_info *info)
 {
        union mips_instruction *ip = info->func;
-       int i, max_insns =
-               min(128UL, info->func_size / sizeof(union mips_instruction));
+       unsigned max_insns = info->func_size / sizeof(union mips_instruction);
+       unsigned i;
 
        info->pc_offset = -1;
        info->frame_size = 0;
 
+       if (!ip)
+               goto err;
+
+       if (max_insns == 0)
+               max_insns = 128U;       /* unknown function size */
+       max_insns = min(128U, max_insns);
+
        for (i = 0; i < max_insns; i++, ip++) {
 
                if (is_jal_jalr_jr_ins(ip))
@@ -337,48 +345,32 @@ static int get_frame_info(struct mips_frame_info *info)
        if (info->pc_offset < 0) /* leaf */
                return 1;
        /* prologue seems boggus... */
+err:
        return -1;
 }
 
+static struct mips_frame_info schedule_mfi __read_mostly;
+
 static int __init frame_info_init(void)
 {
-       int i;
+       unsigned long size = 0;
 #ifdef CONFIG_KALLSYMS
-       char *modname;
-       char namebuf[KSYM_NAME_LEN + 1];
-       unsigned long start, size, ofs;
-       extern char __sched_text_start[], __sched_text_end[];
-       extern char __lock_text_start[], __lock_text_end[];
-
-       start = (unsigned long)__sched_text_start;
-       for (i = 0; i < ARRAY_SIZE(mfinfo); i++) {
-               if (start == (unsigned long)schedule)
-                       schedule_frame = &mfinfo[i];
-               if (!kallsyms_lookup(start, &size, &ofs, &modname, namebuf))
-                       break;
-               mfinfo[i].func = (void *)(start + ofs);
-               mfinfo[i].func_size = size;
-               start += size - ofs;
-               if (start >= (unsigned long)__lock_text_end)
-                       break;
-               if (start == (unsigned long)__sched_text_end)
-                       start = (unsigned long)__lock_text_start;
-       }
-#else
-       mfinfo[0].func = schedule;
-       schedule_frame = &mfinfo[0];
+       unsigned long ofs;
+
+       kallsyms_lookup_size_offset((unsigned long)schedule, &size, &ofs);
 #endif
-       for (i = 0; i < ARRAY_SIZE(mfinfo) && mfinfo[i].func; i++)
-               get_frame_info(mfinfo + i);
+       schedule_mfi.func = schedule;
+       schedule_mfi.func_size = size;
+
+       get_frame_info(&schedule_mfi);
 
        /*
         * Without schedule() frame info, result given by
         * thread_saved_pc() and get_wchan() are not reliable.
         */
-       if (schedule_frame->pc_offset < 0)
+       if (schedule_mfi.pc_offset < 0)
                printk("Can't analyze schedule() prologue at %p\n", schedule);
 
-       mfinfo_num = i;
        return 0;
 }
 
@@ -394,79 +386,57 @@ unsigned long thread_saved_pc(struct task_struct *tsk)
        /* New born processes are a special case */
        if (t->reg31 == (unsigned long) ret_from_fork)
                return t->reg31;
-
-       if (!schedule_frame || schedule_frame->pc_offset < 0)
+       if (schedule_mfi.pc_offset < 0)
                return 0;
-       return ((unsigned long *)t->reg29)[schedule_frame->pc_offset];
+       return ((unsigned long *)t->reg29)[schedule_mfi.pc_offset];
 }
 
-/* get_wchan - a maintenance nightmare^W^Wpain in the ass ...  */
-unsigned long get_wchan(struct task_struct *p)
-{
-       unsigned long stack_page;
-       unsigned long pc;
-#ifdef CONFIG_KALLSYMS
-       unsigned long frame;
-#endif
-
-       if (!p || p == current || p->state == TASK_RUNNING)
-               return 0;
-
-       stack_page = (unsigned long)task_stack_page(p);
-       if (!stack_page || !mfinfo_num)
-               return 0;
-
-       pc = thread_saved_pc(p);
-#ifdef CONFIG_KALLSYMS
-       if (!in_sched_functions(pc))
-               return pc;
-
-       frame = p->thread.reg29 + schedule_frame->frame_size;
-       do {
-               int i;
-
-               if (frame < stack_page || frame > stack_page + THREAD_SIZE - 32)
-                       return 0;
-
-               for (i = mfinfo_num - 1; i >= 0; i--) {
-                       if (pc >= (unsigned long) mfinfo[i].func)
-                               break;
-               }
-               if (i < 0)
-                       break;
-
-               if (mfinfo[i].pc_offset < 0)
-                       break;
-               pc = ((unsigned long *)frame)[mfinfo[i].pc_offset];
-               if (!mfinfo[i].frame_size)
-                       break;
-               frame += mfinfo[i].frame_size;
-       } while (in_sched_functions(pc));
-#endif
-
-       return pc;
-}
 
 #ifdef CONFIG_KALLSYMS
 /* used by show_backtrace() */
 unsigned long unwind_stack(struct task_struct *task, unsigned long *sp,
-                          unsigned long pc, unsigned long ra)
+                          unsigned long pc, unsigned long *ra)
 {
        unsigned long stack_page;
        struct mips_frame_info info;
-       char *modname;
-       char namebuf[KSYM_NAME_LEN + 1];
        unsigned long size, ofs;
        int leaf;
+       extern void ret_from_irq(void);
+       extern void ret_from_exception(void);
 
        stack_page = (unsigned long)task_stack_page(task);
        if (!stack_page)
                return 0;
 
-       if (!kallsyms_lookup(pc, &size, &ofs, &modname, namebuf))
+       /*
+        * If we reached the bottom of interrupt context,
+        * return saved pc in pt_regs.
+        */
+       if (pc == (unsigned long)ret_from_irq ||
+           pc == (unsigned long)ret_from_exception) {
+               struct pt_regs *regs;
+               if (*sp >= stack_page &&
+                   *sp + sizeof(*regs) <= stack_page + THREAD_SIZE - 32) {
+                       regs = (struct pt_regs *)*sp;
+                       pc = regs->cp0_epc;
+                       if (__kernel_text_address(pc)) {
+                               *sp = regs->regs[29];
+                               *ra = regs->regs[31];
+                               return pc;
+                       }
+               }
                return 0;
-       if (ofs == 0)
+       }
+       if (!kallsyms_lookup_size_offset(pc, &size, &ofs))
                return 0;
+       /*
+        * Return ra if an exception occured at the first instruction
+        */
+       if (unlikely(ofs == 0)) {
+               pc = *ra;
+               *ra = 0;
+               return pc;
+       }
 
        info.func = (void *)(pc - ofs);
        info.func_size = ofs;   /* analyze from start to ofs */
@@ -485,11 +455,41 @@ unsigned long unwind_stack(struct task_struct *task, unsigned long *sp,
                 * one. In that cases avoid to return always the
                 * same value.
                 */
-               pc = pc != ra ? ra : 0;
+               pc = pc != *ra ? *ra : 0;
        else
                pc = ((unsigned long *)(*sp))[info.pc_offset];
 
        *sp += info.frame_size;
+       *ra = 0;
        return __kernel_text_address(pc) ? pc : 0;
 }
 #endif
+
+/*
+ * get_wchan - a maintenance nightmare^W^Wpain in the ass ...
+ */
+unsigned long get_wchan(struct task_struct *task)
+{
+       unsigned long pc = 0;
+#ifdef CONFIG_KALLSYMS
+       unsigned long sp;
+       unsigned long ra = 0;
+#endif
+
+       if (!task || task == current || task->state == TASK_RUNNING)
+               goto out;
+       if (!task_stack_page(task))
+               goto out;
+
+       pc = thread_saved_pc(task);
+
+#ifdef CONFIG_KALLSYMS
+       sp = task->thread.reg29 + schedule_mfi.frame_size;
+
+       while (in_sched_functions(pc))
+               pc = unwind_stack(task, &sp, pc, &ra);
+#endif
+
+out:
+       return pc;
+}