xnu-792.6.22.tar.gz

[apple/xnu.git] / osfmk / ppc / interrupt.c

diff --git a/osfmk/ppc/interrupt.c b/osfmk/ppc/interrupt.c
index 47e447e8179303e7576100e52943757ea3158fd0..aba525045e714972128303b0e9b826a240f6f831 100644 (file)
--- a/osfmk/ppc/interrupt.c
+++ b/osfmk/ppc/interrupt.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.

  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 


@@ -30,27 +30,37 @@
 #include <kern/thread.h>
 #include <kern/counters.h>
 #include <ppc/misc_protos.h>
 #include <kern/thread.h>
 #include <kern/counters.h>
 #include <ppc/misc_protos.h>

+#include <ppc/trap.h>

 #include <ppc/proc_reg.h>
 #include <ppc/exception.h>
 #include <ppc/savearea.h>
 #include <pexpert/pexpert.h>
 #include <ppc/proc_reg.h>
 #include <ppc/exception.h>
 #include <ppc/savearea.h>
 #include <pexpert/pexpert.h>

-#if    NCPUS > 1
-#include <ppc/POWERMAC/mp/MPPlugIn.h>
-#endif /* NCPUS > 1 */

 #include <sys/kdebug.h>
 
 #include <sys/kdebug.h>
 

+perfCallback perfIntHook = 0;                                          /* Pointer to CHUD trap hook routine */
+
+void unresolved_kernel_trap(int trapno,
+                                  struct savearea *ssp,
+                                  unsigned int dsisr,
+                                  addr64_t dar,
+                                  const char *message);
+

 struct savearea * interrupt(
         int type,
         struct savearea *ssp,
        unsigned int dsisr,
        unsigned int dar)
 {
 struct savearea * interrupt(
         int type,
         struct savearea *ssp,
        unsigned int dsisr,
        unsigned int dar)
 {

-       int     current_cpu, tmpr, targtemp;
-       unsigned int    throttle;
+       int     current_cpu;
+       struct per_proc_info    *proc_info;

        uint64_t                now;
        uint64_t                now;

-       thread_act_t    act;
+       thread_t                thread;

 
        disable_preemption();
 
        disable_preemption();

+
+       if(perfIntHook) {                                                       /* Is there a hook? */
+               if(perfIntHook(type, ssp, dsisr, dar) == KERN_SUCCESS) return ssp;      /* If it succeeds, we are done... */
+       }

        
 #if 0
        {
        
 #if 0
        {


@@ -58,77 +68,42 @@ struct savearea * interrupt(
                fctx_test();
        }
 #endif
                fctx_test();
        }
 #endif

-       
-       
-       current_cpu = cpu_number();

 
 

-       switch (type) {
-
-               case T_THERMAL:                                         /* Fix the air conditioning, I'm dripping with sweat, or freezing, whatever... */

 
 

-/*
- *                     Note that this code is just a hackification until we have a real thermal plan.
- */
-                       
-                       tmpr = ml_read_temp();                  /* Find out just how hot it is */
-                       targtemp = (dar >> 23) & 0x7F;  /* Get the temprature we were looking for */
-                       if(dar & 4) {                                   /* Did the temprature drop down? */
-#if 1
-                               kprintf("THERMAL below (cpu %d) target = %d; actual = %d; thrm = %08X\n", current_cpu, targtemp, tmpr, dar);
-#endif 
-#if 0
-                               throttle = ml_throttle(0);      /* Set throttle off */
-#if 1
-                               kprintf("THERMAL (cpu %d) throttle set off; last = %d\n", current_cpu, throttle);
-#endif 
-#endif
-                               ml_thrm_set(0, per_proc_info[current_cpu].thrm.throttleTemp);   /* Set no low temp and max allowable as max */
+       current_cpu = cpu_number();
+       proc_info = getPerProc();

 
 

-#if 1
-                               kprintf("THERMAL (cpu %d) temp set to: off min, %d max\n", current_cpu, per_proc_info[current_cpu].thrm.throttleTemp);
-#endif 
-                       }
-                       else {
-#if 1
-                               kprintf("THERMAL above (cpu %d) target = %d; actual = %d; thrm = %08X\n", current_cpu, targtemp, tmpr, dar);
-#endif 
-#if 0
-                               throttle = ml_throttle(32);     /* Set throttle on about 1/8th */
-#if 1
-                               kprintf("THERMAL (cpu %d) throttle set to 32; last = %d\n", current_cpu, throttle);
-#endif 
-#endif
-                               ml_thrm_set(per_proc_info[current_cpu].thrm.throttleTemp - 4, 0);       /* Set low temp to max - 4 and max off */
-#if 1
-                               kprintf("THERMAL (cpu %d) temp set to: %d min, off max\n", current_cpu, per_proc_info[current_cpu].thrm.throttleTemp - 4);
-#endif 
+       switch (type) {

 
 

-                       }
-                       break;
-                       

                case T_DECREMENTER:
                        KERNEL_DEBUG_CONSTANT(MACHDBG_CODE(DBG_MACH_EXCP_DECI, 0) | DBG_FUNC_NONE,
                case T_DECREMENTER:
                        KERNEL_DEBUG_CONSTANT(MACHDBG_CODE(DBG_MACH_EXCP_DECI, 0) | DBG_FUNC_NONE,

-                                 isync_mfdec(), ssp->save_srr0, 0, 0, 0);
+                                 isync_mfdec(), (unsigned int)ssp->save_srr0, 0, 0, 0);

        
 #if 0
                        if (pcsample_enable) {
        
 #if 0
                        if (pcsample_enable) {

-                               if (find_user_regs(current_act()))
-                                 add_pcsamples (user_pc(current_act()));
+                               if (find_user_regs(current_thread()))
+                                 add_pcsamples (user_pc(current_thread()));

                        }
 #endif
 
                        }
 #endif
 

-                       act = current_act();                                    /* Find ourselves */
-                       if(act->mact.qactTimer != 0) {  /* Is the timer set? */
-                               clock_get_uptime(&now);                         /* Find out what time it is */
-                               if (act->mact.qactTimer <= now) {       /* It is set, has it popped? */
-                                       act->mact.qactTimer = 0;                /* Clear single shot timer */
-                                       if((unsigned int)act->mact.vmmControl & 0xFFFFFFFE) {   /* Are there any virtual machines? */
-                                               vmm_timer_pop(act);                     /* Yes, check out them out... */
+                       now = mach_absolute_time();                             /* Find out what time it is */
+                       
+                       if(now >= proc_info->pms.pmsPop) {              /* Is it time for power management state change? */
+                               pmsStep(1);                                                     /* Yes, advance step */
+                               now = mach_absolute_time();                     /* Get the time again since we ran a bit */
+                       }
+
+                       thread = current_thread();                                      /* Find ourselves */
+                       if(thread->machine.qactTimer != 0) {    /* Is the timer set? */
+                               if (thread->machine.qactTimer <= now) { /* It is set, has it popped? */
+                                       thread->machine.qactTimer = 0;          /* Clear single shot timer */
+                                       if((unsigned int)thread->machine.vmmControl & 0xFFFFFFFE) {     /* Are there any virtual machines? */
+                                               vmm_timer_pop(thread);                  /* Yes, check out them out... */

                                        }
                                }
                        }
 
                                        }
                                }
                        }
 

-                       rtclock_intr(0, ssp, 0);
+                       rtclock_intr(ssp);

                        break;
        
                case T_INTERRUPT:
                        break;
        
                case T_INTERRUPT:


@@ -136,13 +111,13 @@ struct savearea * interrupt(
                        counter_always(c_incoming_interrupts++);
        
                        KERNEL_DEBUG_CONSTANT(MACHDBG_CODE(DBG_MACH_EXCP_INTR, 0) | DBG_FUNC_START,
                        counter_always(c_incoming_interrupts++);
        
                        KERNEL_DEBUG_CONSTANT(MACHDBG_CODE(DBG_MACH_EXCP_INTR, 0) | DBG_FUNC_START,

-                          current_cpu, ssp->save_srr0, 0, 0, 0);
+                          current_cpu, (unsigned int)ssp->save_srr0, 0, 0, 0);

        
        

-                       per_proc_info[current_cpu].interrupt_handler(
-                               per_proc_info[current_cpu].interrupt_target, 
-                               per_proc_info[current_cpu].interrupt_refCon,
-                               per_proc_info[current_cpu].interrupt_nub, 
-                               per_proc_info[current_cpu].interrupt_source);
+                       proc_info->interrupt_handler(
+                               proc_info->interrupt_target, 
+                               proc_info->interrupt_refCon,
+                               proc_info->interrupt_nub, 
+                               proc_info->interrupt_source);

        
                        KERNEL_DEBUG_CONSTANT(MACHDBG_CODE(DBG_MACH_EXCP_INTR, 0) | DBG_FUNC_END,
                           0, 0, 0, 0, 0);
        
                        KERNEL_DEBUG_CONSTANT(MACHDBG_CODE(DBG_MACH_EXCP_INTR, 0) | DBG_FUNC_END,
                           0, 0, 0, 0, 0);


@@ -161,11 +136,8 @@ struct savearea * interrupt(
        
                                
                default:
        
                                
                default:

-       #if     MACH_KDP || MACH_KDB
-                       (void)Call_Debugger(type, ssp);
-       #else
-                       panic("Invalid interrupt type %x\n", type);
-       #endif
+                       if (!Call_Debugger(type, ssp))
+                               unresolved_kernel_trap(type, ssp, dsisr, dar, NULL);

                        break;
        }
 
                        break;
        }