Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm

* 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (178 commits)
  ARM: 7139/1: fix compilation with CONFIG_ARM_ATAG_DTB_COMPAT and large TEXT_OFFSET
  ARM: gic, local timers: use the request_percpu_irq() interface
  ARM: gic: consolidate PPI handling
  ARM: switch from NO_MACH_MEMORY_H to NEED_MACH_MEMORY_H
  ARM: mach-s5p64x0: remove mach/memory.h
  ARM: mach-s3c64xx: remove mach/memory.h
  ARM: plat-mxc: remove mach/memory.h
  ARM: mach-prima2: remove mach/memory.h
  ARM: mach-zynq: remove mach/memory.h
  ARM: mach-bcmring: remove mach/memory.h
  ARM: mach-davinci: remove mach/memory.h
  ARM: mach-pxa: remove mach/memory.h
  ARM: mach-ixp4xx: remove mach/memory.h
  ARM: mach-h720x: remove mach/memory.h
  ARM: mach-vt8500: remove mach/memory.h
  ARM: mach-s5pc100: remove mach/memory.h
  ARM: mach-tegra: remove mach/memory.h
  ARM: plat-tcc: remove mach/memory.h
  ARM: mach-mmp: remove mach/memory.h
  ARM: mach-cns3xxx: remove mach/memory.h
  ...

Fix up mostly pretty trivial conflicts in:
 - arch/arm/Kconfig
 - arch/arm/include/asm/localtimer.h
 - arch/arm/kernel/Makefile
 - arch/arm/mach-shmobile/board-ap4evb.c
 - arch/arm/mach-u300/core.c
 - arch/arm/mm/dma-mapping.c
 - arch/arm/mm/proc-v7.S
 - arch/arm/plat-omap/Kconfig
largely due to some CONFIG option renaming (ie CONFIG_PM_SLEEP ->
CONFIG_ARM_CPU_SUSPEND for the arm-specific suspend code etc) and
addition of NEED_MACH_MEMORY_H next to HAVE_IDE.

8 files changed, 396 insertions, 52 deletions

diff --git a/arch/arm/boot/compressed/.gitignore b/arch/arm/boot/compressed/.gitignore
index c6028967d33..e0936a14851 100644
--- a/arch/arm/boot/compressed/.gitignore
+++ b/arch/arm/boot/compressed/.gitignore
@@ -5,3 +5,12 @@ piggy.lzo
 piggy.lzma
 vmlinux
 vmlinux.lds
+
+# borrowed libfdt files
+fdt.c
+fdt.h
+fdt_ro.c
+fdt_rw.c
+fdt_wip.c
+libfdt.h
+libfdt_internal.h
diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
index a6b30b35ca6..21f56ff3279 100644
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
@@ -26,6 +26,10 @@ HEAD	= head.o
 OBJS    += misc.o decompress.o
 FONTC   = $(srctree)/drivers/video/console/font_acorn_8x8.c
 
+# string library code (-Os is enforced to keep it much smaller)
+OBJS            += string.o
+CFLAGS_string.o := -Os
+
 #
 # Architecture dependencies
 #
@@ -89,21 +93,41 @@ suffix_$(CONFIG_KERNEL_GZIP) = gzip
 suffix_$(CONFIG_KERNEL_LZO)  = lzo
 suffix_$(CONFIG_KERNEL_LZMA) = lzma
 
+# Borrowed libfdt files for the ATAG compatibility mode
+
+libfdt          := fdt_rw.c fdt_ro.c fdt_wip.c fdt.c
+libfdt_hdrs     := fdt.h libfdt.h libfdt_internal.h
+
+libfdt_objs     := $(addsuffix .o, $(basename $(libfdt)))
+
+$(addprefix $(obj)/,$(libfdt) $(libfdt_hdrs)): $(obj)/%: $(srctree)/scripts/dtc/libfdt/%
+        $(call cmd,shipped)
+
+$(addprefix $(obj)/,$(libfdt_objs) atags_to_fdt.o): \
+        $(addprefix $(obj)/,$(libfdt_hdrs))
+
+ifeq ($(CONFIG_ARM_ATAG_DTB_COMPAT),y)
+OBJS    += $(libfdt_objs) atags_to_fdt.o
+endif
+
 targets       := vmlinux vmlinux.lds \
                  piggy.$(suffix_y) piggy.$(suffix_y).o \
-                 font.o font.c head.o misc.o $(OBJS)
+                 lib1funcs.o lib1funcs.S font.o font.c head.o misc.o $(OBJS)
 
 # Make sure files are removed during clean
-extra-y       += piggy.gzip piggy.lzo piggy.lzma lib1funcs.S
+extra-y       += piggy.gzip piggy.lzo piggy.lzma lib1funcs.S $(libfdt) $(libfdt_hdrs)
 
 ifeq ($(CONFIG_FUNCTION_TRACER),y)
 ORIG_CFLAGS := $(KBUILD_CFLAGS)
 KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS))
 endif
 
-ccflags-y := -fpic -fno-builtin
+ccflags-y := -fpic -fno-builtin -I$(obj)
 asflags-y := -Wa,-march=all
 
+# Supply kernel BSS size to the decompressor via a linker symbol.
+KBSS_SZ = $(shell size $(obj)/../../../../vmlinux | awk 'END{print $$3}')
+LDFLAGS_vmlinux = --defsym _kernel_bss_size=$(KBSS_SZ)
 # Supply ZRELADDR to the decompressor via a linker symbol.
 ifneq ($(CONFIG_AUTO_ZRELADDR),y)
 LDFLAGS_vmlinux += --defsym zreladdr=$(ZRELADDR)
@@ -123,7 +147,7 @@ LDFLAGS_vmlinux += -T
 # For __aeabi_uidivmod
 lib1funcs = $(obj)/lib1funcs.o
 
-$(obj)/lib1funcs.S: $(srctree)/arch/$(SRCARCH)/lib/lib1funcs.S FORCE
+$(obj)/lib1funcs.S: $(srctree)/arch/$(SRCARCH)/lib/lib1funcs.S
         $(call cmd,shipped)
 
 # We need to prevent any GOTOFF relocs being used with references
diff --git a/arch/arm/boot/compressed/atags_to_fdt.c b/arch/arm/boot/compressed/atags_to_fdt.c
new file mode 100644
index 00000000000..6ce11c48117
--- /dev/null
+++ b/arch/arm/boot/compressed/atags_to_fdt.c
@@ -0,0 +1,97 @@
+#include <asm/setup.h>
+#include <libfdt.h>
+
+static int node_offset(void *fdt, const char *node_path)
+{
+        int offset = fdt_path_offset(fdt, node_path);
+        if (offset == -FDT_ERR_NOTFOUND)
+                offset = fdt_add_subnode(fdt, 0, node_path);
+        return offset;
+}
+
+static int setprop(void *fdt, const char *node_path, const char *property,
+                   uint32_t *val_array, int size)
+{
+        int offset = node_offset(fdt, node_path);
+        if (offset < 0)
+                return offset;
+        return fdt_setprop(fdt, offset, property, val_array, size);
+}
+
+static int setprop_string(void *fdt, const char *node_path,
+                          const char *property, const char *string)
+{
+        int offset = node_offset(fdt, node_path);
+        if (offset < 0)
+                return offset;
+        return fdt_setprop_string(fdt, offset, property, string);
+}
+
+static int setprop_cell(void *fdt, const char *node_path,
+                        const char *property, uint32_t val)
+{
+        int offset = node_offset(fdt, node_path);
+        if (offset < 0)
+                return offset;
+        return fdt_setprop_cell(fdt, offset, property, val);
+}
+
+/*
+ * Convert and fold provided ATAGs into the provided FDT.
+ *
+ * REturn values:
+ *    = 0 -> pretend success
+ *    = 1 -> bad ATAG (may retry with another possible ATAG pointer)
+ *    < 0 -> error from libfdt
+ */
+int atags_to_fdt(void *atag_list, void *fdt, int total_space)
+{
+        struct tag *atag = atag_list;
+        uint32_t mem_reg_property[2 * NR_BANKS];
+        int memcount = 0;
+        int ret;
+
+        /* make sure we've got an aligned pointer */
+        if ((u32)atag_list & 0x3)
+                return 1;
+
+        /* if we get a DTB here we're done already */
+        if (*(u32 *)atag_list == fdt32_to_cpu(FDT_MAGIC))
+               return 0;
+
+        /* validate the ATAG */
+        if (atag->hdr.tag != ATAG_CORE ||
+            (atag->hdr.size != tag_size(tag_core) &&
+             atag->hdr.size != 2))
+                return 1;
+
+        /* let's give it all the room it could need */
+        ret = fdt_open_into(fdt, fdt, total_space);
+        if (ret < 0)
+                return ret;
+
+        for_each_tag(atag, atag_list) {
+                if (atag->hdr.tag == ATAG_CMDLINE) {
+                        setprop_string(fdt, "/chosen", "bootargs",
+                                        atag->u.cmdline.cmdline);
+                } else if (atag->hdr.tag == ATAG_MEM) {
+                        if (memcount >= sizeof(mem_reg_property)/4)
+                                continue;
+                        mem_reg_property[memcount++] = cpu_to_fdt32(atag->u.mem.start);
+                        mem_reg_property[memcount++] = cpu_to_fdt32(atag->u.mem.size);
+                } else if (atag->hdr.tag == ATAG_INITRD2) {
+                        uint32_t initrd_start, initrd_size;
+                        initrd_start = atag->u.initrd.start;
+                        initrd_size = atag->u.initrd.size;
+                        setprop_cell(fdt, "/chosen", "linux,initrd-start",
+                                        initrd_start);
+                        setprop_cell(fdt, "/chosen", "linux,initrd-end",
+                                        initrd_start + initrd_size);
+                }
+        }
+
+        if (memcount)
+                setprop(fdt, "/memory", "reg", mem_reg_property, 4*memcount);
+
+        return fdt_pack(fdt);
+}
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index e95a5989602..c2effc91725 100644
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -216,6 +216,104 @@ restart:	adr	r0, LC0
                 mov     r10, r6
 #endif
 
+                mov     r5, #0                  @ init dtb size to 0
+#ifdef CONFIG_ARM_APPENDED_DTB
+/*
+ *   r0  = delta
+ *   r2  = BSS start
+ *   r3  = BSS end
+ *   r4  = final kernel address
+ *   r5  = appended dtb size (still unknown)
+ *   r6  = _edata
+ *   r7  = architecture ID
+ *   r8  = atags/device tree pointer
+ *   r9  = size of decompressed image
+ *   r10 = end of this image, including  bss/stack/malloc space if non XIP
+ *   r11 = GOT start
+ *   r12 = GOT end
+ *   sp  = stack pointer
+ *
+ * if there are device trees (dtb) appended to zImage, advance r10 so that the
+ * dtb data will get relocated along with the kernel if necessary.
+ */
+
+                ldr     lr, [r6, #0]
+#ifndef __ARMEB__
+                ldr     r1, =0xedfe0dd0         @ sig is 0xd00dfeed big endian
+#else
+                ldr     r1, =0xd00dfeed
+#endif
+                cmp     lr, r1
+                bne     dtb_check_done          @ not found
+
+#ifdef CONFIG_ARM_ATAG_DTB_COMPAT
+                /*
+                 * OK... Let's do some funky business here.
+                 * If we do have a DTB appended to zImage, and we do have
+                 * an ATAG list around, we want the later to be translated
+                 * and folded into the former here.  To be on the safe side,
+                 * let's temporarily move  the stack away into the malloc
+                 * area.  No GOT fixup has occurred yet, but none of the
+                 * code we're about to call uses any global variable.
+                */
+                add     sp, sp, #0x10000
+                stmfd   sp!, {r0-r3, ip, lr}
+                mov     r0, r8
+                mov     r1, r6
+                sub     r2, sp, r6
+                bl      atags_to_fdt
+
+                /*
+                 * If returned value is 1, there is no ATAG at the location
+                 * pointed by r8.  Try the typical 0x100 offset from start
+                 * of RAM and hope for the best.
+                 */
+                cmp     r0, #1
+                sub     r0, r4, #TEXT_OFFSET
+                add     r0, r0, #0x100
+                mov     r1, r6
+                sub     r2, sp, r6
+                blne    atags_to_fdt
+
+                ldmfd   sp!, {r0-r3, ip, lr}
+                sub     sp, sp, #0x10000
+#endif
+
+                mov     r8, r6                  @ use the appended device tree
+
+                /*
+                 * Make sure that the DTB doesn't end up in the final
+                 * kernel's .bss area. To do so, we adjust the decompressed
+                 * kernel size to compensate if that .bss size is larger
+                 * than the relocated code.
+                 */
+                ldr     r5, =_kernel_bss_size
+                adr     r1, wont_overwrite
+                sub     r1, r6, r1
+                subs    r1, r5, r1
+                addhi   r9, r9, r1
+
+                /* Get the dtb's size */
+                ldr     r5, [r6, #4]
+#ifndef __ARMEB__
+                /* convert r5 (dtb size) to little endian */
+                eor     r1, r5, r5, ror #16
+                bic     r1, r1, #0x00ff0000
+                mov     r5, r5, ror #8
+                eor     r5, r5, r1, lsr #8
+#endif
+
+                /* preserve 64-bit alignment */
+                add     r5, r5, #7
+                bic     r5, r5, #7
+
+                /* relocate some pointers past the appended dtb */
+                add     r6, r6, r5
+                add     r10, r10, r5
+                add     sp, sp, r5
+dtb_check_done:
+#endif
+
 /*
  * Check to see if we will overwrite ourselves.
  *   r4  = final kernel address
@@ -223,15 +321,14 @@ restart:	adr	r0, LC0
  *   r10 = end of this image, including  bss/stack/malloc space if non XIP
  * We basically want:
  *   r4 - 16k page directory >= r10 -> OK
- *   r4 + image length <= current position (pc) -> OK
+ *   r4 + image length <= address of wont_overwrite -> OK
  */
                 add     r10, r10, #16384
                 cmp     r4, r10
                 bhs     wont_overwrite
                 add     r10, r4, r9
-   ARM(         cmp     r10, pc         )
- THUMB(         mov     lr, pc          )
- THUMB(         cmp     r10, lr         )
+                adr     r9, wont_overwrite
+                cmp     r10, r9
                 bls     wont_overwrite
 
 /*
@@ -285,14 +382,16 @@ wont_overwrite:
  *   r2  = BSS start
  *   r3  = BSS end
  *   r4  = kernel execution address
+ *   r5  = appended dtb size (0 if not present)
  *   r7  = architecture ID
  *   r8  = atags pointer
  *   r11 = GOT start
  *   r12 = GOT end
  *   sp  = stack pointer
  */
-                teq     r0, #0
+                orrs    r1, r0, r5
                 beq     not_relocated
+
                 add     r11, r11, r0
                 add     r12, r12, r0
 
@@ -307,12 +406,21 @@ wont_overwrite:
 
                 /*
                  * Relocate all entries in the GOT table.
+                 * Bump bss entries to _edata + dtb size
                  */
 1:              ldr     r1, [r11, #0]           @ relocate entries in the GOT
-                add     r1, r1, r0              @ table.  This fixes up the
-                str     r1, [r11], #4           @ C references.
+                add     r1, r1, r0              @ This fixes up C references
+                cmp     r1, r2                  @ if entry >= bss_start &&
+                cmphs   r3, r1                  @       bss_end > entry
+                addhi   r1, r1, r5              @    entry += dtb size
+                str     r1, [r11], #4           @ next entry
                 cmp     r11, r12
                 blo     1b
+
+                /* bump our bss pointers too */
+                add     r2, r2, r5
+                add     r3, r3, r5
+
 #else
 
                 /*
diff --git a/arch/arm/boot/compressed/libfdt_env.h b/arch/arm/boot/compressed/libfdt_env.h
new file mode 100644
index 00000000000..1f4e71876b0
--- /dev/null
+++ b/arch/arm/boot/compressed/libfdt_env.h
@@ -0,0 +1,15 @@
+#ifndef _ARM_LIBFDT_ENV_H
+#define _ARM_LIBFDT_ENV_H
+
+#include <linux/types.h>
+#include <linux/string.h>
+#include <asm/byteorder.h>
+
+#define fdt16_to_cpu(x)         be16_to_cpu(x)
+#define cpu_to_fdt16(x)         cpu_to_be16(x)
+#define fdt32_to_cpu(x)         be32_to_cpu(x)
+#define cpu_to_fdt32(x)         cpu_to_be32(x)
+#define fdt64_to_cpu(x)         be64_to_cpu(x)
+#define cpu_to_fdt64(x)         cpu_to_be64(x)
+
+#endif
diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c
index 832d37236c5..8e2a8fca5ed 100644
--- a/arch/arm/boot/compressed/misc.c
+++ b/arch/arm/boot/compressed/misc.c
@@ -18,14 +18,9 @@
 
 unsigned int __machine_arch_type;
 
-#define _LINUX_STRING_H_
-
 #include <linux/compiler.h>     /* for inline */
-#include <linux/types.h>        /* for size_t */
-#include <linux/stddef.h>       /* for NULL */
+#include <linux/types.h>
 #include <linux/linkage.h>
-#include <asm/string.h>
-
 
 static void putstr(const char *ptr);
 extern void error(char *x);
@@ -101,41 +96,6 @@ static void putstr(const char *ptr)
         flush();
 }
 
-
-void *memcpy(void *__dest, __const void *__src, size_t __n)
-{
-        int i = 0;
-        unsigned char *d = (unsigned char *)__dest, *s = (unsigned char *)__src;
-
-        for (i = __n >> 3; i > 0; i--) {
-                *d++ = *s++;
-                *d++ = *s++;
-                *d++ = *s++;
-                *d++ = *s++;
-                *d++ = *s++;
-                *d++ = *s++;
-                *d++ = *s++;
-                *d++ = *s++;
-        }
-
-        if (__n & 1 << 2) {
-                *d++ = *s++;
-                *d++ = *s++;
-                *d++ = *s++;
-                *d++ = *s++;
-        }
-
-        if (__n & 1 << 1) {
-                *d++ = *s++;
-                *d++ = *s++;
-        }
-
-        if (__n & 1)
-                *d++ = *s++;
-
-        return __dest;
-}
-
 /*
  * gzip declarations
  */
diff --git a/arch/arm/boot/compressed/string.c b/arch/arm/boot/compressed/string.c
new file mode 100644
index 00000000000..36e53ef9200
--- /dev/null
+++ b/arch/arm/boot/compressed/string.c
@@ -0,0 +1,127 @@
+/*
+ * arch/arm/boot/compressed/string.c
+ *
+ * Small subset of simple string routines
+ */
+
+#include <linux/string.h>
+
+void *memcpy(void *__dest, __const void *__src, size_t __n)
+{
+        int i = 0;
+        unsigned char *d = (unsigned char *)__dest, *s = (unsigned char *)__src;
+
+        for (i = __n >> 3; i > 0; i--) {
+                *d++ = *s++;
+                *d++ = *s++;
+                *d++ = *s++;
+                *d++ = *s++;
+                *d++ = *s++;
+                *d++ = *s++;
+                *d++ = *s++;
+                *d++ = *s++;
+        }
+
+        if (__n & 1 << 2) {
+                *d++ = *s++;
+                *d++ = *s++;
+                *d++ = *s++;
+                *d++ = *s++;
+        }
+
+        if (__n & 1 << 1) {
+                *d++ = *s++;
+                *d++ = *s++;
+        }
+
+        if (__n & 1)
+                *d++ = *s++;
+
+        return __dest;
+}
+
+void *memmove(void *__dest, __const void *__src, size_t count)
+{
+        unsigned char *d = __dest;
+        const unsigned char *s = __src;
+
+        if (__dest == __src)
+                return __dest;
+
+        if (__dest < __src)
+                return memcpy(__dest, __src, count);
+
+        while (count--)
+                d[count] = s[count];
+        return __dest;
+}
+
+size_t strlen(const char *s)
+{
+        const char *sc = s;
+
+        while (*sc != '\0')
+                sc++;
+        return sc - s;
+}
+
+int memcmp(const void *cs, const void *ct, size_t count)
+{
+        const unsigned char *su1 = cs, *su2 = ct, *end = su1 + count;
+        int res = 0;
+
+        while (su1 < end) {
+                res = *su1++ - *su2++;
+                if (res)
+                        break;
+        }
+        return res;
+}
+
+int strcmp(const char *cs, const char *ct)
+{
+        unsigned char c1, c2;
+        int res = 0;
+
+        do {
+                c1 = *cs++;
+                c2 = *ct++;
+                res = c1 - c2;
+                if (res)
+                        break;
+        } while (c1);
+        return res;
+}
+
+void *memchr(const void *s, int c, size_t count)
+{
+        const unsigned char *p = s;
+
+        while (count--)
+                if ((unsigned char)c == *p++)
+                        return (void *)(p - 1);
+        return NULL;
+}
+
+char *strchr(const char *s, int c)
+{
+        while (*s != (char)c)
+                if (*s++ == '\0')
+                        return NULL;
+        return (char *)s;
+}
+
+#undef memset
+
+void *memset(void *s, int c, size_t count)
+{
+        char *xs = s;
+        while (count--)
+                *xs++ = c;
+        return s;
+}
+
+void __memzero(void *s, size_t count)
+{
+        memset(s, 0, count);
+}
diff --git a/arch/arm/boot/compressed/vmlinux.lds.in b/arch/arm/boot/compressed/vmlinux.lds.in
index 4e728834a1b..4919f2ac8b8 100644
--- a/arch/arm/boot/compressed/vmlinux.lds.in
+++ b/arch/arm/boot/compressed/vmlinux.lds.in
@@ -51,6 +51,10 @@ SECTIONS
   _got_start = .;
   .got                  : { *(.got) }
   _got_end = .;
+
+  /* ensure the zImage file size is always a multiple of 64 bits */
+  /* (without a dummy byte, ld just ignores the empty section) */
+  .pad                  : { BYTE(0); . = ALIGN(8); }
   _edata = .;
 
   . = BSS_START;