linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git] / arch / sparc64 / mm / init.c
index 09cb7fc..7d8d762 100644 (file)
@@ -5,7 +5,7 @@
  *  Copyright (C) 1997-1999 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
  */
  
-#include <linux/module.h>
+#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/string.h>
@@ -17,7 +17,6 @@
 #include <linux/initrd.h>
 #include <linux/swap.h>
 #include <linux/pagemap.h>
-#include <linux/poison.h>
 #include <linux/fs.h>
 #include <linux/seq_file.h>
 #include <linux/kprobes.h>
 #include <asm/tlb.h>
 #include <asm/spitfire.h>
 #include <asm/sections.h>
-#include <asm/tsb.h>
-#include <asm/hypervisor.h>
-#include <asm/prom.h>
 
 extern void device_scan(void);
 
-#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)
-
-unsigned long kern_linear_pte_xor[2] __read_mostly;
-
-/* A bitmap, one bit for every 256MB of physical memory.  If the bit
- * is clear, we should use a 4MB page (via kern_linear_pte_xor[0]) else
- * if set we should use a 256MB page (via kern_linear_pte_xor[1]).
- */
-unsigned long kpte_linear_bitmap[KPTE_BITMAP_BYTES / sizeof(unsigned long)];
-
-/* A special kernel TSB for 4MB and 256MB linear mappings.  */
-struct tsb swapper_4m_tsb[KERNEL_TSB4M_NENTRIES];
-
 #define MAX_BANKS      32
 
 static struct linux_prom64_registers pavail[MAX_BANKS] __initdata;
@@ -102,6 +82,8 @@ static void __init read_obp_memory(const char *property,
                prom_halt();
        }
 
+       *num_ents = ents;
+
        /* Sanitize what we got from the firmware, by page aligning
         * everything.
         */
@@ -123,34 +105,17 @@ static void __init read_obp_memory(const char *property,
                regs[i].phys_addr = base;
                regs[i].reg_size = size;
        }
-
-       for (i = 0; i < ents; i++) {
-               if (regs[i].reg_size == 0UL) {
-                       int j;
-
-                       for (j = i; j < ents - 1; j++) {
-                               regs[j].phys_addr =
-                                       regs[j+1].phys_addr;
-                               regs[j].reg_size =
-                                       regs[j+1].reg_size;
-                       }
-
-                       ents--;
-                       i--;
-               }
-       }
-
-       *num_ents = ents;
-
        sort(regs, ents, sizeof(struct linux_prom64_registers),
             cmp_p64, NULL);
 }
 
 unsigned long *sparc64_valid_addr_bitmap __read_mostly;
 
-/* Kernel physical address base and size in bytes.  */
+/* Ugly, but necessary... -DaveM */
+unsigned long phys_base __read_mostly;
 unsigned long kern_base __read_mostly;
 unsigned long kern_size __read_mostly;
+unsigned long pfn_base __read_mostly;
 
 /* get_new_mmu_context() uses "cache + 1".  */
 DEFINE_SPINLOCK(ctx_alloc_lock);
@@ -176,28 +141,24 @@ unsigned long sparc64_kern_sec_context __read_mostly;
 
 int bigkernel = 0;
 
-kmem_cache_t *pgtable_cache __read_mostly;
-
-static void zero_ctor(void *addr, kmem_cache_t *cache, unsigned long flags)
-{
-       clear_page(addr);
-}
-
-extern void tsb_cache_init(void);
+/* XXX Tune this... */
+#define PGT_CACHE_LOW  25
+#define PGT_CACHE_HIGH 50
 
-void pgtable_cache_init(void)
+void check_pgt_cache(void)
 {
-       pgtable_cache = kmem_cache_create("pgtable_cache",
-                                         PAGE_SIZE, PAGE_SIZE,
-                                         SLAB_HWCACHE_ALIGN |
-                                         SLAB_MUST_HWCACHE_ALIGN,
-                                         zero_ctor,
-                                         NULL);
-       if (!pgtable_cache) {
-               prom_printf("Could not create pgtable_cache\n");
-               prom_halt();
+       preempt_disable();
+       if (pgtable_cache_size > PGT_CACHE_HIGH) {
+               do {
+                       if (pgd_quicklist)
+                               free_pgd_slow(get_pgd_fast());
+                       if (pte_quicklist[0])
+                               free_pte_slow(pte_alloc_one_fast(NULL, 0));
+                       if (pte_quicklist[1])
+                               free_pte_slow(pte_alloc_one_fast(NULL, 1 << (PAGE_SHIFT + 10)));
+               } while (pgtable_cache_size > PGT_CACHE_LOW);
        }
-       tsb_cache_init();
+       preempt_enable();
 }
 
 #ifdef CONFIG_DEBUG_DCFLUSH
@@ -207,9 +168,8 @@ atomic_t dcpage_flushes_xcall = ATOMIC_INIT(0);
 #endif
 #endif
 
-inline void flush_dcache_page_impl(struct page *page)
+__inline__ void flush_dcache_page_impl(struct page *page)
 {
-       BUG_ON(tlb_type == hypervisor);
 #ifdef CONFIG_DEBUG_DCFLUSH
        atomic_inc(&dcpage_flushes);
 #endif
@@ -226,8 +186,8 @@ inline void flush_dcache_page_impl(struct page *page)
 }
 
 #define PG_dcache_dirty                PG_arch_1
-#define PG_dcache_cpu_shift    24UL
-#define PG_dcache_cpu_mask     (256UL - 1UL)
+#define PG_dcache_cpu_shift    24
+#define PG_dcache_cpu_mask     (256 - 1)
 
 #if NR_CPUS > 256
 #error D-cache dirty tracking and thread_info->cpu need fixing for > 256 cpus
@@ -283,78 +243,32 @@ static __inline__ void clear_dcache_dirty_cpu(struct page *page, unsigned long c
                             : "g1", "g7");
 }
 
-static inline void tsb_insert(struct tsb *ent, unsigned long tag, unsigned long pte)
-{
-       unsigned long tsb_addr = (unsigned long) ent;
-
-       if (tlb_type == cheetah_plus || tlb_type == hypervisor)
-               tsb_addr = __pa(tsb_addr);
-
-       __tsb_insert(tsb_addr, tag, pte);
-}
-
-unsigned long _PAGE_ALL_SZ_BITS __read_mostly;
-unsigned long _PAGE_SZBITS __read_mostly;
-
 void update_mmu_cache(struct vm_area_struct *vma, unsigned long address, pte_t pte)
 {
-       struct mm_struct *mm;
-       struct tsb *tsb;
-       unsigned long tag, flags;
-       unsigned long tsb_index, tsb_hash_shift;
-
-       if (tlb_type != hypervisor) {
-               unsigned long pfn = pte_pfn(pte);
-               unsigned long pg_flags;
-               struct page *page;
-
-               if (pfn_valid(pfn) &&
-                   (page = pfn_to_page(pfn), page_mapping(page)) &&
-                   ((pg_flags = page->flags) & (1UL << PG_dcache_dirty))) {
-                       int cpu = ((pg_flags >> PG_dcache_cpu_shift) &
-                                  PG_dcache_cpu_mask);
-                       int this_cpu = get_cpu();
-
-                       /* This is just to optimize away some function calls
-                        * in the SMP case.
-                        */
-                       if (cpu == this_cpu)
-                               flush_dcache_page_impl(page);
-                       else
-                               smp_flush_dcache_page_impl(page, cpu);
-
-                       clear_dcache_dirty_cpu(page, cpu);
-
-                       put_cpu();
-               }
-       }
-
-       mm = vma->vm_mm;
-
-       tsb_index = MM_TSB_BASE;
-       tsb_hash_shift = PAGE_SHIFT;
+       struct page *page;
+       unsigned long pfn;
+       unsigned long pg_flags;
+
+       pfn = pte_pfn(pte);
+       if (pfn_valid(pfn) &&
+           (page = pfn_to_page(pfn), page_mapping(page)) &&
+           ((pg_flags = page->flags) & (1UL << PG_dcache_dirty))) {
+               int cpu = ((pg_flags >> PG_dcache_cpu_shift) &
+                          PG_dcache_cpu_mask);
+               int this_cpu = get_cpu();
+
+               /* This is just to optimize away some function calls
+                * in the SMP case.
+                */
+               if (cpu == this_cpu)
+                       flush_dcache_page_impl(page);
+               else
+                       smp_flush_dcache_page_impl(page, cpu);
 
-       spin_lock_irqsave(&mm->context.lock, flags);
+               clear_dcache_dirty_cpu(page, cpu);
 
-#ifdef CONFIG_HUGETLB_PAGE
-       if (mm->context.tsb_block[MM_TSB_HUGE].tsb != NULL) {
-               if ((tlb_type == hypervisor &&
-                    (pte_val(pte) & _PAGE_SZALL_4V) == _PAGE_SZHUGE_4V) ||
-                   (tlb_type != hypervisor &&
-                    (pte_val(pte) & _PAGE_SZALL_4U) == _PAGE_SZHUGE_4U)) {
-                       tsb_index = MM_TSB_HUGE;
-                       tsb_hash_shift = HPAGE_SHIFT;
-               }
+               put_cpu();
        }
-#endif
-
-       tsb = mm->context.tsb_block[tsb_index].tsb;
-       tsb += ((address >> tsb_hash_shift) &
-               (mm->context.tsb_block[tsb_index].tsb_nentries - 1UL));
-       tag = (address >> 22UL);
-       tsb_insert(tsb, tag, pte_val(pte));
-
-       spin_unlock_irqrestore(&mm->context.lock, flags);
 }
 
 void flush_dcache_page(struct page *page)
@@ -362,9 +276,6 @@ void flush_dcache_page(struct page *page)
        struct address_space *mapping;
        int this_cpu;
 
-       if (tlb_type == hypervisor)
-               return;
-
        /* Do not bother with the expensive D-cache flush if it
         * is merely the zero page.  The 'bigcore' testcase in GDB
         * causes this case to run millions of times.
@@ -400,7 +311,7 @@ out:
 
 void __kprobes flush_icache_range(unsigned long start, unsigned long end)
 {
-       /* Cheetah and Hypervisor platform cpus have coherent I-cache. */
+       /* Cheetah has coherent I-cache. */
        if (tlb_type == spitfire) {
                unsigned long kaddr;
 
@@ -409,6 +320,16 @@ void __kprobes flush_icache_range(unsigned long start, unsigned long end)
        }
 }
 
+unsigned long page_to_pfn(struct page *page)
+{
+       return (unsigned long) ((page - mem_map) + pfn_base);
+}
+
+struct page *pfn_to_page(unsigned long pfn)
+{
+       return (mem_map + (pfn - pfn_base));
+}
+
 void show_mem(void)
 {
        printk("Mem-info:\n");
@@ -417,6 +338,7 @@ void show_mem(void)
               nr_swap_pages << (PAGE_SHIFT-10));
        printk("%ld pages of RAM\n", num_physpages);
        printk("%d free pages\n", nr_free_pages());
+       printk("%d pages in page table cache\n",pgtable_cache_size);
 }
 
 void mmu_info(struct seq_file *m)
@@ -427,8 +349,6 @@ void mmu_info(struct seq_file *m)
                seq_printf(m, "MMU Type\t: Cheetah+\n");
        else if (tlb_type == spitfire)
                seq_printf(m, "MMU Type\t: Spitfire\n");
-       else if (tlb_type == hypervisor)
-               seq_printf(m, "MMU Type\t: Hypervisor (sun4v)\n");
        else
                seq_printf(m, "MMU Type\t: ???\n");
 
@@ -451,13 +371,45 @@ struct linux_prom_translation {
 /* 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;
+unsigned int swapper_pgd_zero __read_mostly;
+
+extern unsigned long prom_boot_page;
+extern void prom_remap(unsigned long physpage, unsigned long virtpage, int mmu_ihandle);
+extern int prom_get_mmu_ihandle(void);
+extern void register_prom_callbacks(void);
 
 /* Exported for SMP bootup purposes. */
 unsigned long kern_locked_tte_data;
 
+/*
+ * Translate PROM's mapping we capture at boot time into physical address.
+ * The second parameter is only set from prom_callback() invocations.
+ */
+unsigned long prom_virt_to_phys(unsigned long promva, int *error)
+{
+       int i;
+
+       for (i = 0; i < prom_trans_ents; i++) {
+               struct linux_prom_translation *p = &prom_trans[i];
+
+               if (promva >= p->virt &&
+                   promva < (p->virt + p->size)) {
+                       unsigned long base = p->data & _PAGE_PADDR;
+
+                       if (error)
+                               *error = 0;
+                       return base + (promva & (8192 - 1));
+               }
+       }
+       if (error)
+               *error = 1;
+       return 0UL;
+}
+
 /* The obp translations are saved based on 8k pagesize, since obp can
  * use a mixture of pagesizes. Misses to the LOW_OBP_ADDRESS ->
- * HI_OBP_ADDRESS range are handled in ktlb.S.
+ * HI_OBP_ADDRESS range are handled in ktlb.S and do not use the vpte
+ * scheme (also, see rant in inherit_locked_prom_mappings()).
  */
 static inline int in_obp_range(unsigned long vaddr)
 {
@@ -538,36 +490,6 @@ static void __init read_obp_translations(void)
        }
 }
 
-static void __init hypervisor_tlb_lock(unsigned long vaddr,
-                                      unsigned long pte,
-                                      unsigned long mmu)
-{
-       register unsigned long func asm("%o5");
-       register unsigned long arg0 asm("%o0");
-       register unsigned long arg1 asm("%o1");
-       register unsigned long arg2 asm("%o2");
-       register unsigned long arg3 asm("%o3");
-
-       func = HV_FAST_MMU_MAP_PERM_ADDR;
-       arg0 = vaddr;
-       arg1 = 0;
-       arg2 = pte;
-       arg3 = mmu;
-       __asm__ __volatile__("ta        0x80"
-                            : "=&r" (func), "=&r" (arg0),
-                              "=&r" (arg1), "=&r" (arg2),
-                              "=&r" (arg3)
-                            : "0" (func), "1" (arg0), "2" (arg1),
-                              "3" (arg2), "4" (arg3));
-       if (arg0 != 0) {
-               prom_printf("hypervisor_tlb_lock[%lx:%lx:%lx:%lx]: "
-                           "errors with %lx\n", vaddr, 0, pte, mmu, arg0);
-               prom_halt();
-       }
-}
-
-static unsigned long kern_large_tte(unsigned long paddr);
-
 static void __init remap_kernel(void)
 {
        unsigned long phys_page, tte_vaddr, tte_data;
@@ -575,34 +497,25 @@ static void __init remap_kernel(void)
 
        tte_vaddr = (unsigned long) KERNBASE;
        phys_page = (prom_boot_mapping_phys_low >> 22UL) << 22UL;
-       tte_data = kern_large_tte(phys_page);
+       tte_data = (phys_page | (_PAGE_VALID | _PAGE_SZ4MB |
+                                _PAGE_CP | _PAGE_CV | _PAGE_P |
+                                _PAGE_L | _PAGE_W));
 
        kern_locked_tte_data = tte_data;
 
-       /* Now lock us into the TLBs via Hypervisor or OBP. */
-       if (tlb_type == hypervisor) {
-               hypervisor_tlb_lock(tte_vaddr, tte_data, HV_MMU_DMMU);
-               hypervisor_tlb_lock(tte_vaddr, tte_data, HV_MMU_IMMU);
-               if (bigkernel) {
-                       tte_vaddr += 0x400000;
-                       tte_data += 0x400000;
-                       hypervisor_tlb_lock(tte_vaddr, tte_data, HV_MMU_DMMU);
-                       hypervisor_tlb_lock(tte_vaddr, tte_data, HV_MMU_IMMU);
-               }
-       } else {
-               prom_dtlb_load(tlb_ent, tte_data, tte_vaddr);
-               prom_itlb_load(tlb_ent, tte_data, tte_vaddr);
-               if (bigkernel) {
-                       tlb_ent -= 1;
-                       prom_dtlb_load(tlb_ent,
-                                      tte_data + 0x400000, 
-                                      tte_vaddr + 0x400000);
-                       prom_itlb_load(tlb_ent,
-                                      tte_data + 0x400000, 
-                                      tte_vaddr + 0x400000);
-               }
-               sparc64_highest_unlocked_tlb_ent = tlb_ent - 1;
+       /* Now lock us into the TLBs via OBP. */
+       prom_dtlb_load(tlb_ent, tte_data, tte_vaddr);
+       prom_itlb_load(tlb_ent, tte_data, tte_vaddr);
+       if (bigkernel) {
+               tlb_ent -= 1;
+               prom_dtlb_load(tlb_ent,
+                              tte_data + 0x400000, 
+                              tte_vaddr + 0x400000);
+               prom_itlb_load(tlb_ent,
+                              tte_data + 0x400000, 
+                              tte_vaddr + 0x400000);
        }
+       sparc64_highest_unlocked_tlb_ent = tlb_ent - 1;
        if (tlb_type == cheetah_plus) {
                sparc64_kern_pri_context = (CTX_CHEETAH_PLUS_CTX0 |
                                            CTX_CHEETAH_PLUS_NUC);
@@ -620,14 +533,372 @@ static void __init inherit_prom_mappings(void)
        prom_printf("Remapping the kernel... ");
        remap_kernel();
        prom_printf("done.\n");
+
+       prom_printf("Registering callbacks... ");
+       register_prom_callbacks();
+       prom_printf("done.\n");
 }
 
+/* The OBP specifications for sun4u mark 0xfffffffc00000000 and
+ * upwards as reserved for use by the firmware (I wonder if this
+ * will be the same on Cheetah...).  We use this virtual address
+ * range for the VPTE table mappings of the nucleus so we need
+ * to zap them when we enter the PROM.  -DaveM
+ */
+static void __flush_nucleus_vptes(void)
+{
+       unsigned long prom_reserved_base = 0xfffffffc00000000UL;
+       int i;
+
+       /* Only DTLB must be checked for VPTE entries. */
+       if (tlb_type == spitfire) {
+               for (i = 0; i < 63; i++) {
+                       unsigned long tag;
+
+                       /* Spitfire Errata #32 workaround */
+                       /* NOTE: Always runs on spitfire, so no cheetah+
+                        *       page size encodings.
+                        */
+                       __asm__ __volatile__("stxa      %0, [%1] %2\n\t"
+                                            "flush     %%g6"
+                                            : /* No outputs */
+                                            : "r" (0),
+                                            "r" (PRIMARY_CONTEXT), "i" (ASI_DMMU));
+
+                       tag = spitfire_get_dtlb_tag(i);
+                       if (((tag & ~(PAGE_MASK)) == 0) &&
+                           ((tag &  (PAGE_MASK)) >= prom_reserved_base)) {
+                               __asm__ __volatile__("stxa %%g0, [%0] %1\n\t"
+                                                    "membar #Sync"
+                                                    : /* no outputs */
+                                                    : "r" (TLB_TAG_ACCESS), "i" (ASI_DMMU));
+                               spitfire_put_dtlb_data(i, 0x0UL);
+                       }
+               }
+       } else if (tlb_type == cheetah || tlb_type == cheetah_plus) {
+               for (i = 0; i < 512; i++) {
+                       unsigned long tag = cheetah_get_dtlb_tag(i, 2);
+
+                       if ((tag & ~PAGE_MASK) == 0 &&
+                           (tag & PAGE_MASK) >= prom_reserved_base) {
+                               __asm__ __volatile__("stxa %%g0, [%0] %1\n\t"
+                                                    "membar #Sync"
+                                                    : /* no outputs */
+                                                    : "r" (TLB_TAG_ACCESS), "i" (ASI_DMMU));
+                               cheetah_put_dtlb_data(i, 0x0UL, 2);
+                       }
+
+                       if (tlb_type != cheetah_plus)
+                               continue;
+
+                       tag = cheetah_get_dtlb_tag(i, 3);
+
+                       if ((tag & ~PAGE_MASK) == 0 &&
+                           (tag & PAGE_MASK) >= prom_reserved_base) {
+                               __asm__ __volatile__("stxa %%g0, [%0] %1\n\t"
+                                                    "membar #Sync"
+                                                    : /* no outputs */
+                                                    : "r" (TLB_TAG_ACCESS), "i" (ASI_DMMU));
+                               cheetah_put_dtlb_data(i, 0x0UL, 3);
+                       }
+               }
+       } else {
+               /* Implement me :-) */
+               BUG();
+       }
+}
+
+static int prom_ditlb_set;
+struct prom_tlb_entry {
+       int             tlb_ent;
+       unsigned long   tlb_tag;
+       unsigned long   tlb_data;
+};
+struct prom_tlb_entry prom_itlb[16], prom_dtlb[16];
+
 void prom_world(int enter)
 {
+       unsigned long pstate;
+       int i;
+
        if (!enter)
                set_fs((mm_segment_t) { get_thread_current_ds() });
 
-       __asm__ __volatile__("flushw");
+       if (!prom_ditlb_set)
+               return;
+
+       /* Make sure the following runs atomically. */
+       __asm__ __volatile__("flushw\n\t"
+                            "rdpr      %%pstate, %0\n\t"
+                            "wrpr      %0, %1, %%pstate"
+                            : "=r" (pstate)
+                            : "i" (PSTATE_IE));
+
+       if (enter) {
+               /* Kick out nucleus VPTEs. */
+               __flush_nucleus_vptes();
+
+               /* Install PROM world. */
+               for (i = 0; i < 16; i++) {
+                       if (prom_dtlb[i].tlb_ent != -1) {
+                               __asm__ __volatile__("stxa %0, [%1] %2\n\t"
+                                                    "membar #Sync"
+                                       : : "r" (prom_dtlb[i].tlb_tag), "r" (TLB_TAG_ACCESS),
+                                       "i" (ASI_DMMU));
+                               if (tlb_type == spitfire)
+                                       spitfire_put_dtlb_data(prom_dtlb[i].tlb_ent,
+                                                              prom_dtlb[i].tlb_data);
+                               else if (tlb_type == cheetah || tlb_type == cheetah_plus)
+                                       cheetah_put_ldtlb_data(prom_dtlb[i].tlb_ent,
+                                                              prom_dtlb[i].tlb_data);
+                       }
+                       if (prom_itlb[i].tlb_ent != -1) {
+                               __asm__ __volatile__("stxa %0, [%1] %2\n\t"
+                                                    "membar #Sync"
+                                                    : : "r" (prom_itlb[i].tlb_tag),
+                                                    "r" (TLB_TAG_ACCESS),
+                                                    "i" (ASI_IMMU));
+                               if (tlb_type == spitfire)
+                                       spitfire_put_itlb_data(prom_itlb[i].tlb_ent,
+                                                              prom_itlb[i].tlb_data);
+                               else if (tlb_type == cheetah || tlb_type == cheetah_plus)
+                                       cheetah_put_litlb_data(prom_itlb[i].tlb_ent,
+                                                              prom_itlb[i].tlb_data);
+                       }
+               }
+       } else {
+               for (i = 0; i < 16; i++) {
+                       if (prom_dtlb[i].tlb_ent != -1) {
+                               __asm__ __volatile__("stxa %%g0, [%0] %1\n\t"
+                                                    "membar #Sync"
+                                       : : "r" (TLB_TAG_ACCESS), "i" (ASI_DMMU));
+                               if (tlb_type == spitfire)
+                                       spitfire_put_dtlb_data(prom_dtlb[i].tlb_ent, 0x0UL);
+                               else
+                                       cheetah_put_ldtlb_data(prom_dtlb[i].tlb_ent, 0x0UL);
+                       }
+                       if (prom_itlb[i].tlb_ent != -1) {
+                               __asm__ __volatile__("stxa %%g0, [%0] %1\n\t"
+                                                    "membar #Sync"
+                                                    : : "r" (TLB_TAG_ACCESS),
+                                                    "i" (ASI_IMMU));
+                               if (tlb_type == spitfire)
+                                       spitfire_put_itlb_data(prom_itlb[i].tlb_ent, 0x0UL);
+                               else
+                                       cheetah_put_litlb_data(prom_itlb[i].tlb_ent, 0x0UL);
+                       }
+               }
+       }
+       __asm__ __volatile__("wrpr      %0, 0, %%pstate"
+                            : : "r" (pstate));
+}
+
+void inherit_locked_prom_mappings(int save_p)
+{
+       int i;
+       int dtlb_seen = 0;
+       int itlb_seen = 0;
+
+       /* Fucking losing PROM has more mappings in the TLB, but
+        * it (conveniently) fails to mention any of these in the
+        * translations property.  The only ones that matter are
+        * the locked PROM tlb entries, so we impose the following
+        * irrecovable rule on the PROM, it is allowed 8 locked
+        * entries in the ITLB and 8 in the DTLB.
+        *
+        * Supposedly the upper 16GB of the address space is
+        * reserved for OBP, BUT I WISH THIS WAS DOCUMENTED
+        * SOMEWHERE!!!!!!!!!!!!!!!!!  Furthermore the entire interface
+        * used between the client program and the firmware on sun5
+        * systems to coordinate mmu mappings is also COMPLETELY
+        * UNDOCUMENTED!!!!!! Thanks S(t)un!
+        */
+       if (save_p) {
+               for (i = 0; i < 16; i++) {
+                       prom_itlb[i].tlb_ent = -1;
+                       prom_dtlb[i].tlb_ent = -1;
+               }
+       }
+       if (tlb_type == spitfire) {
+               int high = sparc64_highest_unlocked_tlb_ent;
+               for (i = 0; i <= high; i++) {
+                       unsigned long data;
+
+                       /* Spitfire Errata #32 workaround */
+                       /* NOTE: Always runs on spitfire, so no cheetah+
+                        *       page size encodings.
+                        */
+                       __asm__ __volatile__("stxa      %0, [%1] %2\n\t"
+                                            "flush     %%g6"
+                                            : /* No outputs */
+                                            : "r" (0),
+                                            "r" (PRIMARY_CONTEXT), "i" (ASI_DMMU));
+
+                       data = spitfire_get_dtlb_data(i);
+                       if ((data & (_PAGE_L|_PAGE_VALID)) == (_PAGE_L|_PAGE_VALID)) {
+                               unsigned long tag;
+
+                               /* Spitfire Errata #32 workaround */
+                               /* NOTE: Always runs on spitfire, so no
+                                *       cheetah+ page size encodings.
+                                */
+                               __asm__ __volatile__("stxa      %0, [%1] %2\n\t"
+                                                    "flush     %%g6"
+                                                    : /* No outputs */
+                                                    : "r" (0),
+                                                    "r" (PRIMARY_CONTEXT), "i" (ASI_DMMU));
+
+                               tag = spitfire_get_dtlb_tag(i);
+                               if (save_p) {
+                                       prom_dtlb[dtlb_seen].tlb_ent = i;
+                                       prom_dtlb[dtlb_seen].tlb_tag = tag;
+                                       prom_dtlb[dtlb_seen].tlb_data = data;
+                               }
+                               __asm__ __volatile__("stxa %%g0, [%0] %1\n\t"
+                                                    "membar #Sync"
+                                                    : : "r" (TLB_TAG_ACCESS), "i" (ASI_DMMU));
+                               spitfire_put_dtlb_data(i, 0x0UL);
+
+                               dtlb_seen++;
+                               if (dtlb_seen > 15)
+                                       break;
+                       }
+               }
+
+               for (i = 0; i < high; i++) {
+                       unsigned long data;
+
+                       /* Spitfire Errata #32 workaround */
+                       /* NOTE: Always runs on spitfire, so no
+                        *       cheetah+ page size encodings.
+                        */
+                       __asm__ __volatile__("stxa      %0, [%1] %2\n\t"
+                                            "flush     %%g6"
+                                            : /* No outputs */
+                                            : "r" (0),
+                                            "r" (PRIMARY_CONTEXT), "i" (ASI_DMMU));
+
+                       data = spitfire_get_itlb_data(i);
+                       if ((data & (_PAGE_L|_PAGE_VALID)) == (_PAGE_L|_PAGE_VALID)) {
+                               unsigned long tag;
+
+                               /* Spitfire Errata #32 workaround */
+                               /* NOTE: Always runs on spitfire, so no
+                                *       cheetah+ page size encodings.
+                                */
+                               __asm__ __volatile__("stxa      %0, [%1] %2\n\t"
+                                                    "flush     %%g6"
+                                                    : /* No outputs */
+                                                    : "r" (0),
+                                                    "r" (PRIMARY_CONTEXT), "i" (ASI_DMMU));
+
+                               tag = spitfire_get_itlb_tag(i);
+                               if (save_p) {
+                                       prom_itlb[itlb_seen].tlb_ent = i;
+                                       prom_itlb[itlb_seen].tlb_tag = tag;
+                                       prom_itlb[itlb_seen].tlb_data = data;
+                               }
+                               __asm__ __volatile__("stxa %%g0, [%0] %1\n\t"
+                                                    "membar #Sync"
+                                                    : : "r" (TLB_TAG_ACCESS), "i" (ASI_IMMU));
+                               spitfire_put_itlb_data(i, 0x0UL);
+
+                               itlb_seen++;
+                               if (itlb_seen > 15)
+                                       break;
+                       }
+               }
+       } else if (tlb_type == cheetah || tlb_type == cheetah_plus) {
+               int high = sparc64_highest_unlocked_tlb_ent;
+
+               for (i = 0; i <= high; i++) {
+                       unsigned long data;
+
+                       data = cheetah_get_ldtlb_data(i);
+                       if ((data & (_PAGE_L|_PAGE_VALID)) == (_PAGE_L|_PAGE_VALID)) {
+                               unsigned long tag;
+
+                               tag = cheetah_get_ldtlb_tag(i);
+                               if (save_p) {
+                                       prom_dtlb[dtlb_seen].tlb_ent = i;
+                                       prom_dtlb[dtlb_seen].tlb_tag = tag;
+                                       prom_dtlb[dtlb_seen].tlb_data = data;
+                               }
+                               __asm__ __volatile__("stxa %%g0, [%0] %1\n\t"
+                                                    "membar #Sync"
+                                                    : : "r" (TLB_TAG_ACCESS), "i" (ASI_DMMU));
+                               cheetah_put_ldtlb_data(i, 0x0UL);
+
+                               dtlb_seen++;
+                               if (dtlb_seen > 15)
+                                       break;
+                       }
+               }
+
+               for (i = 0; i < high; i++) {
+                       unsigned long data;
+
+                       data = cheetah_get_litlb_data(i);
+                       if ((data & (_PAGE_L|_PAGE_VALID)) == (_PAGE_L|_PAGE_VALID)) {
+                               unsigned long tag;
+
+                               tag = cheetah_get_litlb_tag(i);
+                               if (save_p) {
+                                       prom_itlb[itlb_seen].tlb_ent = i;
+                                       prom_itlb[itlb_seen].tlb_tag = tag;
+                                       prom_itlb[itlb_seen].tlb_data = data;
+                               }
+                               __asm__ __volatile__("stxa %%g0, [%0] %1\n\t"
+                                                    "membar #Sync"
+                                                    : : "r" (TLB_TAG_ACCESS), "i" (ASI_IMMU));
+                               cheetah_put_litlb_data(i, 0x0UL);
+
+                               itlb_seen++;
+                               if (itlb_seen > 15)
+                                       break;
+                       }
+               }
+       } else {
+               /* Implement me :-) */
+               BUG();
+       }
+       if (save_p)
+               prom_ditlb_set = 1;
+}
+
+/* Give PROM back his world, done during reboots... */
+void prom_reload_locked(void)
+{
+       int i;
+
+       for (i = 0; i < 16; i++) {
+               if (prom_dtlb[i].tlb_ent != -1) {
+                       __asm__ __volatile__("stxa %0, [%1] %2\n\t"
+                                            "membar #Sync"
+                               : : "r" (prom_dtlb[i].tlb_tag), "r" (TLB_TAG_ACCESS),
+                               "i" (ASI_DMMU));
+                       if (tlb_type == spitfire)
+                               spitfire_put_dtlb_data(prom_dtlb[i].tlb_ent,
+                                                      prom_dtlb[i].tlb_data);
+                       else if (tlb_type == cheetah || tlb_type == cheetah_plus)
+                               cheetah_put_ldtlb_data(prom_dtlb[i].tlb_ent,
+                                                     prom_dtlb[i].tlb_data);
+               }
+
+               if (prom_itlb[i].tlb_ent != -1) {
+                       __asm__ __volatile__("stxa %0, [%1] %2\n\t"
+                                            "membar #Sync"
+                                            : : "r" (prom_itlb[i].tlb_tag),
+                                            "r" (TLB_TAG_ACCESS),
+                                            "i" (ASI_IMMU));
+                       if (tlb_type == spitfire)
+                               spitfire_put_itlb_data(prom_itlb[i].tlb_ent,
+                                                      prom_itlb[i].tlb_data);
+                       else
+                               cheetah_put_litlb_data(prom_itlb[i].tlb_ent,
+                                                      prom_itlb[i].tlb_data);
+               }
+       }
 }
 
 #ifdef DCACHE_ALIASING_POSSIBLE
@@ -643,7 +914,7 @@ void __flush_dcache_range(unsigned long start, unsigned long end)
                        if (++n >= 512)
                                break;
                }
-       } else if (tlb_type == cheetah || tlb_type == cheetah_plus) {
+       } else {
                start = __pa(start);
                end = __pa(end);
                for (va = start; va < end; va += 32)
@@ -656,6 +927,63 @@ void __flush_dcache_range(unsigned long start, unsigned long end)
 }
 #endif /* DCACHE_ALIASING_POSSIBLE */
 
+/* If not locked, zap it. */
+void __flush_tlb_all(void)
+{
+       unsigned long pstate;
+       int i;
+
+       __asm__ __volatile__("flushw\n\t"
+                            "rdpr      %%pstate, %0\n\t"
+                            "wrpr      %0, %1, %%pstate"
+                            : "=r" (pstate)
+                            : "i" (PSTATE_IE));
+       if (tlb_type == spitfire) {
+               for (i = 0; i < 64; i++) {
+                       /* Spitfire Errata #32 workaround */
+                       /* NOTE: Always runs on spitfire, so no
+                        *       cheetah+ page size encodings.
+                        */
+                       __asm__ __volatile__("stxa      %0, [%1] %2\n\t"
+                                            "flush     %%g6"
+                                            : /* No outputs */
+                                            : "r" (0),
+                                            "r" (PRIMARY_CONTEXT), "i" (ASI_DMMU));
+
+                       if (!(spitfire_get_dtlb_data(i) & _PAGE_L)) {
+                               __asm__ __volatile__("stxa %%g0, [%0] %1\n\t"
+                                                    "membar #Sync"
+                                                    : /* no outputs */
+                                                    : "r" (TLB_TAG_ACCESS), "i" (ASI_DMMU));
+                               spitfire_put_dtlb_data(i, 0x0UL);
+                       }
+
+                       /* Spitfire Errata #32 workaround */
+                       /* NOTE: Always runs on spitfire, so no
+                        *       cheetah+ page size encodings.
+                        */
+                       __asm__ __volatile__("stxa      %0, [%1] %2\n\t"
+                                            "flush     %%g6"
+                                            : /* No outputs */
+                                            : "r" (0),
+                                            "r" (PRIMARY_CONTEXT), "i" (ASI_DMMU));
+
+                       if (!(spitfire_get_itlb_data(i) & _PAGE_L)) {
+                               __asm__ __volatile__("stxa %%g0, [%0] %1\n\t"
+                                                    "membar #Sync"
+                                                    : /* no outputs */
+                                                    : "r" (TLB_TAG_ACCESS), "i" (ASI_IMMU));
+                               spitfire_put_itlb_data(i, 0x0UL);
+                       }
+               }
+       } else if (tlb_type == cheetah || tlb_type == cheetah_plus) {
+               cheetah_flush_dtlb_all();
+               cheetah_flush_itlb_all();
+       }
+       __asm__ __volatile__("wrpr      %0, 0, %%pstate"
+                            : : "r" (pstate));
+}
+
 /* Caller does TLB context flushing on local CPU if necessary.
  * The caller also ensures that CTX_VALID(mm->context) is false.
  *
@@ -663,21 +991,17 @@ void __flush_dcache_range(unsigned long start, unsigned long end)
  * let the user have CTX 0 (nucleus) or we ever use a CTX
  * version of zero (and thus NO_CONTEXT would not be caught
  * by version mis-match tests in mmu_context.h).
- *
- * Always invoked with interrupts disabled.
  */
 void get_new_mmu_context(struct mm_struct *mm)
 {
        unsigned long ctx, new_ctx;
        unsigned long orig_pgsz_bits;
-       unsigned long flags;
-       int new_version;
+       
 
-       spin_lock_irqsave(&ctx_alloc_lock, flags);
+       spin_lock(&ctx_alloc_lock);
        orig_pgsz_bits = (mm->context.sparc64_ctx_val & CTX_PGSZ_MASK);
        ctx = (tlb_context_cache + 1) & CTX_NR_MASK;
        new_ctx = find_next_zero_bit(mmu_context_bmap, 1 << CTX_NR_BITS, ctx);
-       new_version = 0;
        if (new_ctx >= (1 << CTX_NR_BITS)) {
                new_ctx = find_next_zero_bit(mmu_context_bmap, ctx, 1);
                if (new_ctx >= ctx) {
@@ -700,7 +1024,6 @@ void get_new_mmu_context(struct mm_struct *mm)
                                mmu_context_bmap[i + 2] = 0;
                                mmu_context_bmap[i + 3] = 0;
                        }
-                       new_version = 1;
                        goto out;
                }
        }
@@ -709,10 +1032,79 @@ void get_new_mmu_context(struct mm_struct *mm)
 out:
        tlb_context_cache = new_ctx;
        mm->context.sparc64_ctx_val = new_ctx | orig_pgsz_bits;
-       spin_unlock_irqrestore(&ctx_alloc_lock, flags);
+       spin_unlock(&ctx_alloc_lock);
+}
+
+#ifndef CONFIG_SMP
+struct pgtable_cache_struct pgt_quicklists;
+#endif
+
+/* OK, we have to color these pages. The page tables are accessed
+ * by non-Dcache enabled mapping in the VPTE area by the dtlb_backend.S
+ * code, as well as by PAGE_OFFSET range direct-mapped addresses by 
+ * other parts of the kernel. By coloring, we make sure that the tlbmiss 
+ * fast handlers do not get data from old/garbage dcache lines that 
+ * correspond to an old/stale virtual address (user/kernel) that 
+ * previously mapped the pagetable page while accessing vpte range 
+ * addresses. The idea is that if the vpte color and PAGE_OFFSET range 
+ * color is the same, then when the kernel initializes the pagetable 
+ * using the later address range, accesses with the first address
+ * range will see the newly initialized data rather than the garbage.
+ */
+#ifdef DCACHE_ALIASING_POSSIBLE
+#define DC_ALIAS_SHIFT 1
+#else
+#define DC_ALIAS_SHIFT 0
+#endif
+pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)
+{
+       struct page *page;
+       unsigned long color;
 
-       if (unlikely(new_version))
-               smp_new_mmu_context_version();
+       {
+               pte_t *ptep = pte_alloc_one_fast(mm, address);
+
+               if (ptep)
+                       return ptep;
+       }
+
+       color = VPTE_COLOR(address);
+       page = alloc_pages(GFP_KERNEL|__GFP_REPEAT, DC_ALIAS_SHIFT);
+       if (page) {
+               unsigned long *to_free;
+               unsigned long paddr;
+               pte_t *pte;
+
+#ifdef DCACHE_ALIASING_POSSIBLE
+               set_page_count(page, 1);
+               ClearPageCompound(page);
+
+               set_page_count((page + 1), 1);
+               ClearPageCompound(page + 1);
+#endif
+               paddr = (unsigned long) page_address(page);
+               memset((char *)paddr, 0, (PAGE_SIZE << DC_ALIAS_SHIFT));
+
+               if (!color) {
+                       pte = (pte_t *) paddr;
+                       to_free = (unsigned long *) (paddr + PAGE_SIZE);
+               } else {
+                       pte = (pte_t *) (paddr + PAGE_SIZE);
+                       to_free = (unsigned long *) paddr;
+               }
+
+#ifdef DCACHE_ALIASING_POSSIBLE
+               /* Now free the other one up, adjust cache size. */
+               preempt_disable();
+               *to_free = (unsigned long) pte_quicklist[color ^ 0x1];
+               pte_quicklist[color ^ 0x1] = to_free;
+               pgtable_cache_size++;
+               preempt_enable();
+#endif
+
+               return pte;
+       }
+       return NULL;
 }
 
 void sparc_ultra_dump_itlb(void)
@@ -774,108 +1166,39 @@ void sparc_ultra_dump_dtlb(void)
                }
        } else if (tlb_type == cheetah || tlb_type == cheetah_plus) {
                printk ("Contents of dtlb0:\n");
-               for (slot = 0; slot < 16; slot+=2) {
-                       printk ("%2x:%016lx,%016lx %2x:%016lx,%016lx\n",
-                               slot,
-                               cheetah_get_ldtlb_tag(slot), cheetah_get_ldtlb_data(slot),
-                               slot+1,
-                               cheetah_get_ldtlb_tag(slot+1), cheetah_get_ldtlb_data(slot+1));
-               }
-               printk ("Contents of dtlb2:\n");
-               for (slot = 0; slot < 512; slot+=2) {
-                       printk ("%2x:%016lx,%016lx %2x:%016lx,%016lx\n",
-                               slot,
-                               cheetah_get_dtlb_tag(slot, 2), cheetah_get_dtlb_data(slot, 2),
-                               slot+1,
-                               cheetah_get_dtlb_tag(slot+1, 2), cheetah_get_dtlb_data(slot+1, 2));
-               }
-               if (tlb_type == cheetah_plus) {
-                       printk ("Contents of dtlb3:\n");
-                       for (slot = 0; slot < 512; slot+=2) {
-                               printk ("%2x:%016lx,%016lx %2x:%016lx,%016lx\n",
-                                       slot,
-                                       cheetah_get_dtlb_tag(slot, 3), cheetah_get_dtlb_data(slot, 3),
-                                       slot+1,
-                                       cheetah_get_dtlb_tag(slot+1, 3), cheetah_get_dtlb_data(slot+1, 3));
-                       }
-               }
-       }
-}
-
-extern unsigned long cmdline_memory_size;
-
-/* Find a free area for the bootmem map, avoiding the kernel image
- * and the initial ramdisk.
- */
-static unsigned long __init choose_bootmap_pfn(unsigned long start_pfn,
-                                              unsigned long end_pfn)
-{
-       unsigned long avoid_start, avoid_end, bootmap_size;
-       int i;
-
-       bootmap_size = ((end_pfn - start_pfn) + 7) / 8;
-       bootmap_size = ALIGN(bootmap_size, sizeof(long));
-
-       avoid_start = avoid_end = 0;
-#ifdef CONFIG_BLK_DEV_INITRD
-       avoid_start = initrd_start;
-       avoid_end = PAGE_ALIGN(initrd_end);
-#endif
-
-#ifdef CONFIG_DEBUG_BOOTMEM
-       prom_printf("choose_bootmap_pfn: kern[%lx:%lx] avoid[%lx:%lx]\n",
-                   kern_base, PAGE_ALIGN(kern_base + kern_size),
-                   avoid_start, avoid_end);
-#endif
-       for (i = 0; i < pavail_ents; i++) {
-               unsigned long start, end;
-
-               start = pavail[i].phys_addr;
-               end = start + pavail[i].reg_size;
-
-               while (start < end) {
-                       if (start >= kern_base &&
-                           start < PAGE_ALIGN(kern_base + kern_size)) {
-                               start = PAGE_ALIGN(kern_base + kern_size);
-                               continue;
-                       }
-                       if (start >= avoid_start && start < avoid_end) {
-                               start = avoid_end;
-                               continue;
-                       }
-
-                       if ((end - start) < bootmap_size)
-                               break;
-
-                       if (start < kern_base &&
-                           (start + bootmap_size) > kern_base) {
-                               start = PAGE_ALIGN(kern_base + kern_size);
-                               continue;
-                       }
-
-                       if (start < avoid_start &&
-                           (start + bootmap_size) > avoid_start) {
-                               start = avoid_end;
-                               continue;
+               for (slot = 0; slot < 16; slot+=2) {
+                       printk ("%2x:%016lx,%016lx %2x:%016lx,%016lx\n",
+                               slot,
+                               cheetah_get_ldtlb_tag(slot), cheetah_get_ldtlb_data(slot),
+                               slot+1,
+                               cheetah_get_ldtlb_tag(slot+1), cheetah_get_ldtlb_data(slot+1));
+               }
+               printk ("Contents of dtlb2:\n");
+               for (slot = 0; slot < 512; slot+=2) {
+                       printk ("%2x:%016lx,%016lx %2x:%016lx,%016lx\n",
+                               slot,
+                               cheetah_get_dtlb_tag(slot, 2), cheetah_get_dtlb_data(slot, 2),
+                               slot+1,
+                               cheetah_get_dtlb_tag(slot+1, 2), cheetah_get_dtlb_data(slot+1, 2));
+               }
+               if (tlb_type == cheetah_plus) {
+                       printk ("Contents of dtlb3:\n");
+                       for (slot = 0; slot < 512; slot+=2) {
+                               printk ("%2x:%016lx,%016lx %2x:%016lx,%016lx\n",
+                                       slot,
+                                       cheetah_get_dtlb_tag(slot, 3), cheetah_get_dtlb_data(slot, 3),
+                                       slot+1,
+                                       cheetah_get_dtlb_tag(slot+1, 3), cheetah_get_dtlb_data(slot+1, 3));
                        }
-
-                       /* OK, it doesn't overlap anything, use it.  */
-#ifdef CONFIG_DEBUG_BOOTMEM
-                       prom_printf("choose_bootmap_pfn: Using %lx [%lx]\n",
-                                   start >> PAGE_SHIFT, start);
-#endif
-                       return start >> PAGE_SHIFT;
                }
        }
-
-       prom_printf("Cannot find free area for bootmap, aborting.\n");
-       prom_halt();
 }
 
-static unsigned long __init bootmem_init(unsigned long *pages_avail,
-                                        unsigned long phys_base)
+extern unsigned long cmdline_memory_size;
+
+unsigned long __init bootmem_init(unsigned long *pages_avail)
 {
-       unsigned long bootmap_size, end_pfn;
+       unsigned long bootmap_size, start_pfn, end_pfn;
        unsigned long end_of_phys_memory = 0UL;
        unsigned long bootmap_pfn, bytes_avail, size;
        int i;
@@ -913,6 +1236,14 @@ static unsigned long __init bootmem_init(unsigned long *pages_avail,
 
        *pages_avail = bytes_avail >> PAGE_SHIFT;
 
+       /* Start with page aligned address of last symbol in kernel
+        * image.  The kernel is hard mapped below PAGE_OFFSET in a
+        * 4MB locked TLB translation.
+        */
+       start_pfn = PAGE_ALIGN(kern_base + kern_size) >> PAGE_SHIFT;
+
+       bootmap_pfn = start_pfn;
+
        end_pfn = end_of_phys_memory >> PAGE_SHIFT;
 
 #ifdef CONFIG_BLK_DEV_INITRD
@@ -928,22 +1259,23 @@ static unsigned long __init bootmem_init(unsigned long *pages_avail,
                                         "(0x%016lx > 0x%016lx)\ndisabling initrd\n",
                               initrd_end, end_of_phys_memory);
                        initrd_start = 0;
-                       initrd_end = 0;
+               }
+               if (initrd_start) {
+                       if (initrd_start >= (start_pfn << PAGE_SHIFT) &&
+                           initrd_start < (start_pfn << PAGE_SHIFT) + 2 * PAGE_SIZE)
+                               bootmap_pfn = PAGE_ALIGN (initrd_end) >> PAGE_SHIFT;
                }
        }
 #endif 
        /* Initialize the boot-time allocator. */
        max_pfn = max_low_pfn = end_pfn;
-       min_low_pfn = (phys_base >> PAGE_SHIFT);
-
-       bootmap_pfn = choose_bootmap_pfn(min_low_pfn, end_pfn);
+       min_low_pfn = pfn_base;
 
 #ifdef CONFIG_DEBUG_BOOTMEM
        prom_printf("init_bootmem(min[%lx], bootmap[%lx], max[%lx])\n",
                    min_low_pfn, bootmap_pfn, max_low_pfn);
 #endif
-       bootmap_size = init_bootmem_node(NODE_DATA(0), bootmap_pfn,
-                                        min_low_pfn, end_pfn);
+       bootmap_size = init_bootmem_node(NODE_DATA(0), bootmap_pfn, pfn_base, end_pfn);
 
        /* Now register the available physical memory with the
         * allocator.
@@ -991,26 +1323,9 @@ static unsigned long __init bootmem_init(unsigned long *pages_avail,
        reserve_bootmem((bootmap_pfn << PAGE_SHIFT), size);
        *pages_avail -= PAGE_ALIGN(size) >> PAGE_SHIFT;
 
-       for (i = 0; i < pavail_ents; i++) {
-               unsigned long start_pfn, end_pfn;
-
-               start_pfn = pavail[i].phys_addr >> PAGE_SHIFT;
-               end_pfn = (start_pfn + (pavail[i].reg_size >> PAGE_SHIFT));
-#ifdef CONFIG_DEBUG_BOOTMEM
-               prom_printf("memory_present(0, %lx, %lx)\n",
-                           start_pfn, end_pfn);
-#endif
-               memory_present(0, start_pfn, end_pfn);
-       }
-
-       sparse_init();
-
        return end_pfn;
 }
 
-static struct linux_prom64_registers pall[MAX_BANKS] __initdata;
-static int pall_ents __initdata;
-
 #ifdef CONFIG_DEBUG_PAGEALLOC
 static unsigned long kernel_map_range(unsigned long pstart, unsigned long pend, pgprot_t prot)
 {
@@ -1066,44 +1381,14 @@ static unsigned long kernel_map_range(unsigned long pstart, unsigned long pend,
        return alloc_bytes;
 }
 
-extern unsigned int kvmap_linear_patch[1];
-#endif /* CONFIG_DEBUG_PAGEALLOC */
-
-static void __init mark_kpte_bitmap(unsigned long start, unsigned long end)
-{
-       const unsigned long shift_256MB = 28;
-       const unsigned long mask_256MB = ((1UL << shift_256MB) - 1UL);
-       const unsigned long size_256MB = (1UL << shift_256MB);
-
-       while (start < end) {
-               long remains;
-
-               remains = end - start;
-               if (remains < size_256MB)
-                       break;
-
-               if (start & mask_256MB) {
-                       start = (start + size_256MB) & ~mask_256MB;
-                       continue;
-               }
-
-               while (remains >= size_256MB) {
-                       unsigned long index = start >> shift_256MB;
-
-                       __set_bit(index, kpte_linear_bitmap);
+static struct linux_prom64_registers pall[MAX_BANKS] __initdata;
+static int pall_ents __initdata;
 
-                       start += size_256MB;
-                       remains -= size_256MB;
-               }
-       }
-}
+extern unsigned int kvmap_linear_patch[1];
 
 static void __init kernel_physical_mapping_init(void)
 {
-       unsigned long i;
-#ifdef CONFIG_DEBUG_PAGEALLOC
-       unsigned long mem_alloced = 0UL;
-#endif
+       unsigned long i, mem_alloced = 0UL;
 
        read_obp_memory("reg", &pall[0], &pall_ents);
 
@@ -1112,16 +1397,10 @@ static void __init kernel_physical_mapping_init(void)
 
                phys_start = pall[i].phys_addr;
                phys_end = phys_start + pall[i].reg_size;
-
-               mark_kpte_bitmap(phys_start, phys_end);
-
-#ifdef CONFIG_DEBUG_PAGEALLOC
                mem_alloced += kernel_map_range(phys_start, phys_end,
                                                PAGE_KERNEL);
-#endif
        }
 
-#ifdef CONFIG_DEBUG_PAGEALLOC
        printk("Allocated %ld bytes for kernel page tables.\n",
               mem_alloced);
 
@@ -1129,10 +1408,8 @@ static void __init kernel_physical_mapping_init(void)
        flushi(&kvmap_linear_patch[0]);
 
        __flush_tlb_all();
-#endif
 }
 
-#ifdef CONFIG_DEBUG_PAGEALLOC
 void kernel_map_pages(struct page *page, int numpages, int enable)
 {
        unsigned long phys_start = page_to_pfn(page) << PAGE_SHIFT;
@@ -1141,9 +1418,6 @@ void kernel_map_pages(struct page *page, int numpages, int enable)
        kernel_map_range(phys_start, phys_end,
                         (enable ? PAGE_KERNEL : __pgprot(0)));
 
-       flush_tsb_kernel_range(PAGE_OFFSET + phys_start,
-                              PAGE_OFFSET + phys_end);
-
        /* we should perform an IPI and flush all tlbs,
         * but that can deadlock->flush only current cpu.
         */
@@ -1164,150 +1438,18 @@ unsigned long __init find_ecache_flush_span(unsigned long size)
        return ~0UL;
 }
 
-static void __init tsb_phys_patch(void)
-{
-       struct tsb_ldquad_phys_patch_entry *pquad;
-       struct tsb_phys_patch_entry *p;
-
-       pquad = &__tsb_ldquad_phys_patch;
-       while (pquad < &__tsb_ldquad_phys_patch_end) {
-               unsigned long addr = pquad->addr;
-
-               if (tlb_type == hypervisor)
-                       *(unsigned int *) addr = pquad->sun4v_insn;
-               else
-                       *(unsigned int *) addr = pquad->sun4u_insn;
-               wmb();
-               __asm__ __volatile__("flush     %0"
-                                    : /* no outputs */
-                                    : "r" (addr));
-
-               pquad++;
-       }
-
-       p = &__tsb_phys_patch;
-       while (p < &__tsb_phys_patch_end) {
-               unsigned long addr = p->addr;
-
-               *(unsigned int *) addr = p->insn;
-               wmb();
-               __asm__ __volatile__("flush     %0"
-                                    : /* no outputs */
-                                    : "r" (addr));
-
-               p++;
-       }
-}
-
-/* Don't mark as init, we give this to the Hypervisor.  */
-static struct hv_tsb_descr ktsb_descr[2];
-extern struct tsb swapper_tsb[KERNEL_TSB_NENTRIES];
-
-static void __init sun4v_ktsb_init(void)
-{
-       unsigned long ktsb_pa;
-
-       /* First KTSB for PAGE_SIZE mappings.  */
-       ktsb_pa = kern_base + ((unsigned long)&swapper_tsb[0] - KERNBASE);
-
-       switch (PAGE_SIZE) {
-       case 8 * 1024:
-       default:
-               ktsb_descr[0].pgsz_idx = HV_PGSZ_IDX_8K;
-               ktsb_descr[0].pgsz_mask = HV_PGSZ_MASK_8K;
-               break;
-
-       case 64 * 1024:
-               ktsb_descr[0].pgsz_idx = HV_PGSZ_IDX_64K;
-               ktsb_descr[0].pgsz_mask = HV_PGSZ_MASK_64K;
-               break;
-
-       case 512 * 1024:
-               ktsb_descr[0].pgsz_idx = HV_PGSZ_IDX_512K;
-               ktsb_descr[0].pgsz_mask = HV_PGSZ_MASK_512K;
-               break;
-
-       case 4 * 1024 * 1024:
-               ktsb_descr[0].pgsz_idx = HV_PGSZ_IDX_4MB;
-               ktsb_descr[0].pgsz_mask = HV_PGSZ_MASK_4MB;
-               break;
-       };
-
-       ktsb_descr[0].assoc = 1;
-       ktsb_descr[0].num_ttes = KERNEL_TSB_NENTRIES;
-       ktsb_descr[0].ctx_idx = 0;
-       ktsb_descr[0].tsb_base = ktsb_pa;
-       ktsb_descr[0].resv = 0;
-
-       /* Second KTSB for 4MB/256MB mappings.  */
-       ktsb_pa = (kern_base +
-                  ((unsigned long)&swapper_4m_tsb[0] - KERNBASE));
-
-       ktsb_descr[1].pgsz_idx = HV_PGSZ_IDX_4MB;
-       ktsb_descr[1].pgsz_mask = (HV_PGSZ_MASK_4MB |
-                                  HV_PGSZ_MASK_256MB);
-       ktsb_descr[1].assoc = 1;
-       ktsb_descr[1].num_ttes = KERNEL_TSB4M_NENTRIES;
-       ktsb_descr[1].ctx_idx = 0;
-       ktsb_descr[1].tsb_base = ktsb_pa;
-       ktsb_descr[1].resv = 0;
-}
-
-void __cpuinit sun4v_ktsb_register(void)
-{
-       register unsigned long func asm("%o5");
-       register unsigned long arg0 asm("%o0");
-       register unsigned long arg1 asm("%o1");
-       unsigned long pa;
-
-       pa = kern_base + ((unsigned long)&ktsb_descr[0] - KERNBASE);
-
-       func = HV_FAST_MMU_TSB_CTX0;
-       arg0 = 2;
-       arg1 = pa;
-       __asm__ __volatile__("ta        %6"
-                            : "=&r" (func), "=&r" (arg0), "=&r" (arg1)
-                            : "0" (func), "1" (arg0), "2" (arg1),
-                              "i" (HV_FAST_TRAP));
-}
-
 /* paging_init() sets up the page tables */
 
 extern void cheetah_ecache_flush_init(void);
-extern void sun4v_patch_tlb_handlers(void);
 
 static unsigned long last_valid_pfn;
 pgd_t swapper_pg_dir[2048];
 
-static void sun4u_pgprot_init(void);
-static void sun4v_pgprot_init(void);
-
 void __init paging_init(void)
 {
-       unsigned long end_pfn, pages_avail, shift, phys_base;
+       unsigned long end_pfn, pages_avail, shift;
        unsigned long real_end, i;
 
-       kern_base = (prom_boot_mapping_phys_low >> 22UL) << 22UL;
-       kern_size = (unsigned long)&_end - (unsigned long)KERNBASE;
-
-       /* Invalidate both kernel TSBs.  */
-       memset(swapper_tsb, 0x40, sizeof(swapper_tsb));
-       memset(swapper_4m_tsb, 0x40, sizeof(swapper_4m_tsb));
-
-       if (tlb_type == hypervisor)
-               sun4v_pgprot_init();
-       else
-               sun4u_pgprot_init();
-
-       if (tlb_type == cheetah_plus ||
-           tlb_type == hypervisor)
-               tsb_phys_patch();
-
-       if (tlb_type == hypervisor) {
-               sun4v_patch_tlb_handlers();
-               sun4v_ktsb_init();
-       }
-
        /* Find available physical memory... */
        read_obp_memory("available", &pavail[0], &pavail_ents);
 
@@ -1315,6 +1457,11 @@ void __init paging_init(void)
        for (i = 0; i < pavail_ents; i++)
                phys_base = min(phys_base, pavail[i].phys_addr);
 
+       pfn_base = phys_base >> PAGE_SHIFT;
+
+       kern_base = (prom_boot_mapping_phys_low >> 22UL) << 22UL;
+       kern_size = (unsigned long)&_end - (unsigned long)KERNBASE;
+
        set_bit(0, mmu_context_bmap);
 
        shift = kern_base + PAGE_OFFSET - ((unsigned long)KERNBASE);
@@ -1338,40 +1485,47 @@ void __init paging_init(void)
        pud_set(pud_offset(&swapper_pg_dir[0], 0),
                swapper_low_pmd_dir + (shift / sizeof(pgd_t)));
        
+       swapper_pgd_zero = pgd_val(swapper_pg_dir[0]);
+       
        inherit_prom_mappings();
        
-       /* Ok, we can use our TLB miss and window trap handlers safely.  */
-       setup_tba();
+       /* Ok, we can use our TLB miss and window trap handlers safely.
+        * We need to do a quick peek here to see if we are on StarFire
+        * or not, so setup_tba can setup the IRQ globals correctly (it
+        * needs to get the hard smp processor id correctly).
+        */
+       {
+               extern void setup_tba(int);
+               setup_tba(this_is_starfire);
+       }
 
-       __flush_tlb_all();
+       inherit_locked_prom_mappings(1);
 
-       if (tlb_type == hypervisor)
-               sun4v_ktsb_register();
+       __flush_tlb_all();
 
        /* Setup bootmem... */
        pages_avail = 0;
-       last_valid_pfn = end_pfn = bootmem_init(&pages_avail, phys_base);
-
-       max_mapnr = last_valid_pfn;
+       last_valid_pfn = end_pfn = bootmem_init(&pages_avail);
 
+#ifdef CONFIG_DEBUG_PAGEALLOC
        kernel_physical_mapping_init();
-
-       prom_build_devicetree();
+#endif
 
        {
                unsigned long zones_size[MAX_NR_ZONES];
                unsigned long zholes_size[MAX_NR_ZONES];
+               unsigned long npages;
                int znum;
 
                for (znum = 0; znum < MAX_NR_ZONES; znum++)
                        zones_size[znum] = zholes_size[znum] = 0;
 
-               zones_size[ZONE_DMA] = end_pfn;
-               zholes_size[ZONE_DMA] = end_pfn - pages_avail;
+               npages = end_pfn - pfn_base;
+               zones_size[ZONE_DMA] = npages;
+               zholes_size[ZONE_DMA] = npages - pages_avail;
 
                free_area_init_node(0, &contig_page_data, zones_size,
-                                   __pa(PAGE_OFFSET) >> PAGE_SHIFT,
-                                   zholes_size);
+                                   phys_base >> PAGE_SHIFT, zholes_size);
        }
 
        device_scan();
@@ -1395,7 +1549,7 @@ static void __init taint_real_pages(void)
                while (old_start < old_end) {
                        int n;
 
-                       for (n = 0; n < pavail_rescan_ents; n++) {
+                       for (n = 0; pavail_rescan_ents; n++) {
                                unsigned long new_start, new_end;
 
                                new_start = pavail_rescan[n].phys_addr;
@@ -1417,32 +1571,6 @@ static void __init taint_real_pages(void)
        }
 }
 
-int __init page_in_phys_avail(unsigned long paddr)
-{
-       int i;
-
-       paddr &= PAGE_MASK;
-
-       for (i = 0; i < pavail_rescan_ents; i++) {
-               unsigned long start, end;
-
-               start = pavail_rescan[i].phys_addr;
-               end = start + pavail_rescan[i].reg_size;
-
-               if (paddr >= start && paddr < end)
-                       return 1;
-       }
-       if (paddr >= kern_base && paddr < (kern_base + kern_size))
-               return 1;
-#ifdef CONFIG_BLK_DEV_INITRD
-       if (paddr >= __pa(initrd_start) &&
-           paddr < __pa(PAGE_ALIGN(initrd_end)))
-               return 1;
-#endif
-
-       return 0;
-}
-
 void __init mem_init(void)
 {
        unsigned long codepages, datapages, initpages;
@@ -1467,6 +1595,7 @@ void __init mem_init(void)
 
        taint_real_pages();
 
+       max_mapnr = last_valid_pfn - pfn_base;
        high_memory = __va(last_valid_pfn << PAGE_SHIFT);
 
 #ifdef CONFIG_DEBUG_BOOTMEM
@@ -1519,11 +1648,11 @@ void free_initmem(void)
                page = (addr +
                        ((unsigned long) __va(kern_base)) -
                        ((unsigned long) KERNBASE));
-               memset((void *)addr, POISON_FREE_INITMEM, PAGE_SIZE);
+               memset((void *)addr, 0xcc, PAGE_SIZE);
                p = virt_to_page(page);
 
                ClearPageReserved(p);
-               init_page_count(p);
+               set_page_count(p, 1);
                __free_page(p);
                num_physpages++;
                totalram_pages++;
@@ -1539,350 +1668,10 @@ void free_initrd_mem(unsigned long start, unsigned long end)
                struct page *p = virt_to_page(start);
 
                ClearPageReserved(p);
-               init_page_count(p);
+               set_page_count(p, 1);
                __free_page(p);
                num_physpages++;
                totalram_pages++;
        }
 }
 #endif
-
-#define _PAGE_CACHE_4U (_PAGE_CP_4U | _PAGE_CV_4U)
-#define _PAGE_CACHE_4V (_PAGE_CP_4V | _PAGE_CV_4V)
-#define __DIRTY_BITS_4U         (_PAGE_MODIFIED_4U | _PAGE_WRITE_4U | _PAGE_W_4U)
-#define __DIRTY_BITS_4V         (_PAGE_MODIFIED_4V | _PAGE_WRITE_4V | _PAGE_W_4V)
-#define __ACCESS_BITS_4U (_PAGE_ACCESSED_4U | _PAGE_READ_4U | _PAGE_R)
-#define __ACCESS_BITS_4V (_PAGE_ACCESSED_4V | _PAGE_READ_4V | _PAGE_R)
-
-pgprot_t PAGE_KERNEL __read_mostly;
-EXPORT_SYMBOL(PAGE_KERNEL);
-
-pgprot_t PAGE_KERNEL_LOCKED __read_mostly;
-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;
-EXPORT_SYMBOL(_PAGE_IE);
-
-unsigned long _PAGE_E __read_mostly;
-EXPORT_SYMBOL(_PAGE_E);
-
-unsigned long _PAGE_CACHE __read_mostly;
-EXPORT_SYMBOL(_PAGE_CACHE);
-
-static void prot_init_common(unsigned long page_none,
-                            unsigned long page_shared,
-                            unsigned long page_copy,
-                            unsigned long page_readonly,
-                            unsigned long page_exec_bit)
-{
-       PAGE_COPY = __pgprot(page_copy);
-       PAGE_SHARED = __pgprot(page_shared);
-
-       protection_map[0x0] = __pgprot(page_none);
-       protection_map[0x1] = __pgprot(page_readonly & ~page_exec_bit);
-       protection_map[0x2] = __pgprot(page_copy & ~page_exec_bit);
-       protection_map[0x3] = __pgprot(page_copy & ~page_exec_bit);
-       protection_map[0x4] = __pgprot(page_readonly);
-       protection_map[0x5] = __pgprot(page_readonly);
-       protection_map[0x6] = __pgprot(page_copy);
-       protection_map[0x7] = __pgprot(page_copy);
-       protection_map[0x8] = __pgprot(page_none);
-       protection_map[0x9] = __pgprot(page_readonly & ~page_exec_bit);
-       protection_map[0xa] = __pgprot(page_shared & ~page_exec_bit);
-       protection_map[0xb] = __pgprot(page_shared & ~page_exec_bit);
-       protection_map[0xc] = __pgprot(page_readonly);
-       protection_map[0xd] = __pgprot(page_readonly);
-       protection_map[0xe] = __pgprot(page_shared);
-       protection_map[0xf] = __pgprot(page_shared);
-}
-
-static void __init sun4u_pgprot_init(void)
-{
-       unsigned long page_none, page_shared, page_copy, page_readonly;
-       unsigned long page_exec_bit;
-
-       PAGE_KERNEL = __pgprot (_PAGE_PRESENT_4U | _PAGE_VALID |
-                               _PAGE_CACHE_4U | _PAGE_P_4U |
-                               __ACCESS_BITS_4U | __DIRTY_BITS_4U |
-                               _PAGE_EXEC_4U);
-       PAGE_KERNEL_LOCKED = __pgprot (_PAGE_PRESENT_4U | _PAGE_VALID |
-                                      _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;
-       _PAGE_CACHE = _PAGE_CACHE_4U;
-
-       pg_iobits = (_PAGE_VALID | _PAGE_PRESENT_4U | __DIRTY_BITS_4U |
-                    __ACCESS_BITS_4U | _PAGE_E_4U);
-
-       kern_linear_pte_xor[0] = (_PAGE_VALID | _PAGE_SZ4MB_4U) ^
-               0xfffff80000000000;
-       kern_linear_pte_xor[0] |= (_PAGE_CP_4U | _PAGE_CV_4U |
-                                  _PAGE_P_4U | _PAGE_W_4U);
-
-       /* XXX Should use 256MB on Panther. XXX */
-       kern_linear_pte_xor[1] = kern_linear_pte_xor[0];
-
-       _PAGE_SZBITS = _PAGE_SZBITS_4U;
-       _PAGE_ALL_SZ_BITS =  (_PAGE_SZ4MB_4U | _PAGE_SZ512K_4U |
-                             _PAGE_SZ64K_4U | _PAGE_SZ8K_4U |
-                             _PAGE_SZ32MB_4U | _PAGE_SZ256MB_4U);
-
-
-       page_none = _PAGE_PRESENT_4U | _PAGE_ACCESSED_4U | _PAGE_CACHE_4U;
-       page_shared = (_PAGE_VALID | _PAGE_PRESENT_4U | _PAGE_CACHE_4U |
-                      __ACCESS_BITS_4U | _PAGE_WRITE_4U | _PAGE_EXEC_4U);
-       page_copy   = (_PAGE_VALID | _PAGE_PRESENT_4U | _PAGE_CACHE_4U |
-                      __ACCESS_BITS_4U | _PAGE_EXEC_4U);
-       page_readonly   = (_PAGE_VALID | _PAGE_PRESENT_4U | _PAGE_CACHE_4U |
-                          __ACCESS_BITS_4U | _PAGE_EXEC_4U);
-
-       page_exec_bit = _PAGE_EXEC_4U;
-
-       prot_init_common(page_none, page_shared, page_copy, page_readonly,
-                        page_exec_bit);
-}
-
-static void __init sun4v_pgprot_init(void)
-{
-       unsigned long page_none, page_shared, page_copy, page_readonly;
-       unsigned long page_exec_bit;
-
-       PAGE_KERNEL = __pgprot (_PAGE_PRESENT_4V | _PAGE_VALID |
-                               _PAGE_CACHE_4V | _PAGE_P_4V |
-                               __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;
-       _PAGE_CACHE = _PAGE_CACHE_4V;
-
-       kern_linear_pte_xor[0] = (_PAGE_VALID | _PAGE_SZ4MB_4V) ^
-               0xfffff80000000000;
-       kern_linear_pte_xor[0] |= (_PAGE_CP_4V | _PAGE_CV_4V |
-                                  _PAGE_P_4V | _PAGE_W_4V);
-
-       kern_linear_pte_xor[1] = (_PAGE_VALID | _PAGE_SZ256MB_4V) ^
-               0xfffff80000000000;
-       kern_linear_pte_xor[1] |= (_PAGE_CP_4V | _PAGE_CV_4V |
-                                  _PAGE_P_4V | _PAGE_W_4V);
-
-       pg_iobits = (_PAGE_VALID | _PAGE_PRESENT_4V | __DIRTY_BITS_4V |
-                    __ACCESS_BITS_4V | _PAGE_E_4V);
-
-       _PAGE_SZBITS = _PAGE_SZBITS_4V;
-       _PAGE_ALL_SZ_BITS = (_PAGE_SZ16GB_4V | _PAGE_SZ2GB_4V |
-                            _PAGE_SZ256MB_4V | _PAGE_SZ32MB_4V |
-                            _PAGE_SZ4MB_4V | _PAGE_SZ512K_4V |
-                            _PAGE_SZ64K_4V | _PAGE_SZ8K_4V);
-
-       page_none = _PAGE_PRESENT_4V | _PAGE_ACCESSED_4V | _PAGE_CACHE_4V;
-       page_shared = (_PAGE_VALID | _PAGE_PRESENT_4V | _PAGE_CACHE_4V |
-                      __ACCESS_BITS_4V | _PAGE_WRITE_4V | _PAGE_EXEC_4V);
-       page_copy   = (_PAGE_VALID | _PAGE_PRESENT_4V | _PAGE_CACHE_4V |
-                      __ACCESS_BITS_4V | _PAGE_EXEC_4V);
-       page_readonly = (_PAGE_VALID | _PAGE_PRESENT_4V | _PAGE_CACHE_4V |
-                        __ACCESS_BITS_4V | _PAGE_EXEC_4V);
-
-       page_exec_bit = _PAGE_EXEC_4V;
-
-       prot_init_common(page_none, page_shared, page_copy, page_readonly,
-                        page_exec_bit);
-}
-
-unsigned long pte_sz_bits(unsigned long sz)
-{
-       if (tlb_type == hypervisor) {
-               switch (sz) {
-               case 8 * 1024:
-               default:
-                       return _PAGE_SZ8K_4V;
-               case 64 * 1024:
-                       return _PAGE_SZ64K_4V;
-               case 512 * 1024:
-                       return _PAGE_SZ512K_4V;
-               case 4 * 1024 * 1024:
-                       return _PAGE_SZ4MB_4V;
-               };
-       } else {
-               switch (sz) {
-               case 8 * 1024:
-               default:
-                       return _PAGE_SZ8K_4U;
-               case 64 * 1024:
-                       return _PAGE_SZ64K_4U;
-               case 512 * 1024:
-                       return _PAGE_SZ512K_4U;
-               case 4 * 1024 * 1024:
-                       return _PAGE_SZ4MB_4U;
-               };
-       }
-}
-
-pte_t mk_pte_io(unsigned long page, pgprot_t prot, int space, unsigned long page_size)
-{
-       pte_t pte;
-
-       pte_val(pte)  = page | pgprot_val(pgprot_noncached(prot));
-       pte_val(pte) |= (((unsigned long)space) << 32);
-       pte_val(pte) |= pte_sz_bits(page_size);
-
-       return pte;
-}
-
-static unsigned long kern_large_tte(unsigned long paddr)
-{
-       unsigned long val;
-
-       val = (_PAGE_VALID | _PAGE_SZ4MB_4U |
-              _PAGE_CP_4U | _PAGE_CV_4U | _PAGE_P_4U |
-              _PAGE_EXEC_4U | _PAGE_L_4U | _PAGE_W_4U);
-       if (tlb_type == hypervisor)
-               val = (_PAGE_VALID | _PAGE_SZ4MB_4V |
-                      _PAGE_CP_4V | _PAGE_CV_4V | _PAGE_P_4V |
-                      _PAGE_EXEC_4V | _PAGE_W_4V);
-
-       return val | paddr;
-}
-
-/*
- * Translate PROM's mapping we capture at boot time into physical address.
- * The second parameter is only set from prom_callback() invocations.
- */
-unsigned long prom_virt_to_phys(unsigned long promva, int *error)
-{
-       unsigned long mask;
-       int i;
-
-       mask = _PAGE_PADDR_4U;
-       if (tlb_type == hypervisor)
-               mask = _PAGE_PADDR_4V;
-
-       for (i = 0; i < prom_trans_ents; i++) {
-               struct linux_prom_translation *p = &prom_trans[i];
-
-               if (promva >= p->virt &&
-                   promva < (p->virt + p->size)) {
-                       unsigned long base = p->data & mask;
-
-                       if (error)
-                               *error = 0;
-                       return base + (promva & (8192 - 1));
-               }
-       }
-       if (error)
-               *error = 1;
-       return 0UL;
-}
-
-/* XXX We should kill off this ugly thing at so me point. XXX */
-unsigned long sun4u_get_pte(unsigned long addr)
-{
-       pgd_t *pgdp;
-       pud_t *pudp;
-       pmd_t *pmdp;
-       pte_t *ptep;
-       unsigned long mask = _PAGE_PADDR_4U;
-
-       if (tlb_type == hypervisor)
-               mask = _PAGE_PADDR_4V;
-
-       if (addr >= PAGE_OFFSET)
-               return addr & mask;
-
-       if ((addr >= LOW_OBP_ADDRESS) && (addr < HI_OBP_ADDRESS))
-               return prom_virt_to_phys(addr, NULL);
-
-       pgdp = pgd_offset_k(addr);
-       pudp = pud_offset(pgdp, addr);
-       pmdp = pmd_offset(pudp, addr);
-       ptep = pte_offset_kernel(pmdp, addr);
-
-       return pte_val(*ptep) & mask;
-}
-
-/* If not locked, zap it. */
-void __flush_tlb_all(void)
-{
-       unsigned long pstate;
-       int i;
-
-       __asm__ __volatile__("flushw\n\t"
-                            "rdpr      %%pstate, %0\n\t"
-                            "wrpr      %0, %1, %%pstate"
-                            : "=r" (pstate)
-                            : "i" (PSTATE_IE));
-       if (tlb_type == spitfire) {
-               for (i = 0; i < 64; i++) {
-                       /* Spitfire Errata #32 workaround */
-                       /* NOTE: Always runs on spitfire, so no
-                        *       cheetah+ page size encodings.
-                        */
-                       __asm__ __volatile__("stxa      %0, [%1] %2\n\t"
-                                            "flush     %%g6"
-                                            : /* No outputs */
-                                            : "r" (0),
-                                            "r" (PRIMARY_CONTEXT), "i" (ASI_DMMU));
-
-                       if (!(spitfire_get_dtlb_data(i) & _PAGE_L_4U)) {
-                               __asm__ __volatile__("stxa %%g0, [%0] %1\n\t"
-                                                    "membar #Sync"
-                                                    : /* no outputs */
-                                                    : "r" (TLB_TAG_ACCESS), "i" (ASI_DMMU));
-                               spitfire_put_dtlb_data(i, 0x0UL);
-                       }
-
-                       /* Spitfire Errata #32 workaround */
-                       /* NOTE: Always runs on spitfire, so no
-                        *       cheetah+ page size encodings.
-                        */
-                       __asm__ __volatile__("stxa      %0, [%1] %2\n\t"
-                                            "flush     %%g6"
-                                            : /* No outputs */
-                                            : "r" (0),
-                                            "r" (PRIMARY_CONTEXT), "i" (ASI_DMMU));
-
-                       if (!(spitfire_get_itlb_data(i) & _PAGE_L_4U)) {
-                               __asm__ __volatile__("stxa %%g0, [%0] %1\n\t"
-                                                    "membar #Sync"
-                                                    : /* no outputs */
-                                                    : "r" (TLB_TAG_ACCESS), "i" (ASI_IMMU));
-                               spitfire_put_itlb_data(i, 0x0UL);
-                       }
-               }
-       } else if (tlb_type == cheetah || tlb_type == cheetah_plus) {
-               cheetah_flush_dtlb_all();
-               cheetah_flush_itlb_all();
-       }
-       __asm__ __volatile__("wrpr      %0, 0, %%pstate"
-                            : : "r" (pstate));
-}
-
-#ifdef CONFIG_MEMORY_HOTPLUG
-
-void online_page(struct page *page)
-{
-       ClearPageReserved(page);
-       init_page_count(page);
-       __free_page(page);
-       totalram_pages++;
-       num_physpages++;
-}
-
-int remove_memory(u64 start, u64 size)
-{
-       return -EINVAL;
-}
-
-#endif /* CONFIG_MEMORY_HOTPLUG */