Revert "Add MT_MEMORY_SO, mark L3 and L4 to use it"

This reverts commit acb7f883f1ec61fd4dcb840a66ddca051ad8f2ef.

Also sync arch/arm/mm with the mainline kernel.

Flushing posted writes should only be needed in few selected
places.

Conflicts:

	arch/arm/include/asm/mach/map.h

Signed-off-by: Tony Lindren <tony@atomide.com>

diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h
index fa0e695057db317ea3d9407ef34e9dae5e4ba878..cb1139ac19432f555b32ccc188b12f838f1ee9d4 100644 (file)
--- a/arch/arm/include/asm/mach/map.h
+++ b/arch/arm/include/asm/mach/map.h
@@ -25,7 +25,6 @@ struct map_desc {
 #define MT_HIGH_VECTORS                7
 #define MT_MEMORY              8
 #define MT_ROM                 9
-#define MT_MEMORY_SO           10
 
 #ifdef CONFIG_MMU
 extern void iotable_init(struct map_desc *, int);

diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index c11c0e830c5027fdddceb256c382b194a2847914..adbe21fcd68408c30b712d06aff6daf671afed38 100644 (file)
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -119,13 +119,13 @@ static struct map_desc omap34xx_io_desc[] __initdata = {
                .virtual        = L3_34XX_VIRT,
                .pfn            = __phys_to_pfn(L3_34XX_PHYS),
                .length         = L3_34XX_SIZE,
-               .type           = MT_MEMORY_SO
+               .type           = MT_DEVICE
        },
        {
                .virtual        = L4_34XX_VIRT,
                .pfn            = __phys_to_pfn(L4_34XX_PHYS),
                .length         = L4_34XX_SIZE,
-               .type           = MT_MEMORY_SO
+               .type           = MT_DEVICE
        },
        {
                .virtual        = L4_WK_34XX_VIRT,
@@ -137,19 +137,19 @@ static struct map_desc omap34xx_io_desc[] __initdata = {
                .virtual        = OMAP34XX_GPMC_VIRT,
                .pfn            = __phys_to_pfn(OMAP34XX_GPMC_PHYS),
                .length         = OMAP34XX_GPMC_SIZE,
-               .type           = MT_MEMORY_SO
+               .type           = MT_DEVICE
        },
        {
                .virtual        = OMAP343X_SMS_VIRT,
                .pfn            = __phys_to_pfn(OMAP343X_SMS_PHYS),
                .length         = OMAP343X_SMS_SIZE,
-               .type           = MT_MEMORY_SO
+               .type           = MT_DEVICE
        },
        {
                .virtual        = OMAP343X_SDRC_VIRT,
                .pfn            = __phys_to_pfn(OMAP343X_SDRC_PHYS),
                .length         = OMAP343X_SDRC_SIZE,
-               .type           = MT_MEMORY_SO
+               .type           = MT_DEVICE
        },
        {
                .virtual        = L4_PER_34XX_VIRT,
@@ -161,7 +161,7 @@ static struct map_desc omap34xx_io_desc[] __initdata = {
                .virtual        = L4_EMU_34XX_VIRT,
                .pfn            = __phys_to_pfn(L4_EMU_34XX_PHYS),
                .length         = L4_EMU_34XX_SIZE,
-               .type           = MT_MEMORY_SO
+               .type           = MT_DEVICE
        },
 };
 #endif

diff --git a/arch/arm/mm/cache-xsc3l2.c b/arch/arm/mm/cache-xsc3l2.c
index 10b1bae1a258f782f0aaf67e128f8a8aef514672..464de893a988033180ac9bb7e25c1a53daa6f149 100644 (file)
--- a/arch/arm/mm/cache-xsc3l2.c
+++ b/arch/arm/mm/cache-xsc3l2.c
@@ -98,7 +98,7 @@ static void xsc3_l2_inv_range(unsigned long start, unsigned long end)
        /*
         * Clean and invalidate partial last cache line.
         */
-       if (end & (CACHE_LINE_SIZE - 1)) {
+       if (start < end && (end & (CACHE_LINE_SIZE - 1))) {
                xsc3_l2_clean_pa(end & ~(CACHE_LINE_SIZE - 1));
                xsc3_l2_inv_pa(end & ~(CACHE_LINE_SIZE - 1));
                end &= ~(CACHE_LINE_SIZE - 1);
@@ -107,7 +107,7 @@ static void xsc3_l2_inv_range(unsigned long start, unsigned long end)
        /*
         * Invalidate all full cache lines between 'start' and 'end'.
         */
-       while (start != end) {
+       while (start < end) {
                xsc3_l2_inv_pa(start);
                start += CACHE_LINE_SIZE;
        }

diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index 697320aab3c8503456b0b84e6fe3816333f752ae..e63db11f16a808fc0de3b73ea841ad2797ca597b 100644 (file)
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -236,10 +236,6 @@ static struct mem_type mem_types[] = {
                .prot_sect = PMD_TYPE_SECT,
                .domain    = DOMAIN_KERNEL,
        },
-       [MT_MEMORY_SO] = {
-               .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE | PMD_SECT_UNCACHED,
-               .domain    = DOMAIN_KERNEL,
-       },
 };
 
 const struct mem_type *get_mem_type(unsigned int type)
@@ -284,7 +280,7 @@ static void __init build_mem_type_table(void)
        if (cpu_arch < CPU_ARCH_ARMv5)
                for (i = 0; i < ARRAY_SIZE(mem_types); i++)
                        mem_types[i].prot_sect &= ~PMD_SECT_TEX(7);
-       if (cpu_arch < CPU_ARCH_ARMv6 || !(cr & CR_XP))
+       if ((cpu_arch < CPU_ARCH_ARMv6 || !(cr & CR_XP)) && !cpu_is_xsc3())
                for (i = 0; i < ARRAY_SIZE(mem_types); i++)
                        mem_types[i].prot_sect &= ~PMD_SECT_S;
 
@@ -332,14 +328,24 @@ static void __init build_mem_type_table(void)
                        mem_types[MT_DEVICE].prot_sect |= PMD_SECT_TEX(1);
                        mem_types[MT_DEVICE_NONSHARED].prot_sect |= PMD_SECT_TEX(1);
                        mem_types[MT_DEVICE_WC].prot_sect |= PMD_SECT_BUFFERABLE;
+               } else if (cpu_is_xsc3()) {
+                       /*
+                        * For Xscale3,
+                        * - shared device is TEXCB=00101
+                        * - nonshared device is TEXCB=01000
+                        * - write combine device mem is TEXCB=00100
+                        * (Inner/Outer Uncacheable in xsc3 parlance)
+                        */
+                       mem_types[MT_DEVICE].prot_sect |= PMD_SECT_TEX(1) | PMD_SECT_BUFFERED;
+                       mem_types[MT_DEVICE_NONSHARED].prot_sect |= PMD_SECT_TEX(2);
+                       mem_types[MT_DEVICE_WC].prot_sect |= PMD_SECT_TEX(1);
                } else {
                        /*
-                        * For Xscale3, ARMv6 and ARMv7 without TEX remapping,
+                        * For ARMv6 and ARMv7 without TEX remapping,
                         * - shared device is TEXCB=00001
                         * - nonshared device is TEXCB=01000
                         * - write combine device mem is TEXCB=00100
-                        * (Inner/Outer Uncacheable in xsc3 parlance, Uncached
-                        * Normal in ARMv6 parlance).
+                        * (Uncached Normal in ARMv6 parlance).
                         */
                        mem_types[MT_DEVICE].prot_sect |= PMD_SECT_BUFFERED;
                        mem_types[MT_DEVICE_NONSHARED].prot_sect |= PMD_SECT_TEX(2);
@@ -428,22 +434,6 @@ static void __init build_mem_type_table(void)
 
        for (i = 0; i < ARRAY_SIZE(mem_types); i++) {
                struct mem_type *t = &mem_types[i];
-               const char *s;
-#define T(n)   if (i == (n)) s = #n;
-               s = "???";
-               T(MT_DEVICE);
-               T(MT_DEVICE_NONSHARED);
-               T(MT_DEVICE_CACHED);
-               T(MT_DEVICE_WC);
-               T(MT_CACHECLEAN);
-               T(MT_MINICLEAN);
-               T(MT_LOW_VECTORS);
-               T(MT_HIGH_VECTORS);
-               T(MT_MEMORY);
-               T(MT_ROM);
-               printk(KERN_INFO "%-19s: DOM=%#3x S=%#010x L1=%#010x P=%#010x\n",
-                       s, t->domain, t->prot_sect, t->prot_l1, t->prot_pte);
-
                if (t->prot_l1)
                        t->prot_l1 |= PMD_DOMAIN(t->domain);
                if (t->prot_sect)
@@ -711,7 +701,7 @@ static inline void prepare_page_table(struct meminfo *mi)
        /*
         * Clear out all the mappings below the kernel image.
         */
-       for (addr = 0; addr < MODULE_START; addr += PGDIR_SIZE)
+       for (addr = 0; addr < MODULES_VADDR; addr += PGDIR_SIZE)
                pmd_clear(pmd_off_k(addr));
 
 #ifdef CONFIG_XIP_KERNEL
@@ -823,7 +813,7 @@ static void __init devicemaps_init(struct machine_desc *mdesc)
         */
 #ifdef CONFIG_XIP_KERNEL
        map.pfn = __phys_to_pfn(CONFIG_XIP_PHYS_ADDR & SECTION_MASK);
-       map.virtual = MODULE_START;
+       map.virtual = MODULES_VADDR;
        map.length = ((unsigned long)&_etext - map.virtual + ~SECTION_MASK) & SECTION_MASK;
        map.type = MT_ROM;
        create_mapping(&map);

diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
index f1d158f26f6dbb912805fa9247a849785e466c5f..4d3c0a73e7fb6aea1590f6f9c574521c847e91fe 100644 (file)
--- a/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
@@ -115,7 +115,7 @@ ENTRY(cpu_v7_set_pte_ext)
        orr     r3, r3, r2
        orr     r3, r3, #PTE_EXT_AP0 | 2
 
-       tst     r2, #1 << 4
+       tst     r1, #1 << 4
        orrne   r3, r3, #PTE_EXT_TEX(1)
 
        tst     r1, #L_PTE_WRITE