Fixed set partition bug

4 files changed, 31 insertions, 5 deletions

diff --git a/litmus/bank_proc.c b/litmus/bank_proc.c
index 53c20db4463a..05c7fc3df98c 100644
--- a/litmus/bank_proc.c
+++ b/litmus/bank_proc.c
@@ -229,6 +229,14 @@ struct page *new_alloc_page(struct page *page, unsigned long node, int **x)
         // Decode the node to decide what color pages we should provide
         switch(node ){
                 case 0:
+                case 1:
+                case 2:
+                case 3:
+                        color = (color%4) * 4 + node;
+                case 4:
+                        color = (color%16);
+/*
+                case 0:
                 case 1: 
                 case 2: 
                 case 3:
@@ -241,8 +249,8 @@ struct page *new_alloc_page(struct page *page, unsigned long node, int **x)
                         break;
                 default:
                         TRACE_CUR("Wrong color %lu\n", color);  
-//                      printk(KERN_WARNING "Wrong color %lu\n", color);
                         return rPage;
+*/
         }
 
 
diff --git a/litmus/cache_proc.c b/litmus/cache_proc.c
index bb9d3414530f..68f68bfedf93 100644
--- a/litmus/cache_proc.c
+++ b/litmus/cache_proc.c
@@ -48,6 +48,11 @@ u32 way_partitions[5] = {
         0xFFFF00FF, /* lv C */
 };
 
+u32 set_partitions[2] = {
+        0xFFFFFF00, /* cpuX A and B */
+        0xFFFF00FF, /* lv C */
+};
+
 u32 prev_lockdown_d_reg[5] = {
         0x00000000,
         0x00000000,
@@ -190,8 +195,8 @@ int lock_all_handler(struct ctl_table *table, int write, void __user *buffer,
                         writel_relaxed(nr_unlocked_way[0], ld_d_reg(i));
                         writel_relaxed(nr_unlocked_way[0], ld_i_reg(i));
                 }
-                print_lockdown_registers();
         }
+        print_lockdown_registers();
 
 out:
         mutex_unlock(&lockdown_proc);
@@ -229,6 +234,9 @@ out:
 
 void do_way_partition(enum crit_level lv, int cpu)
 {
+        if (use_set_partition == 1 && use_way_partition == 1)
+                printk(KERN_ALERT "BOTH SET, WAY ARE SET!!!!\n");
+        
         if (use_way_partition == 1) {
                 if (lv < CRIT_LEVEL_C) {
                         writel_relaxed(way_partitions[cpu], ld_d_reg(cpu));
@@ -237,6 +245,14 @@ void do_way_partition(enum crit_level lv, int cpu)
                         writel_relaxed(way_partitions[4], ld_d_reg(cpu));
                         writel_relaxed(way_partitions[4], ld_i_reg(cpu));
                 }
+        } else if (use_set_partition == 1) {
+                if (lv < CRIT_LEVEL_C) {
+                        writel_relaxed(set_partitions[0], ld_d_reg(cpu));
+                        writel_relaxed(set_partitions[0], ld_i_reg(cpu));
+                } else {
+                        writel_relaxed(set_partitions[1], ld_d_reg(cpu));
+                        writel_relaxed(set_partitions[1], ld_i_reg(cpu));
+                }
         }
 }
 
diff --git a/litmus/sched_mc2.c b/litmus/sched_mc2.c
index aa6452a5732c..1c7cdfea836a 100644
--- a/litmus/sched_mc2.c
+++ b/litmus/sched_mc2.c
@@ -575,12 +575,13 @@ struct task_struct* mc2_dispatch(struct sup_reservation_environment* sup_env, st
         
         /* no eligible level A or B tasks exists */
         /* check the ghost job */
+        /*
         ce = &state->crit_entries[CRIT_LEVEL_C];
         if (ce->running) {
                 TRACE_TASK(ce->running," is GHOST\n");
                 return NULL;
         }
-        
+        */
         cur_priority = _lowest_prio_cpu.cpu_entries[state->cpu].deadline;
         
         //TRACE("****** ACTIVE LIST ******\n");
@@ -858,6 +859,7 @@ static long mc2_complete_job(void)
                 local_irq_restore(flags);
                 preempt_enable();
         }
+        
         sched_trace_task_completion(current, 0);
         
         /* update the next release time and deadline */
@@ -879,7 +881,7 @@ static long mc2_complete_job(void)
                 TRACE_CUR("TARDY: release=%llu now=%llu\n", get_release(current), litmus_clock());
                 preempt_enable();
 //              if (get_task_crit_level(current) == CRIT_LEVEL_A)
-//                      sched_trace_task_release(current);
+                sched_trace_task_release(current);
         }
 
         TRACE_CUR("mc2_complete_job returns at %llu\n", litmus_clock());
diff --git a/litmus/sched_task_trace.c b/litmus/sched_task_trace.c
index 933e7e4c7094..6224f8c625b1 100644
--- a/litmus/sched_task_trace.c
+++ b/litmus/sched_task_trace.c
@@ -15,7 +15,7 @@
 #include <litmus/feather_trace.h>
 #include <litmus/ftdev.h>
 
-#define NO_EVENTS               (1 << CONFIG_SCHED_TASK_TRACE_SHIFT)
+#define NO_EVENTS               (1 << (CONFIG_SCHED_TASK_TRACE_SHIFT+3))
 
 #define now() litmus_clock()