xnu-201.42.3.tar.gz

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

diff --git a/osfmk/ppc/machine_routines.c b/osfmk/ppc/machine_routines.c
index 8333d637c4bc0866447ea96ea91b9ca60a363fbb..7ad3389224454cc08f5fd84a31f8b2106198603c 100644 (file)
--- a/osfmk/ppc/machine_routines.c
+++ b/osfmk/ppc/machine_routines.c
@@ -30,7 +30,6 @@
 #include <kern/processor.h>
 
 boolean_t get_interrupts_enabled(void);
 #include <kern/processor.h>
 
 boolean_t get_interrupts_enabled(void);

-extern boolean_t set_interrupts_enabled(boolean_t);

 
 /* Map memory map IO space */
 vm_offset_t 
 
 /* Map memory map IO space */
 vm_offset_t 


@@ -120,10 +119,7 @@ void ml_install_interrupt_handler(
        per_proc_info[current_cpu].interrupt_handler = handler;
        per_proc_info[current_cpu].interrupt_refCon  = refCon;
 
        per_proc_info[current_cpu].interrupt_handler = handler;
        per_proc_info[current_cpu].interrupt_refCon  = refCon;
 

-       per_proc_info[current_cpu].get_interrupts_enabled 
-                                               = get_interrupts_enabled;
-       per_proc_info[current_cpu].set_interrupts_enabled 
-                                               = set_interrupts_enabled;  
+       per_proc_info[current_cpu].interrupts_enabled = TRUE;  

        (void) ml_set_interrupts_enabled(current_state);
 }
 
        (void) ml_set_interrupts_enabled(current_state);
 }
 


@@ -136,10 +132,7 @@ void ml_init_interrupt(void)
        current_state = ml_get_interrupts_enabled();
 
        current_cpu = cpu_number();
        current_state = ml_get_interrupts_enabled();
 
        current_cpu = cpu_number();

-       per_proc_info[current_cpu].get_interrupts_enabled 
-                                               = get_interrupts_enabled;
-       per_proc_info[current_cpu].set_interrupts_enabled 
-                                               = set_interrupts_enabled;  
+       per_proc_info[current_cpu].interrupts_enabled = TRUE;  

        (void) ml_set_interrupts_enabled(current_state);
 }
 
        (void) ml_set_interrupts_enabled(current_state);
 }
 


@@ -170,7 +163,10 @@ boolean_t fake_set_interrupts_enabled(boolean_t enable)
 /* Get Interrupts Enabled */
 boolean_t ml_get_interrupts_enabled(void)
 {
 /* Get Interrupts Enabled */
 boolean_t ml_get_interrupts_enabled(void)
 {

-       return(per_proc_info[cpu_number()].get_interrupts_enabled());
+       if (per_proc_info[cpu_number()].interrupts_enabled == TRUE)
+               return(get_interrupts_enabled());
+       else
+               return(fake_get_interrupts_enabled());

 }
 
 boolean_t get_interrupts_enabled(void)
 }
 
 boolean_t get_interrupts_enabled(void)


@@ -178,20 +174,16 @@ boolean_t get_interrupts_enabled(void)
        return((mfmsr() & MASK(MSR_EE)) != 0);
 }
 
        return((mfmsr() & MASK(MSR_EE)) != 0);
 }
 

-/* Set Interrupts Enabled */
-boolean_t ml_set_interrupts_enabled(boolean_t enable)
-{
-       return(per_proc_info[cpu_number()].set_interrupts_enabled(enable));
-}
-

 /* Check if running at interrupt context */
 boolean_t ml_at_interrupt_context(void)
 {
 /* Check if running at interrupt context */
 boolean_t ml_at_interrupt_context(void)
 {

-       /*
-        * If running at interrupt context, the current thread won't be 
-        * dispatched on another cpu. There is no need to turn off preemption.
-        */
-       return (per_proc_info[cpu_number()].istackptr == 0);
+       boolean_t       ret;
+       boolean_t       current_state;
+
+       current_state = ml_set_interrupts_enabled(FALSE);
+       ret = (per_proc_info[cpu_number()].istackptr == 0);     
+       ml_set_interrupts_enabled(current_state);
+       return(ret);

 }
 
 /* Generate a fake interrupt */
 }
 
 /* Generate a fake interrupt */


@@ -200,15 +192,19 @@ void ml_cause_interrupt(void)
        CreateFakeIO();
 }
 
        CreateFakeIO();
 }
 

-void machine_clock_assist(void)
+void ml_thread_policy( 
+       thread_t thread,
+       unsigned policy_id,
+       unsigned policy_info)

 {
 {

-       if (per_proc_info[cpu_number()].get_interrupts_enabled == fake_get_interrupts_enabled)
-               CreateFakeDEC();
+       if ((policy_id == MACHINE_GROUP) &&
+           ((per_proc_info[0].pf.Available) & pfSMPcap))
+               thread_bind(thread, master_processor);

 }
 
 void machine_idle(void)
 {
 }
 
 void machine_idle(void)
 {

-        if (per_proc_info[cpu_number()].get_interrupts_enabled != fake_get_interrupts_enabled) {
+        if (per_proc_info[cpu_number()].interrupts_enabled == TRUE) {

                int cur_decr;
 
                machine_idle_ppc();
                int cur_decr;
 
                machine_idle_ppc();


@@ -316,6 +312,50 @@ ml_ppc_get_info(ml_ppc_cpu_info_t *cpu_info)
   }
 }
 
   }
 }
 

+#define l2em 0x80000000
+#define l3em 0x80000000
+
+extern int real_ncpus;
+
+int
+ml_enable_cache_level(int cache_level, int enable)
+{
+  int old_mode;
+  unsigned long available, ccr;
+  
+  if (real_ncpus != 1) return -1;
+  
+  available = per_proc_info[0].pf.Available;
+  
+  if ((cache_level == 2) && (available & pfL2)) {
+    ccr = per_proc_info[0].pf.l2cr;
+    old_mode = (ccr & l2em) ? TRUE : FALSE;
+    if (old_mode != enable) {
+      if (enable) ccr = per_proc_info[0].pf.l2crOriginal;
+      else ccr = 0;
+      per_proc_info[0].pf.l2cr = ccr;
+      cacheInit();
+    }
+    
+    return old_mode;
+  }
+  
+  if ((cache_level == 3) && (available & pfL3)) {
+    ccr = per_proc_info[0].pf.l3cr;
+    old_mode = (ccr & l3em) ? TRUE : FALSE;
+    if (old_mode != enable) {
+      if (enable) ccr = per_proc_info[0].pf.l3crOriginal;
+      else ccr = 0;
+      per_proc_info[0].pf.l3cr = ccr;
+      cacheInit();
+    }
+    
+    return old_mode;
+  }
+  
+  return -1;
+}
+

 void
 init_ast_check(processor_t processor)
 {}
 void
 init_ast_check(processor_t processor)
 {}


@@ -324,8 +364,7 @@ void
 cause_ast_check(processor_t processor)
 {
        if ((processor != current_processor())
 cause_ast_check(processor_t processor)
 {
        if ((processor != current_processor())

-           && (per_proc_info[processor->slot_num].get_interrupts_enabled
-               != fake_get_interrupts_enabled))
+           && (per_proc_info[processor->slot_num].interrupts_enabled == TRUE))

                cpu_signal(processor->slot_num, SIGPast, NULL, NULL);
 }
               
                cpu_signal(processor->slot_num, SIGPast, NULL, NULL);
 }
               


@@ -374,3 +413,4 @@ be_tracing()
   int mycpu = cpu_number();
   return(per_proc_info[mycpu].cpu_flags & traceBE);
 }
   int mycpu = cpu_number();
   return(per_proc_info[mycpu].cpu_flags & traceBE);
 }

+