Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into next

Pull ARM updates from Russell King:

 - Major clean-up of the L2 cache support code.  The existing mess was
   becoming rather unmaintainable through all the additions that others
   have done over time.  This turns it into a much nicer structure, and
   implements a few performance improvements as well.

 - Clean up some of the CP15 control register tweaks for alignment
   support, moving some code and data into alignment.c

 - DMA properties for ARM, from Santosh and reviewed by DT people.  This
   adds DT properties to specify bus translations we can't discover
   automatically, and to indicate whether devices are coherent.

 - Hibernation support for ARM

 - Make ftrace work with read-only text in modules

 - add suspend support for PJ4B CPUs

 - rework interrupt masking for undefined instruction handling, which
   allows us to enable interrupts earlier in the handling of these
   exceptions.

 - support for big endian page tables

 - fix stacktrace support to exclude stacktrace functions from the
   trace, and add save_stack_trace_regs() implementation so that kprobes
   can record stack traces.

 - Add support for the Cortex-A17 CPU.

 - Remove last vestiges of ARM710 support.

 - Removal of ARM "meminfo" structure, finally converting us solely to
   memblock to handle the early memory initialisation.

* 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: (142 commits)
  ARM: ensure C page table setup code follows assembly code (part II)
  ARM: ensure C page table setup code follows assembly code
  ARM: consolidate last remaining open-coded alignment trap enable
  ARM: remove global cr_no_alignment
  ARM: remove CPU_CP15 conditional from alignment.c
  ARM: remove unused adjust_cr() function
  ARM: move "noalign" command line option to alignment.c
  ARM: provide common method to clear bits in CPU control register
  ARM: 8025/1: Get rid of meminfo
  ARM: 8060/1: mm: allow sub-architectures to override PCI I/O memory type
  ARM: 8066/1: correction for ARM patch 8031/2
  ARM: 8049/1: ftrace/add save_stack_trace_regs() implementation
  ARM: 8065/1: remove last use of CONFIG_CPU_ARM710
  ARM: 8062/1: Modify ldrt fixup handler to re-execute the userspace instruction
  ARM: 8047/1: rwsem: use asm-generic rwsem implementation
  ARM: l2c: trial at enabling some Cortex-A9 optimisations
  ARM: l2c: add warnings for stuff modifying aux_ctrl register values
  ARM: l2c: print a warning with L2C-310 caches if the cache size is modified
  ARM: l2c: remove old .set_debug method
  ARM: l2c: kill L2X0_AUX_CTRL_MASK before anyone else makes use of this
  ...

6 files changed, 38 insertions, 31 deletions

diff --git a/arch/arm/mach-realview/core.c b/arch/arm/mach-realview/core.c
index 960b8dd78c44..8c1b39a0caa0 100644
--- a/arch/arm/mach-realview/core.c
+++ b/arch/arm/mach-realview/core.c
@@ -31,6 +31,7 @@
 #include <linux/amba/mmci.h>
 #include <linux/gfp.h>
 #include <linux/mtd/physmap.h>
+#include <linux/memblock.h>
 
 #include <mach/hardware.h>
 #include <asm/irq.h>
@@ -385,19 +386,15 @@ void __init realview_timer_init(unsigned int timer_irq)
 /*
  * Setup the memory banks.
  */
-void realview_fixup(struct tag *tags, char **from, struct meminfo *meminfo)
+void realview_fixup(struct tag *tags, char **from)
 {
         /*
          * Most RealView platforms have 512MB contiguous RAM at 0x70000000.
          * Half of this is mirrored at 0.
          */
 #ifdef CONFIG_REALVIEW_HIGH_PHYS_OFFSET
-        meminfo->bank[0].start = 0x70000000;
-        meminfo->bank[0].size = SZ_512M;
-        meminfo->nr_banks = 1;
+        memblock_add(0x70000000, SZ_512M);
 #else
-        meminfo->bank[0].start = 0;
-        meminfo->bank[0].size = SZ_256M;
-        meminfo->nr_banks = 1;
+        memblock_add(0, SZ_256M);
 #endif
 }
diff --git a/arch/arm/mach-realview/core.h b/arch/arm/mach-realview/core.h
index 13dc830ef469..868ece221978 100644
--- a/arch/arm/mach-realview/core.h
+++ b/arch/arm/mach-realview/core.h
@@ -52,8 +52,7 @@ extern int realview_flash_register(struct resource *res, u32 num);
 extern int realview_eth_register(const char *name, struct resource *res);
 extern int realview_usb_register(struct resource *res);
 extern void realview_init_early(void);
-extern void realview_fixup(struct tag *tags, char **from,
-                           struct meminfo *meminfo);
+extern void realview_fixup(struct tag *tags, char **from);
 
 extern struct smp_operations realview_smp_ops;
 extern void realview_cpu_die(unsigned int cpu);
diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c
index 6bb070e80128..739d4f113097 100644
--- a/arch/arm/mach-realview/realview_eb.c
+++ b/arch/arm/mach-realview/realview_eb.c
@@ -442,8 +442,13 @@ static void __init realview_eb_init(void)
                 realview_eb11mp_fixup();
 
 #ifdef CONFIG_CACHE_L2X0
-                /* 1MB (128KB/way), 8-way associativity, evmon/parity/share enabled
-                 * Bits:  .... ...0 0111 1001 0000 .... .... .... */
+                /*
+                 * The PL220 needs to be manually configured as the hardware
+                 * doesn't report the correct sizes.
+                 * 1MB (128KB/way), 8-way associativity, event monitor and
+                 * parity enabled, ignore share bit, no force write allocate
+                 * Bits:  .... ...0 0111 1001 0000 .... .... ....
+                 */
                 l2x0_init(__io_address(REALVIEW_EB11MP_L220_BASE), 0x00790000, 0xfe000fff);
 #endif
                 platform_device_register(&pmu_device);
diff --git a/arch/arm/mach-realview/realview_pb1176.c b/arch/arm/mach-realview/realview_pb1176.c
index 173f2c15de49..b0e0dcaed944 100644
--- a/arch/arm/mach-realview/realview_pb1176.c
+++ b/arch/arm/mach-realview/realview_pb1176.c
@@ -32,6 +32,7 @@
 #include <linux/irqchip/arm-gic.h>
 #include <linux/platform_data/clk-realview.h>
 #include <linux/reboot.h>
+#include <linux/memblock.h>
 
 #include <mach/hardware.h>
 #include <asm/irq.h>
@@ -339,15 +340,12 @@ static void realview_pb1176_restart(enum reboot_mode mode, const char *cmd)
         dsb();
 }
 
-static void realview_pb1176_fixup(struct tag *tags, char **from,
-                                  struct meminfo *meminfo)
+static void realview_pb1176_fixup(struct tag *tags, char **from)
 {
         /*
          * RealView PB1176 only has 128MB of RAM mapped at 0.
          */
-        meminfo->bank[0].start = 0;
-        meminfo->bank[0].size = SZ_128M;
-        meminfo->nr_banks = 1;
+        memblock_add(0, SZ_128M);
 }
 
 static void __init realview_pb1176_init(void)
@@ -355,7 +353,13 @@ static void __init realview_pb1176_init(void)
         int i;
 
 #ifdef CONFIG_CACHE_L2X0
-        /* 128Kb (16Kb/way) 8-way associativity. evmon/parity/share enabled. */
+        /*
+         * The PL220 needs to be manually configured as the hardware
+         * doesn't report the correct sizes.
+         * 128kB (16kB/way), 8-way associativity, event monitor and
+         * parity enabled, ignore share bit, no force write allocate
+         * Bits:  .... ...0 0111 0011 0000 .... .... ....
+         */
         l2x0_init(__io_address(REALVIEW_PB1176_L220_BASE), 0x00730000, 0xfe000fff);
 #endif
 
diff --git a/arch/arm/mach-realview/realview_pb11mp.c b/arch/arm/mach-realview/realview_pb11mp.c
index bde7e6b1fd44..47bf55fdbf27 100644
--- a/arch/arm/mach-realview/realview_pb11mp.c
+++ b/arch/arm/mach-realview/realview_pb11mp.c
@@ -337,8 +337,13 @@ static void __init realview_pb11mp_init(void)
         int i;
 
 #ifdef CONFIG_CACHE_L2X0
-        /* 1MB (128KB/way), 8-way associativity, evmon/parity/share enabled
-         * Bits:  .... ...0 0111 1001 0000 .... .... .... */
+        /*
+         * The PL220 needs to be manually configured as the hardware
+         * doesn't report the correct sizes.
+         * 1MB (128KB/way), 8-way associativity, event monitor and
+         * parity enabled, ignore share bit, no force write allocate
+         * Bits:  .... ...0 0111 1001 0000 .... .... ....
+         */
         l2x0_init(__io_address(REALVIEW_TC11MP_L220_BASE), 0x00790000, 0xfe000fff);
 #endif
 
diff --git a/arch/arm/mach-realview/realview_pbx.c b/arch/arm/mach-realview/realview_pbx.c
index 72c96caebefa..d89eb4023467 100644
--- a/arch/arm/mach-realview/realview_pbx.c
+++ b/arch/arm/mach-realview/realview_pbx.c
@@ -29,6 +29,7 @@
 #include <linux/irqchip/arm-gic.h>
 #include <linux/platform_data/clk-realview.h>
 #include <linux/reboot.h>
+#include <linux/memblock.h>
 
 #include <asm/irq.h>
 #include <asm/mach-types.h>
@@ -325,23 +326,19 @@ static void __init realview_pbx_timer_init(void)
         realview_pbx_twd_init();
 }
 
-static void realview_pbx_fixup(struct tag *tags, char **from,
-                               struct meminfo *meminfo)
+static void realview_pbx_fixup(struct tag *tags, char **from)
 {
 #ifdef CONFIG_SPARSEMEM
         /*
          * Memory configuration with SPARSEMEM enabled on RealView PBX (see
          * asm/mach/memory.h for more information).
          */
-        meminfo->bank[0].start = 0;
-        meminfo->bank[0].size = SZ_256M;
-        meminfo->bank[1].start = 0x20000000;
-        meminfo->bank[1].size = SZ_512M;
-        meminfo->bank[2].start = 0x80000000;
-        meminfo->bank[2].size = SZ_256M;
-        meminfo->nr_banks = 3;
+
+        memblock_add(0, SZ_256M);
+        memblock_add(0x20000000, SZ_512M);
+        memblock_add(0x80000000, SZ_256M);
 #else
-        realview_fixup(tags, from, meminfo);
+        realview_fixup(tags, from);
 #endif
 }
 
@@ -370,8 +367,8 @@ static void __init realview_pbx_init(void)
                         __io_address(REALVIEW_PBX_TILE_L220_BASE);
 
                 /* set RAM latencies to 1 cycle for eASIC */
-                writel(0, l2x0_base + L2X0_TAG_LATENCY_CTRL);
-                writel(0, l2x0_base + L2X0_DATA_LATENCY_CTRL);
+                writel(0, l2x0_base + L310_TAG_LATENCY_CTRL);
+                writel(0, l2x0_base + L310_DATA_LATENCY_CTRL);
 
                 /* 16KB way size, 8-way associativity, parity disabled
                  * Bits:  .. 0 0 0 0 1 00 1 0 1 001 0 000 0 .... .... .... */