Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6: (21 commits)
  xtensa: we don't need to include asm/io.h
  xtensa: only build platform or variant if they contain a Makefile
  xtensa: make startup code discardable
  xtensa: ccount clocksource
  xtensa: remove platform rtc hooks
  xtensa: use generic sched_clock()
  xtensa: platform: s6105
  xtensa: let platform override KERNELOFFSET
  xtensa: s6000 variant
  xtensa: s6000 variant core definitions
  xtensa: variant irq set callbacks
  xtensa: variant-specific code
  xtensa: nommu support
  xtensa: add flat support
  xtensa: enforce slab alignment to maximum register width
  xtensa: cope with ram beginning at higher addresses
  xtensa: don't make bootmem bitmap larger than required
  xtensa: fix init_bootmem_node() argument order
  xtensa: use correct stack pointer for stack traces
  xtensa: beat Kconfig into shape
  ...

9 files changed, 67 insertions, 118 deletions

diff --git a/arch/xtensa/kernel/entry.S b/arch/xtensa/kernel/entry.S
index a51d36a27389..80d24c485fd3 100644
--- a/arch/xtensa/kernel/entry.S
+++ b/arch/xtensa/kernel/entry.S
@@ -1463,6 +1463,7 @@ ENTRY(_spill_registers)
         callx0  a0              # should not return
 1:      j       1b
 
+#ifdef CONFIG_MMU
 /*
  * We should never get here. Bail out!
  */
@@ -1775,7 +1776,7 @@ ENTRY(fast_store_prohibited)
         bbsi.l  a2, PS_UM_BIT, 1f
         j       _kernel_exception
 1:      j       _user_exception
-
+#endif /* CONFIG_MMU */
 
 /*
  * System Calls.
diff --git a/arch/xtensa/kernel/head.S b/arch/xtensa/kernel/head.S
index 67e69139520b..0817f9db836e 100644
--- a/arch/xtensa/kernel/head.S
+++ b/arch/xtensa/kernel/head.S
@@ -53,7 +53,7 @@ _start:	_j	2f
 2:      l32r    a0, 1b
         jx      a0
 
-        .text
+        .section .init.text, "ax"
         .align 4
 _startup:
 
@@ -235,8 +235,9 @@ should_never_return:
  */
         
 .section ".bss.page_aligned", "w"
+#ifdef CONFIG_MMU
 ENTRY(swapper_pg_dir)
         .fill   PAGE_SIZE, 1, 0
+#endif
 ENTRY(empty_zero_page)
         .fill   PAGE_SIZE, 1, 0
-
diff --git a/arch/xtensa/kernel/irq.c b/arch/xtensa/kernel/irq.c
index f3b66fba5b8f..a36c85edd045 100644
--- a/arch/xtensa/kernel/irq.c
+++ b/arch/xtensa/kernel/irq.c
@@ -132,6 +132,18 @@ static void xtensa_irq_unmask(unsigned int irq)
         set_sr (cached_irq_mask, INTENABLE);
 }
 
+static void xtensa_irq_enable(unsigned int irq)
+{
+        variant_irq_enable(irq);
+        xtensa_irq_unmask(irq);
+}
+
+static void xtensa_irq_disable(unsigned int irq)
+{
+        xtensa_irq_mask(irq);
+        variant_irq_disable(irq);
+}
+
 static void xtensa_irq_ack(unsigned int irq)
 {
         set_sr(1 << irq, INTCLEAR);
@@ -146,6 +158,8 @@ static int xtensa_irq_retrigger(unsigned int irq)
 
 static struct irq_chip xtensa_irq_chip = {
         .name           = "xtensa",
+        .enable         = xtensa_irq_enable,
+        .disable        = xtensa_irq_disable,
         .mask           = xtensa_irq_mask,
         .unmask         = xtensa_irq_unmask,
         .ack            = xtensa_irq_ack,
diff --git a/arch/xtensa/kernel/platform.c b/arch/xtensa/kernel/platform.c
index 69675f216062..1b91a97f1d84 100644
--- a/arch/xtensa/kernel/platform.c
+++ b/arch/xtensa/kernel/platform.c
@@ -36,8 +36,6 @@ _F(void, power_off, (void), { while(1); });
 _F(void, idle, (void), { __asm__ __volatile__ ("waiti 0" ::: "memory"); });
 _F(void, heartbeat, (void), { });
 _F(int,  pcibios_fixup, (void), { return 0; });
-_F(int, get_rtc_time, (time_t* t), { return 0; });
-_F(int, set_rtc_time, (time_t t), { return 0; });
 
 #ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT
 _F(void, calibrate_ccount, (void),
diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c
index 4ec1633c2941..1e5a034fe011 100644
--- a/arch/xtensa/kernel/setup.c
+++ b/arch/xtensa/kernel/setup.c
@@ -84,7 +84,13 @@ sysmem_info_t __initdata sysmem;
 int initrd_is_mapped;
 #endif
 
+#ifdef CONFIG_MMU
 extern void init_mmu(void);
+#else
+static inline void init_mmu(void) { }
+#endif
+
+extern void zones_init(void);
 
 /*
  * Boot parameter parsing.
@@ -286,6 +292,7 @@ void __init setup_arch(char **cmdline_p)
 
 
         paging_init();
+        zones_init();
 
 #ifdef CONFIG_VT
 # if defined(CONFIG_VGA_CONSOLE)
diff --git a/arch/xtensa/kernel/time.c b/arch/xtensa/kernel/time.c
index 8df1e842f6d4..8848120d291b 100644
--- a/arch/xtensa/kernel/time.c
+++ b/arch/xtensa/kernel/time.c
@@ -14,7 +14,7 @@
 
 #include <linux/errno.h>
 #include <linux/time.h>
-#include <linux/timex.h>
+#include <linux/clocksource.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -25,27 +25,31 @@
 #include <asm/timex.h>
 #include <asm/platform.h>
 
-
-DEFINE_SPINLOCK(rtc_lock);
-EXPORT_SYMBOL(rtc_lock);
-
-
 #ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT
 unsigned long ccount_per_jiffy;         /* per 1/HZ */
 unsigned long nsec_per_ccount;          /* nsec per ccount increment */
 #endif
 
-static long last_rtc_update = 0;
-
-/*
- * Scheduler clock - returns current tim in nanosec units.
- */
-
-unsigned long long sched_clock(void)
+static cycle_t ccount_read(void)
 {
-        return (unsigned long long)jiffies * (1000000000 / HZ);
+        return (cycle_t)get_ccount();
 }
 
+static struct clocksource ccount_clocksource = {
+        .name = "ccount",
+        .rating = 200,
+        .read = ccount_read,
+        .mask = CLOCKSOURCE_MASK(32),
+        /*
+         * With a shift of 22 the lower limit of the cpu clock is
+         * 1MHz, where NSEC_PER_CCOUNT is 1000 or a bit less than
+         * 2^10: Since we have 32 bits and the multiplicator can
+         * already take up as much as 10 bits, this leaves us with
+         * remaining upper 22 bits.
+         */
+        .shift = 22,
+};
+
 static irqreturn_t timer_interrupt(int irq, void *dev_id);
 static struct irqaction timer_irqaction = {
         .handler =      timer_interrupt,
@@ -55,11 +59,11 @@ static struct irqaction timer_irqaction = {
 
 void __init time_init(void)
 {
-        time_t sec_o, sec_n = 0;
+        xtime.tv_nsec = 0;
+        xtime.tv_sec = read_persistent_clock();
 
-        /* The platform must provide a function to calibrate the processor
-         * speed for the CALIBRATE.
-         */
+        set_normalized_timespec(&wall_to_monotonic,
+                -xtime.tv_sec, -xtime.tv_nsec);
 
 #ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT
         printk("Calibrating CPU frequency ");
@@ -67,19 +71,10 @@ void __init time_init(void)
         printk("%d.%02d MHz\n", (int)ccount_per_jiffy/(1000000/HZ),
                         (int)(ccount_per_jiffy/(10000/HZ))%100);
 #endif
-
-        /* Set time from RTC (if provided) */
-
-        if (platform_get_rtc_time(&sec_o) == 0)
-                while (platform_get_rtc_time(&sec_n))
-                        if (sec_o != sec_n)
-                                break;
-
-        xtime.tv_nsec = 0;
-        last_rtc_update = xtime.tv_sec = sec_n;
-
-        set_normalized_timespec(&wall_to_monotonic,
-                -xtime.tv_sec, -xtime.tv_nsec);
+        ccount_clocksource.mult =
+                clocksource_hz2mult(CCOUNT_PER_JIFFY * HZ,
+                                ccount_clocksource.shift);
+        clocksource_register(&ccount_clocksource);
 
         /* Initialize the linux timer interrupt. */
 
@@ -87,69 +82,6 @@ void __init time_init(void)
         set_linux_timer(get_ccount() + CCOUNT_PER_JIFFY);
 }
 
-
-int do_settimeofday(struct timespec *tv)
-{
-        time_t wtm_sec, sec = tv->tv_sec;
-        long wtm_nsec, nsec = tv->tv_nsec;
-        unsigned long delta;
-
-        if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
-                return -EINVAL;
-
-        write_seqlock_irq(&xtime_lock);
-
-        /* This is revolting. We need to set "xtime" correctly. However, the
-         * value in this location is the value at the most recent update of
-         * wall time.  Discover what correction gettimeofday() would have
-         * made, and then undo it!
-         */
-
-        delta = CCOUNT_PER_JIFFY;
-        delta += get_ccount() - get_linux_timer();
-        nsec -= delta * NSEC_PER_CCOUNT;
-
-        wtm_sec  = wall_to_monotonic.tv_sec + (xtime.tv_sec - sec);
-        wtm_nsec = wall_to_monotonic.tv_nsec + (xtime.tv_nsec - nsec);
-
-        set_normalized_timespec(&xtime, sec, nsec);
-        set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec);
-
-        ntp_clear();
-        write_sequnlock_irq(&xtime_lock);
-        return 0;
-}
-
-EXPORT_SYMBOL(do_settimeofday);
-
-
-void do_gettimeofday(struct timeval *tv)
-{
-        unsigned long flags;
-        unsigned long volatile sec, usec, delta, seq;
-
-        do {
-                seq = read_seqbegin_irqsave(&xtime_lock, flags);
-
-                sec = xtime.tv_sec;
-                usec = (xtime.tv_nsec / NSEC_PER_USEC);
-
-                delta = get_linux_timer() - get_ccount();
-
-        } while (read_seqretry_irqrestore(&xtime_lock, seq, flags));
-
-        usec += (((unsigned long) CCOUNT_PER_JIFFY - delta)
-                 * (unsigned long) NSEC_PER_CCOUNT) / NSEC_PER_USEC;
-
-        for (; usec >= 1000000; sec++, usec -= 1000000)
-                ;
-
-        tv->tv_sec = sec;
-        tv->tv_usec = usec;
-}
-
-EXPORT_SYMBOL(do_gettimeofday);
-
 /*
  * The timer interrupt is called HZ times per second.
  */
@@ -178,16 +110,6 @@ again:
                 next += CCOUNT_PER_JIFFY;
                 set_linux_timer(next);
 
-                if (ntp_synced() &&
-                    xtime.tv_sec - last_rtc_update >= 659 &&
-                    abs((xtime.tv_nsec/1000)-(1000000-1000000/HZ))<5000000/HZ) {
-
-                        if (platform_set_rtc_time(xtime.tv_sec+1) == 0)
-                                last_rtc_update = xtime.tv_sec+1;
-                        else
-                                /* Do it again in 60 s */
-                                last_rtc_update += 60;
-                }
                 write_sequnlock(&xtime_lock);
         }
 
@@ -213,4 +135,3 @@ void __cpuinit calibrate_delay(void)
                (loops_per_jiffy/(10000/HZ)) % 100);
 }
 #endif
-
diff --git a/arch/xtensa/kernel/traps.c b/arch/xtensa/kernel/traps.c
index c44f830b6c7a..9f0b71189e94 100644
--- a/arch/xtensa/kernel/traps.c
+++ b/arch/xtensa/kernel/traps.c
@@ -104,6 +104,7 @@ static dispatch_init_table_t __initdata dispatch_init_table[] = {
 #endif
 { EXCCAUSE_UNALIGNED,           KRNL,      fast_unaligned },
 #endif
+#ifdef CONFIG_MMU
 { EXCCAUSE_ITLB_MISS,           0,         do_page_fault },
 { EXCCAUSE_ITLB_MISS,           USER|KRNL, fast_second_level_miss},
 { EXCCAUSE_ITLB_MULTIHIT,               0,         do_multihit },
@@ -118,6 +119,7 @@ static dispatch_init_table_t __initdata dispatch_init_table[] = {
 { EXCCAUSE_STORE_CACHE_ATTRIBUTE,       USER|KRNL, fast_store_prohibited },
 { EXCCAUSE_STORE_CACHE_ATTRIBUTE,       0,         do_page_fault },
 { EXCCAUSE_LOAD_CACHE_ATTRIBUTE,        0,         do_page_fault },
+#endif /* CONFIG_MMU */
 /* XCCHAL_EXCCAUSE_FLOATING_POINT unhandled */
 #if XTENSA_HAVE_COPROCESSOR(0)
 COPROCESSOR(0),
@@ -372,11 +374,10 @@ void show_trace(struct task_struct *task, unsigned long *sp)
         unsigned long a0, a1, pc;
         unsigned long sp_start, sp_end;
 
-        a1 = (unsigned long)sp;
-
-        if (a1 == 0)
-                __asm__ __volatile__ ("mov %0, a1\n" : "=a"(a1));
-
+        if (sp)
+                a1 = (unsigned long)sp;
+        else
+                a1 = task->thread.sp;
 
         sp_start = a1 & ~(THREAD_SIZE-1);
         sp_end = sp_start + THREAD_SIZE;
@@ -418,9 +419,8 @@ void show_stack(struct task_struct *task, unsigned long *sp)
         int i = 0;
         unsigned long *stack;
 
-        if (sp == 0)
-                __asm__ __volatile__ ("mov %0, a1\n" : "=a"(sp));
-
+        if (!sp)
+                sp = (unsigned long *)task->thread.sp;
         stack = sp;
 
         printk("\nStack: ");
diff --git a/arch/xtensa/kernel/vectors.S b/arch/xtensa/kernel/vectors.S
index eb2d7bb69ee0..74a7518faf16 100644
--- a/arch/xtensa/kernel/vectors.S
+++ b/arch/xtensa/kernel/vectors.S
@@ -309,6 +309,7 @@ ENTRY(_DoubleExceptionVector)
          * All other exceptions are unexpected and thus unrecoverable!
          */
 
+#ifdef CONFIG_MMU
         .extern fast_second_level_miss_double_kernel
 
 .Lksp:  /* a0: a0, a1: a1, a2: a2, a3: trashed, depc: depc, excsave: a3 */
@@ -319,6 +320,9 @@ ENTRY(_DoubleExceptionVector)
         bnez    a3, .Lunrecoverable
 1:      movi    a3, fast_second_level_miss_double_kernel
         jx      a3
+#else
+.equ    .Lksp,  .Lunrecoverable
+#endif
 
         /* Critical! We can't handle this situation. PANIC! */
 
diff --git a/arch/xtensa/kernel/vmlinux.lds.S b/arch/xtensa/kernel/vmlinux.lds.S
index d506774f4b05..c1be9a4a740c 100644
--- a/arch/xtensa/kernel/vmlinux.lds.S
+++ b/arch/xtensa/kernel/vmlinux.lds.S
@@ -17,6 +17,7 @@
 #include <asm-generic/vmlinux.lds.h>
 
 #include <variant/core.h>
+#include <platform/hardware.h>
 OUTPUT_ARCH(xtensa)
 ENTRY(_start)
 
@@ -26,7 +27,9 @@ jiffies = jiffies_64 + 4;
 jiffies = jiffies_64;
 #endif
 
+#ifndef KERNELOFFSET
 #define KERNELOFFSET 0xd0001000
+#endif
 
 /* Note: In the following macros, it would be nice to specify only the
    vector name and section kind and construct "sym" and "section" using