Merge branch 'cris' of git://www.jni.nu/cris

* 'cris' of git://www.jni.nu/cris: (158 commits)
  CRIS v32: Remove hwregs/timer_defs.h, it is now architecture specific.
  CRIS v32: Change drivers/i2c.c locking.
  CRIS v32: Rewrite ARTPEC-3 gpio driver to avoid volatiles and general cleanup.
  CRIS: Add new timerfd syscall entries.
  MAINTAINERS: Add my information for the CRIS port.
  CRIS v32: Correct spelling of bandwidth in function name.
  CRIS v32: Clean up nandflash.c for ARTPEC-3 and ETRAX FS.
  CRIS v10: Cleanup of drivers/gpio.c
  CRIS v10: drivers/net/cris/eth_v10.c rename LED defines to CRIS_LED to avoid name clash.
  CRIS: Make io_pwm_set_period members unsigned in etraxgpio.h
  CRIS: Move ETRAX_AXISFLASHMAP to common Kconfig file.
  CRIS: Drop regs parameter from call to profile_tick in kernel/time.c
  CRIS v32: Fix minor formatting issue in mach-a3/io.c
  CRIS v32: Initialize GIO even if we're rambooting in kernel/head.S
  CRIS v32: Remove kernel/arbiter.c, it now exists in machine dependent directory.
  CRIS v32: Minor changes to avoid errors in asm-cris/arch-v32/hwregs/reg_rdwr.h
  CRIS v32: arch-v32/hwregs/intr_vect_defs.h moved to machine dependent directory.
  CRIS v32: Correct offset for TASK_pid in asm-cris/arch-v32/offset.h
  CRIS v32: Move register map header to machine dependent directory.
  CRIS v32: Let compiler know that memory is clobbered after a break op.
  ...

1 files changed, 31 insertions, 17 deletions

diff --git a/arch/cris/arch-v32/mm/intmem.c b/arch/cris/arch-v32/mm/intmem.c
index 41ee7f7997fd..9e8b69cdf19e 100644
--- a/arch/cris/arch-v32/mm/intmem.c
+++ b/arch/cris/arch-v32/mm/intmem.c
@@ -7,11 +7,17 @@
 #include <linux/list.h>
 #include <linux/slab.h>
 #include <asm/io.h>
-#include <asm/arch/memmap.h>
+#include <memmap.h>
 
 #define STATUS_FREE 0
 #define STATUS_ALLOCATED 1
 
+#ifdef CONFIG_ETRAX_L2CACHE
+#define RESERVED_SIZE 66*1024
+#else
+#define RESERVED_SIZE 0
+#endif
+
 struct intmem_allocation {
         struct list_head entry;
         unsigned int size;
@@ -30,9 +36,10 @@ static void crisv32_intmem_init(void)
                 struct intmem_allocation* alloc =
                   (struct intmem_allocation*)kmalloc(sizeof *alloc, GFP_KERNEL);
                 INIT_LIST_HEAD(&intmem_allocations);
-                intmem_virtual = ioremap(MEM_INTMEM_START, MEM_INTMEM_SIZE);
+                intmem_virtual = ioremap(MEM_INTMEM_START + RESERVED_SIZE,
+                                         MEM_INTMEM_SIZE - RESERVED_SIZE);
                 initiated = 1;
-                alloc->size = MEM_INTMEM_SIZE;
+                alloc->size = MEM_INTMEM_SIZE - RESERVED_SIZE;
                 alloc->offset = 0;
                 alloc->status = STATUS_FREE;
                 list_add_tail(&alloc->entry, &intmem_allocations);
@@ -59,19 +66,23 @@ void* crisv32_intmem_alloc(unsigned size, unsigned align)
                                         (struct intmem_allocation*)
                                         kmalloc(sizeof *alloc, GFP_ATOMIC);
                                 alloc->status = STATUS_FREE;
-                                alloc->size = allocation->size - size - alignment;
-                                alloc->offset = allocation->offset + size;
+                                alloc->size = allocation->size - size -
+                                        alignment;
+                                alloc->offset = allocation->offset + size +
+                                        alignment;
                                 list_add(&alloc->entry, &allocation->entry);
 
                                 if (alignment) {
-                                        struct intmem_allocation* tmp;
-                                        tmp = (struct intmem_allocation*)
-                                                kmalloc(sizeof *tmp, GFP_ATOMIC);
+                                        struct intmem_allocation *tmp;
+                                        tmp = (struct intmem_allocation *)
+                                                kmalloc(sizeof *tmp,
+                                                        GFP_ATOMIC);
                                         tmp->offset = allocation->offset;
                                         tmp->size = alignment;
                                         tmp->status = STATUS_FREE;
                                         allocation->offset += alignment;
-                                        list_add_tail(&tmp->entry, &allocation->entry);
+                                        list_add_tail(&tmp->entry,
+                                                &allocation->entry);
                                 }
                         }
                         allocation->status = STATUS_ALLOCATED;
@@ -96,22 +107,24 @@ void crisv32_intmem_free(void* addr)
 
         list_for_each_entry_safe(allocation, tmp, &intmem_allocations, entry) {
                 if (allocation->offset == (int)(addr - intmem_virtual)) {
-                        struct intmem_allocation* prev =
+                        struct intmem_allocation *prev =
                           list_entry(allocation->entry.prev,
                                      struct intmem_allocation, entry);
-                        struct intmem_allocation* next =
+                        struct intmem_allocation *next =
                           list_entry(allocation->entry.next,
                                      struct intmem_allocation, entry);
 
                         allocation->status = STATUS_FREE;
                         /* Join with prev and/or next if also free */
-                        if (prev->status == STATUS_FREE) {
+                        if ((prev != &intmem_allocations) &&
+                                        (prev->status == STATUS_FREE)) {
                                 prev->size += allocation->size;
                                 list_del(&allocation->entry);
                                 kfree(allocation);
                                 allocation = prev;
                         }
-                        if (next->status == STATUS_FREE) {
+                        if ((next != &intmem_allocations) &&
+                                        (next->status == STATUS_FREE)) {
                                 allocation->size += next->size;
                                 list_del(&next->entry);
                                 kfree(next);
@@ -125,15 +138,16 @@ void crisv32_intmem_free(void* addr)
 
 void* crisv32_intmem_phys_to_virt(unsigned long addr)
 {
-        return (void*)(addr - MEM_INTMEM_START+
-                       (unsigned long)intmem_virtual);
+        return (void *)(addr - (MEM_INTMEM_START + RESERVED_SIZE) +
+                (unsigned long)intmem_virtual);
 }
 
 unsigned long crisv32_intmem_virt_to_phys(void* addr)
 {
         return (unsigned long)((unsigned long )addr -
-          (unsigned long)intmem_virtual + MEM_INTMEM_START);
+                (unsigned long)intmem_virtual + MEM_INTMEM_START +
+                RESERVED_SIZE);
 }
 
-
+module_init(crisv32_intmem_init);