[SPARC64]: Register per-cpu fault status area with sun4v hypervisor.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c
index aba0f886b05b85d304e5735bcbc7149c179b042b..223cc6bd369a31840bd8adb6b5c35d18e6a37bd5 100644 (file)
--- a/arch/sparc64/kernel/smp.c
+++ b/arch/sparc64/kernel/smp.c
@@ -122,6 +122,9 @@ void __init smp_callin(void)
 
        __local_per_cpu_offset = __per_cpu_offset(cpuid);
 
+       if (tlb_type == hypervisor)
+               sun4v_register_fault_status();
+
        __flush_tlb_all();
 
        smp_setup_percpu_timer();

diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c
index e9aac424877f7d4f1fec3fed525639c632ebe40f..4c95cf34075b7544b7d6755f0b7e8410e30e13a9 100644 (file)
--- a/arch/sparc64/mm/init.c
+++ b/arch/sparc64/mm/init.c
@@ -40,6 +40,7 @@
 #include <asm/spitfire.h>
 #include <asm/sections.h>
 #include <asm/tsb.h>
+#include <asm/hypervisor.h>
 
 extern void device_scan(void);
 
@@ -1083,6 +1084,24 @@ static void __init tsb_phys_patch(void)
        }
 }
 
+/* Register this cpu's fault status area with the hypervisor.  */
+void __cpuinit sun4v_register_fault_status(void)
+{
+       register unsigned long arg0 asm("%o0");
+       register unsigned long arg1 asm("%o1");
+       int cpu = hard_smp_processor_id();
+       struct trap_per_cpu *tb = &trap_block[cpu];
+       unsigned long pa;
+
+       pa = kern_base + ((unsigned long) tb - KERNBASE);
+       arg0 = HV_FAST_MMU_FAULT_AREA_CONF;
+       arg1 = pa;
+       __asm__ __volatile__("ta        %4"
+                            : "=&r" (arg0), "=&r" (arg1)
+                            : "0" (arg0), "1" (arg1),
+                              "i" (HV_FAST_TRAP));
+}
+
 /* paging_init() sets up the page tables */
 
 extern void cheetah_ecache_flush_init(void);
@@ -1096,12 +1115,17 @@ void __init paging_init(void)
        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;
+
        if (tlb_type == cheetah_plus ||
            tlb_type == hypervisor)
                tsb_phys_patch();
 
-       if (tlb_type == hypervisor)
+       if (tlb_type == hypervisor) {
                sun4v_patch_tlb_handlers();
+               sun4v_register_fault_status();
+       }
 
        /* Find available physical memory... */
        read_obp_memory("available", &pavail[0], &pavail_ents);
@@ -1112,9 +1136,6 @@ void __init paging_init(void)
 
        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);

diff --git a/include/asm-sparc64/pgtable.h b/include/asm-sparc64/pgtable.h
index 2b2ecd6104d2f676aa808188fc406c16302c7fcc..c42c06a37d1862877e5f61ff9a6aea43d44f5c52 100644 (file)
--- a/include/asm-sparc64/pgtable.h
+++ b/include/asm-sparc64/pgtable.h
@@ -437,6 +437,7 @@ extern unsigned long get_fb_unmapped_area(struct file *filp, unsigned long,
 #define HAVE_ARCH_FB_UNMAPPED_AREA
 
 extern void pgtable_cache_init(void);
+extern void sun4v_register_fault_status(void);
 
 #endif /* !(__ASSEMBLY__) */