Add the beginings of a SPARC port. Edit page-types to work on SPARC

3 files changed, 63 insertions, 26 deletions

diff --git a/litmus/color.c b/litmus/color.c
index 7b23703f6206..dad2f07b154a 100644
--- a/litmus/color.c
+++ b/litmus/color.c
@@ -6,6 +6,7 @@
 #include <linux/sysctl.h>
 #include <linux/lockdep.h>
 #include <linux/sched.h> /* required by litmus.h */
+#include <asm/io.h> /* page_to_phys on SPARC */
 
 #include <litmus/color.h>
 #include <litmus/litmus.h> /* for in_list(...) */
@@ -37,7 +38,9 @@ static struct color_group *color_groups;
 
 /* non-static: extern'ed in various files */
 unsigned long nr_colors;
+#ifdef CONFIG_X86
 struct color_cache_info color_cache_info;
+#endif
 int color_sysctl_add_pages_data;
 int color_sysctl_reclaim_pages_data;
 
@@ -115,8 +118,14 @@ static int do_add_pages(void)
         int ret = 0;
 
         while (smallest_nr_pages() < PAGES_PER_COLOR) {
+#if defined(CONFIG_X86)
                 page = alloc_page(GFP_HIGHUSER | __GFP_ZERO |
                                 __GFP_MOVABLE);
+#elif defined(CONFIG_SPARC) /* X86 */
+                page = alloc_page(GFP_HIGHUSER | __GFP_MOVABLE);
+#else
+#error What architecture are you using?
+#endif
                 if (unlikely(!page)) {
                         printk(KERN_WARNING "Could not allocate pages.\n");
                         ret = -ENOMEM;
@@ -147,7 +156,11 @@ static int do_reclaim_pages(void)
                         ClearPageLRU(page);
                         add_page_to_color_list(page);
                         nr_reclaimed++;
+                        TRACE_CUR("reclaiming page (pa:0x%10llx, pfn:%8lu, "
+                                        "color:%3lu)\n", page_to_phys(page),
+                                        page_to_pfn(page), page_color(page));
                 }
+
         }
         spin_unlock(&alloced_pages.lock);
         TRACE_CUR("Reclaimed %lu pages.\n", nr_reclaimed);
@@ -212,6 +225,7 @@ out:
  * Initialization
 ***********************************************************/
 
+#if defined(CONFIG_X86)
 /* slowest possible way to find a log, but we only do this once on boot */
 static unsigned int __init slow_log(unsigned int v)
 {
@@ -221,9 +235,24 @@ static unsigned int __init slow_log(unsigned int v)
         return r;
 }
 
-static void __init init_mask(void)
+static int __init init_mask(void)
 {
-        const unsigned int line_size_log = slow_log(color_cache_info.line_size);
+        unsigned int line_size_log = slow_log(color_cache_info.line_size);
+        int err = 0;
+
+        BUG_ON(color_cache_info.size <= 1048576 ||
+                        color_cache_info.ways < 15 ||
+                        color_cache_info.line_size != 64);
+
+        printk("Cache size: %lu  line-size: %lu  ways: %lu  sets: %lu\n",
+                        color_cache_info.size, color_cache_info.line_size,
+                        color_cache_info.ways, color_cache_info.sets);
+        if (!color_cache_info.size) {
+                printk(KERN_WARNING "No cache information found.\n");
+                err = -EINVAL;
+                goto out;
+        }
+
 
         BUG_ON(color_cache_info.size / color_cache_info.line_size /
                         color_cache_info.ways != color_cache_info.sets);
@@ -231,21 +260,31 @@ static void __init init_mask(void)
         color_mask = ((color_cache_info.sets << line_size_log) - 1) ^
                 (PAGE_SIZE - 1);
         nr_colors = (color_mask >> PAGE_SHIFT) + 1;
-        printk("Color mask: 0x%lx  Total colors: %lu\n", color_mask,
-                        nr_colors);
-        BUG_ON(LOCKDEP_MAX_NR_COLORS < nr_colors);
+out:
+        return err;
+}
+#elif defined(CONFIG_SPARC) /* X86 */
+static int __init init_mask(void)
+{
+        /* bits 17:13 */
+        color_mask = 0x3e000UL;
+        nr_colors = (1 << hweight_long(color_mask));
+        return 0;
 }
+#endif /* SPARC/X86 */
+
+
 
 static int __init init_color_groups(void)
 {
         struct color_group *cgroup;
         unsigned long i;
-        int ret = 0;
+        int err = 0;
 
         color_groups = kmalloc(nr_colors * sizeof(struct color_group), GFP_KERNEL);
         if (!color_groups) {
                 printk(KERN_WARNING "Could not allocate color groups.\n");
-                ret = -ENOMEM;
+                err = -ENOMEM;
                 goto out;
         }
 
@@ -258,33 +297,24 @@ static int __init init_color_groups(void)
                                 cgroup->_lock_name, "color%lu", i);
         }
 out:
-        return ret;
+        return err;
 }
 
 static int __init init_color(void)
 {
-        int ret = 0;
+        int err = 0;
         printk("Initializing LITMUS^RT cache coloring.\n");
 
-        BUG_ON(color_cache_info.size <= 1048576 ||
-                        color_cache_info.ways < 15 ||
-                        color_cache_info.line_size != 64);
         INIT_LIST_HEAD(&alloced_pages.list);
         spin_lock_init(&alloced_pages.lock);
 
-        printk("Cache size: %lu  line-size: %lu  ways: %lu  sets: %lu\n",
-                        color_cache_info.size, color_cache_info.line_size,
-                        color_cache_info.ways, color_cache_info.sets);
-        if (!color_cache_info.size) {
-                printk(KERN_WARNING "No cache information found.\n");
-                ret = -EINVAL;
-                goto out;
-        }
+        err = init_mask();
+        printk("PAGE_SIZE: %lu  Color mask: 0x%lx  Total colors: %lu\n",
+                        PAGE_SIZE, color_mask, nr_colors);
 
-        init_mask();
-        ret = init_color_groups();
-out:
-        return ret;
+        BUG_ON(LOCKDEP_MAX_NR_COLORS < nr_colors);
+        err = init_color_groups();
+        return err;
 }
 
 module_init(init_color);
diff --git a/litmus/color_dev.c b/litmus/color_dev.c
index e1404142c18a..10ab1e6b1161 100644
--- a/litmus/color_dev.c
+++ b/litmus/color_dev.c
@@ -4,6 +4,8 @@
 #include <linux/miscdevice.h>
 #include <linux/spinlock.h>
 #include <linux/module.h>
+#include <linux/highmem.h>
+#include <asm/io.h> /* page_to_phys on SPARC */
 
 #include <litmus/litmus.h>
 #include <litmus/color.h>
@@ -168,8 +170,12 @@ static int do_map_colored_pages(struct vm_area_struct *vma)
                         TRACE_CUR(ALLOC_NAME ": Could not get page with "
                                         " color %lu.\n", this_color);
                         /* TODO unmap mapped pages */
+                        err = -ENOMEM;
                         break;
                 }
+#ifdef CONFIG_SPARC
+                clear_user_highpage(page, addr);
+#endif
                 TRACE_CUR(ALLOC_NAME ": insert page (pa:0x%10llx, pfn:%8lu, "
                                 "color:%3lu) at 0x%lx\n", page_to_phys(page),
                                 page_to_pfn(page), this_color, addr);
@@ -178,6 +184,7 @@ static int do_map_colored_pages(struct vm_area_struct *vma)
                         TRACE_CUR(ALLOC_NAME ": vm_insert_page() failed "
                                         "(%d)\n", err);
                         /* TODO unmap mapped pages */
+                        err = -EINVAL;
                         break;
                 }
                 add_page_to_alloced_list(page);
diff --git a/litmus/sched_litmus.c b/litmus/sched_litmus.c
index 5a15ce938984..6553948407de 100644
--- a/litmus/sched_litmus.c
+++ b/litmus/sched_litmus.c
@@ -102,9 +102,9 @@ litmus_schedule(struct rq *rq, struct task_struct *prev)
                         }
                 }
 #ifdef  __ARCH_WANT_UNLOCKED_CTXSW
-                if (next->oncpu)
+                if (next->on_cpu)
                         TRACE_TASK(next, "waiting for !oncpu");
-                while (next->oncpu) {
+                while (next->on_cpu) {
                         cpu_relax();
                         mb();
                 }