1 files changed, 47 insertions, 37 deletions

diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c
index a41df7bef035..3c10daf8fc01 100644
--- a/arch/sparc64/mm/init.c
+++ b/arch/sparc64/mm/init.c
@@ -46,15 +46,11 @@
 #include <asm/tsb.h>
 #include <asm/hypervisor.h>
 #include <asm/prom.h>
-#include <asm/sstate.h>
 #include <asm/mdesc.h>
 #include <asm/cpudata.h>
 #include <asm/irq.h>
 
-#define MAX_PHYS_ADDRESS        (1UL << 42UL)
-#define KPTE_BITMAP_CHUNK_SZ    (256UL * 1024UL * 1024UL)
-#define KPTE_BITMAP_BYTES       \
-        ((MAX_PHYS_ADDRESS / KPTE_BITMAP_CHUNK_SZ) / 8)
+#include "init.h"
 
 unsigned long kern_linear_pte_xor[2] __read_mostly;
 
@@ -416,17 +412,9 @@ void mmu_info(struct seq_file *m)
 #endif /* CONFIG_DEBUG_DCFLUSH */
 }
 
-struct linux_prom_translation {
-        unsigned long virt;
-        unsigned long size;
-        unsigned long data;
-};
-
-/* Exported for kernel TLB miss handling in ktlb.S */
 struct linux_prom_translation prom_trans[512] __read_mostly;
 unsigned int prom_trans_ents __read_mostly;
 
-/* Exported for SMP bootup purposes. */
 unsigned long kern_locked_tte_data;
 
 /* The obp translations are saved based on 8k pagesize, since obp can
@@ -938,6 +926,10 @@ int of_node_to_nid(struct device_node *dp)
         int count, nid;
         u64 grp;
 
+        /* This is the right thing to do on currently supported
+         * SUN4U NUMA platforms as well, as the PCI controller does
+         * not sit behind any particular memory controller.
+         */
         if (!mlgroups)
                 return -1;
 
@@ -1206,8 +1198,44 @@ out:
         return err;
 }
 
+static int __init numa_parse_jbus(void)
+{
+        unsigned long cpu, index;
+
+        /* NUMA node id is encoded in bits 36 and higher, and there is
+         * a 1-to-1 mapping from CPU ID to NUMA node ID.
+         */
+        index = 0;
+        for_each_present_cpu(cpu) {
+                numa_cpu_lookup_table[cpu] = index;
+                numa_cpumask_lookup_table[index] = cpumask_of_cpu(cpu);
+                node_masks[index].mask = ~((1UL << 36UL) - 1UL);
+                node_masks[index].val = cpu << 36UL;
+
+                index++;
+        }
+        num_node_masks = index;
+
+        add_node_ranges();
+
+        for (index = 0; index < num_node_masks; index++) {
+                allocate_node_data(index);
+                node_set_online(index);
+        }
+
+        return 0;
+}
+
 static int __init numa_parse_sun4u(void)
 {
+        if (tlb_type == cheetah || tlb_type == cheetah_plus) {
+                unsigned long ver;
+
+                __asm__ ("rdpr %%ver, %0" : "=r" (ver));
+                if ((ver >> 32UL) == __JALAPENO_ID ||
+                    (ver >> 32UL) == __SERRANO_ID)
+                        return numa_parse_jbus();
+        }
         return -1;
 }
 
@@ -1633,8 +1661,6 @@ void __cpuinit sun4v_ktsb_register(void)
 
 /* paging_init() sets up the page tables */
 
-extern void central_probe(void);
-
 static unsigned long last_valid_pfn;
 pgd_t swapper_pg_dir[2048];
 
@@ -1679,8 +1705,6 @@ void __init paging_init(void)
         kern_base = (prom_boot_mapping_phys_low >> 22UL) << 22UL;
         kern_size = (unsigned long)&_end - (unsigned long)KERNBASE;
 
-        sstate_booting();
-
         /* Invalidate both kernel TSBs.  */
         memset(swapper_tsb, 0x40, sizeof(swapper_tsb));
 #ifndef CONFIG_DEBUG_PAGEALLOC
@@ -1803,9 +1827,6 @@ void __init paging_init(void)
         }
 
         printk("Booting Linux...\n");
-
-        central_probe();
-        cpu_probe();
 }
 
 int __init page_in_phys_avail(unsigned long paddr)
@@ -2032,7 +2053,6 @@ pgprot_t PAGE_COPY __read_mostly;
 pgprot_t PAGE_SHARED __read_mostly;
 EXPORT_SYMBOL(PAGE_SHARED);
 
-pgprot_t PAGE_EXEC __read_mostly;
 unsigned long pg_iobits __read_mostly;
 
 unsigned long _PAGE_IE __read_mostly;
@@ -2045,14 +2065,6 @@ unsigned long _PAGE_CACHE __read_mostly;
 EXPORT_SYMBOL(_PAGE_CACHE);
 
 #ifdef CONFIG_SPARSEMEM_VMEMMAP
-
-#define VMEMMAP_CHUNK_SHIFT     22
-#define VMEMMAP_CHUNK           (1UL << VMEMMAP_CHUNK_SHIFT)
-#define VMEMMAP_CHUNK_MASK      ~(VMEMMAP_CHUNK - 1UL)
-#define VMEMMAP_ALIGN(x)        (((x)+VMEMMAP_CHUNK-1UL)&VMEMMAP_CHUNK_MASK)
-
-#define VMEMMAP_SIZE    ((((1UL << MAX_PHYSADDR_BITS) >> PAGE_SHIFT) * \
-                          sizeof(struct page *)) >> VMEMMAP_CHUNK_SHIFT)
 unsigned long vmemmap_table[VMEMMAP_SIZE];
 
 int __meminit vmemmap_populate(struct page *start, unsigned long nr, int node)
@@ -2136,7 +2148,6 @@ static void __init sun4u_pgprot_init(void)
                                        _PAGE_CACHE_4U | _PAGE_P_4U |
                                        __ACCESS_BITS_4U | __DIRTY_BITS_4U |
                                        _PAGE_EXEC_4U | _PAGE_L_4U);
-        PAGE_EXEC = __pgprot(_PAGE_EXEC_4U);
 
         _PAGE_IE = _PAGE_IE_4U;
         _PAGE_E = _PAGE_E_4U;
@@ -2147,10 +2158,10 @@ static void __init sun4u_pgprot_init(void)
 
 #ifdef CONFIG_DEBUG_PAGEALLOC
         kern_linear_pte_xor[0] = (_PAGE_VALID | _PAGE_SZBITS_4U) ^
-                0xfffff80000000000;
+                0xfffff80000000000UL;
 #else
         kern_linear_pte_xor[0] = (_PAGE_VALID | _PAGE_SZ4MB_4U) ^
-                0xfffff80000000000;
+                0xfffff80000000000UL;
 #endif
         kern_linear_pte_xor[0] |= (_PAGE_CP_4U | _PAGE_CV_4U |
                                    _PAGE_P_4U | _PAGE_W_4U);
@@ -2188,7 +2199,6 @@ static void __init sun4v_pgprot_init(void)
                                 __ACCESS_BITS_4V | __DIRTY_BITS_4V |
                                 _PAGE_EXEC_4V);
         PAGE_KERNEL_LOCKED = PAGE_KERNEL;
-        PAGE_EXEC = __pgprot(_PAGE_EXEC_4V);
 
         _PAGE_IE = _PAGE_IE_4V;
         _PAGE_E = _PAGE_E_4V;
@@ -2196,20 +2206,20 @@ static void __init sun4v_pgprot_init(void)
 
 #ifdef CONFIG_DEBUG_PAGEALLOC
         kern_linear_pte_xor[0] = (_PAGE_VALID | _PAGE_SZBITS_4V) ^
-                0xfffff80000000000;
+                0xfffff80000000000UL;
 #else
         kern_linear_pte_xor[0] = (_PAGE_VALID | _PAGE_SZ4MB_4V) ^
-                0xfffff80000000000;
+                0xfffff80000000000UL;
 #endif
         kern_linear_pte_xor[0] |= (_PAGE_CP_4V | _PAGE_CV_4V |
                                    _PAGE_P_4V | _PAGE_W_4V);
 
 #ifdef CONFIG_DEBUG_PAGEALLOC
         kern_linear_pte_xor[1] = (_PAGE_VALID | _PAGE_SZBITS_4V) ^
-                0xfffff80000000000;
+                0xfffff80000000000UL;
 #else
         kern_linear_pte_xor[1] = (_PAGE_VALID | _PAGE_SZ256MB_4V) ^
-                0xfffff80000000000;
+                0xfffff80000000000UL;
 #endif
         kern_linear_pte_xor[1] |= (_PAGE_CP_4V | _PAGE_CV_4V |
                                    _PAGE_P_4V | _PAGE_W_4V);