10 files changed, 146 insertions, 32 deletions

diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile
index 3d95062173c7..cb96ace5c8c5 100644
--- a/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
@@ -5,7 +5,7 @@
 extra-y         := head.o vmlinux.lds
 
 obj-y           += cpu-probe.o branch.o entry.o genex.o irq.o process.o \
-                   ptrace.o reset.o setup.o signal.o syscall.o \
+                   prom.o ptrace.o reset.o setup.o signal.o syscall.o \
                    time.o topology.o traps.o unaligned.o watch.o vdso.o
 
 ifdef CONFIG_FUNCTION_TRACER
@@ -87,8 +87,6 @@ obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
 obj-$(CONFIG_SPINLOCK_TEST)     += spinlock_test.o
 obj-$(CONFIG_MIPS_MACHINE)      += mips_machine.o
 
-obj-$(CONFIG_OF)                += prom.o
-
 CFLAGS_cpu-bugs64.o     = $(shell if $(CC) $(KBUILD_CFLAGS) -Wa,-mdaddi -c -o /dev/null -x c /dev/null >/dev/null 2>&1; then echo "-DHAVE_AS_SET_DADDI"; fi)
 
 obj-$(CONFIG_HAVE_STD_PC_SERIAL_PORT)   += 8250-platform.o
diff --git a/arch/mips/kernel/asm-offsets.c b/arch/mips/kernel/asm-offsets.c
index 50285b2c7ffe..0845091ba480 100644
--- a/arch/mips/kernel/asm-offsets.c
+++ b/arch/mips/kernel/asm-offsets.c
@@ -17,6 +17,8 @@
 #include <asm/ptrace.h>
 #include <asm/processor.h>
 
+#include <linux/kvm_host.h>
+
 void output_ptreg_defines(void)
 {
         COMMENT("MIPS pt_regs offsets.");
@@ -328,3 +330,67 @@ void output_pbe_defines(void)
         BLANK();
 }
 #endif
+
+void output_kvm_defines(void)
+{
+        COMMENT(" KVM/MIPS Specfic offsets. ");
+        DEFINE(VCPU_ARCH_SIZE, sizeof(struct kvm_vcpu_arch));
+        OFFSET(VCPU_RUN, kvm_vcpu, run);
+        OFFSET(VCPU_HOST_ARCH, kvm_vcpu, arch);
+
+        OFFSET(VCPU_HOST_EBASE, kvm_vcpu_arch, host_ebase);
+        OFFSET(VCPU_GUEST_EBASE, kvm_vcpu_arch, guest_ebase);
+
+        OFFSET(VCPU_HOST_STACK, kvm_vcpu_arch, host_stack);
+        OFFSET(VCPU_HOST_GP, kvm_vcpu_arch, host_gp);
+
+        OFFSET(VCPU_HOST_CP0_BADVADDR, kvm_vcpu_arch, host_cp0_badvaddr);
+        OFFSET(VCPU_HOST_CP0_CAUSE, kvm_vcpu_arch, host_cp0_cause);
+        OFFSET(VCPU_HOST_EPC, kvm_vcpu_arch, host_cp0_epc);
+        OFFSET(VCPU_HOST_ENTRYHI, kvm_vcpu_arch, host_cp0_entryhi);
+
+        OFFSET(VCPU_GUEST_INST, kvm_vcpu_arch, guest_inst);
+
+        OFFSET(VCPU_R0, kvm_vcpu_arch, gprs[0]);
+        OFFSET(VCPU_R1, kvm_vcpu_arch, gprs[1]);
+        OFFSET(VCPU_R2, kvm_vcpu_arch, gprs[2]);
+        OFFSET(VCPU_R3, kvm_vcpu_arch, gprs[3]);
+        OFFSET(VCPU_R4, kvm_vcpu_arch, gprs[4]);
+        OFFSET(VCPU_R5, kvm_vcpu_arch, gprs[5]);
+        OFFSET(VCPU_R6, kvm_vcpu_arch, gprs[6]);
+        OFFSET(VCPU_R7, kvm_vcpu_arch, gprs[7]);
+        OFFSET(VCPU_R8, kvm_vcpu_arch, gprs[8]);
+        OFFSET(VCPU_R9, kvm_vcpu_arch, gprs[9]);
+        OFFSET(VCPU_R10, kvm_vcpu_arch, gprs[10]);
+        OFFSET(VCPU_R11, kvm_vcpu_arch, gprs[11]);
+        OFFSET(VCPU_R12, kvm_vcpu_arch, gprs[12]);
+        OFFSET(VCPU_R13, kvm_vcpu_arch, gprs[13]);
+        OFFSET(VCPU_R14, kvm_vcpu_arch, gprs[14]);
+        OFFSET(VCPU_R15, kvm_vcpu_arch, gprs[15]);
+        OFFSET(VCPU_R16, kvm_vcpu_arch, gprs[16]);
+        OFFSET(VCPU_R17, kvm_vcpu_arch, gprs[17]);
+        OFFSET(VCPU_R18, kvm_vcpu_arch, gprs[18]);
+        OFFSET(VCPU_R19, kvm_vcpu_arch, gprs[19]);
+        OFFSET(VCPU_R20, kvm_vcpu_arch, gprs[20]);
+        OFFSET(VCPU_R21, kvm_vcpu_arch, gprs[21]);
+        OFFSET(VCPU_R22, kvm_vcpu_arch, gprs[22]);
+        OFFSET(VCPU_R23, kvm_vcpu_arch, gprs[23]);
+        OFFSET(VCPU_R24, kvm_vcpu_arch, gprs[24]);
+        OFFSET(VCPU_R25, kvm_vcpu_arch, gprs[25]);
+        OFFSET(VCPU_R26, kvm_vcpu_arch, gprs[26]);
+        OFFSET(VCPU_R27, kvm_vcpu_arch, gprs[27]);
+        OFFSET(VCPU_R28, kvm_vcpu_arch, gprs[28]);
+        OFFSET(VCPU_R29, kvm_vcpu_arch, gprs[29]);
+        OFFSET(VCPU_R30, kvm_vcpu_arch, gprs[30]);
+        OFFSET(VCPU_R31, kvm_vcpu_arch, gprs[31]);
+        OFFSET(VCPU_LO, kvm_vcpu_arch, lo);
+        OFFSET(VCPU_HI, kvm_vcpu_arch, hi);
+        OFFSET(VCPU_PC, kvm_vcpu_arch, pc);
+        OFFSET(VCPU_COP0, kvm_vcpu_arch, cop0);
+        OFFSET(VCPU_GUEST_KERNEL_ASID, kvm_vcpu_arch, guest_kernel_asid);
+        OFFSET(VCPU_GUEST_USER_ASID, kvm_vcpu_arch, guest_user_asid);
+
+        OFFSET(COP0_TLB_HI, mips_coproc, reg[MIPS_CP0_TLB_HI][0]);
+        OFFSET(COP0_STATUS, mips_coproc, reg[MIPS_CP0_STATUS][0]);
+        BLANK();
+}
diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c
index 556a4357d7fc..97c5a1668e53 100644
--- a/arch/mips/kernel/binfmt_elfo32.c
+++ b/arch/mips/kernel/binfmt_elfo32.c
@@ -48,7 +48,11 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
         __res;                                                          \
 })
 
+#ifdef CONFIG_KVM_GUEST
+#define TASK32_SIZE             0x3fff8000UL
+#else
 #define TASK32_SIZE             0x7fff8000UL
+#endif
 #undef ELF_ET_DYN_BASE
 #define ELF_ET_DYN_BASE         (TASK32_SIZE / 3 * 2)
 
diff --git a/arch/mips/kernel/cevt-r4k.c b/arch/mips/kernel/cevt-r4k.c
index 0613f468f1ad..02033eaf8825 100644
--- a/arch/mips/kernel/cevt-r4k.c
+++ b/arch/mips/kernel/cevt-r4k.c
@@ -119,6 +119,10 @@ int c0_compare_int_usable(void)
         unsigned int delta;
         unsigned int cnt;
 
+#ifdef CONFIG_KVM_GUEST
+    return 1;
+#endif
+
         /*
          * IP7 already pending?  Try to clear it by acking the timer.
          */
diff --git a/arch/mips/kernel/mips_machine.c b/arch/mips/kernel/mips_machine.c
index 411a058d2c53..876097529697 100644
--- a/arch/mips/kernel/mips_machine.c
+++ b/arch/mips/kernel/mips_machine.c
@@ -11,9 +11,9 @@
 #include <linux/slab.h>
 
 #include <asm/mips_machine.h>
+#include <asm/prom.h>
 
 static struct mips_machine *mips_machine __initdata;
-static char *mips_machine_name = "Unknown";
 
 #define for_each_machine(mach) \
         for ((mach) = (struct mips_machine *)&__mips_machines_start; \
@@ -21,25 +21,6 @@ static char *mips_machine_name = "Unknown";
              (unsigned long)(mach) < (unsigned long)&__mips_machines_end; \
              (mach)++)
 
-__init void mips_set_machine_name(const char *name)
-{
-        char *p;
-
-        if (name == NULL)
-                return;
-
-        p = kstrdup(name, GFP_KERNEL);
-        if (!p)
-                pr_err("MIPS: no memory for machine_name\n");
-
-        mips_machine_name = p;
-}
-
-char *mips_get_machine_name(void)
-{
-        return mips_machine_name;
-}
-
 __init int mips_machtype_setup(char *id)
 {
         struct mips_machine *mach;
@@ -79,7 +60,6 @@ __init void mips_machine_setup(void)
                 return;
 
         mips_set_machine_name(mips_machine->mach_name);
-        pr_info("MIPS: machine is %s\n", mips_machine_name);
 
         if (mips_machine->mach_setup)
                 mips_machine->mach_setup();
diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c
index 26b19daa1792..a3e461408b7e 100644
--- a/arch/mips/kernel/proc.c
+++ b/arch/mips/kernel/proc.c
@@ -12,7 +12,7 @@
 #include <asm/cpu-features.h>
 #include <asm/mipsregs.h>
 #include <asm/processor.h>
-#include <asm/mips_machine.h>
+#include <asm/prom.h>
 
 unsigned int vced_count, vcei_count;
 
diff --git a/arch/mips/kernel/prom.c b/arch/mips/kernel/prom.c
index 028f6f837ef9..5712bb532245 100644
--- a/arch/mips/kernel/prom.c
+++ b/arch/mips/kernel/prom.c
@@ -23,6 +23,23 @@
 #include <asm/page.h>
 #include <asm/prom.h>
 
+static char mips_machine_name[64] = "Unknown";
+
+__init void mips_set_machine_name(const char *name)
+{
+        if (name == NULL)
+                return;
+
+        strncpy(mips_machine_name, name, sizeof(mips_machine_name));
+        pr_info("MIPS: machine is %s\n", mips_get_machine_name());
+}
+
+char *mips_get_machine_name(void)
+{
+        return mips_machine_name;
+}
+
+#ifdef CONFIG_OF
 int __init early_init_dt_scan_memory_arch(unsigned long node,
                                           const char *uname, int depth,
                                           void *data)
@@ -50,6 +67,18 @@ void __init early_init_dt_setup_initrd_arch(unsigned long start,
 }
 #endif
 
+int __init early_init_dt_scan_model(unsigned long node, const char *uname,
+                                    int depth, void *data)
+{
+        if (!depth) {
+                char *model = of_get_flat_dt_prop(node, "model", NULL);
+
+                if (model)
+                        mips_set_machine_name(model);
+        }
+        return 0;
+}
+
 void __init early_init_devtree(void *params)
 {
         /* Setup flat device-tree pointer */
@@ -65,6 +94,9 @@ void __init early_init_devtree(void *params)
         /* Scan memory nodes */
         of_scan_flat_dt(early_init_dt_scan_root, NULL);
         of_scan_flat_dt(early_init_dt_scan_memory_arch, NULL);
+
+        /* try to load the mips machine name */
+        of_scan_flat_dt(early_init_dt_scan_model, NULL);
 }
 
 void __init __dt_setup_arch(struct boot_param_header *bph)
@@ -79,3 +111,4 @@ void __init __dt_setup_arch(struct boot_param_header *bph)
 
         early_init_devtree(initial_boot_params);
 }
+#endif
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index 4c774d5d5087..c7f90519e58c 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -23,6 +23,7 @@
 #include <linux/pfn.h>
 #include <linux/debugfs.h>
 #include <linux/kexec.h>
+#include <linux/sizes.h>
 
 #include <asm/addrspace.h>
 #include <asm/bootinfo.h>
@@ -77,6 +78,8 @@ EXPORT_SYMBOL(mips_io_port_base);
 static struct resource code_resource = { .name = "Kernel code", };
 static struct resource data_resource = { .name = "Kernel data", };
 
+static void *detect_magic __initdata = detect_memory_region;
+
 void __init add_memory_region(phys_t start, phys_t size, long type)
 {
         int x = boot_mem_map.nr_map;
@@ -122,6 +125,25 @@ void __init add_memory_region(phys_t start, phys_t size, long type)
         boot_mem_map.nr_map++;
 }
 
+void __init detect_memory_region(phys_t start, phys_t sz_min, phys_t sz_max)
+{
+        void *dm = &detect_magic;
+        phys_t size;
+
+        for (size = sz_min; size < sz_max; size <<= 1) {
+                if (!memcmp(dm, dm + size, sizeof(detect_magic)))
+                        break;
+        }
+
+        pr_debug("Memory: %lluMB of RAM detected at 0x%llx (min: %lluMB, max: %lluMB)\n",
+                ((unsigned long long) size) / SZ_1M,
+                (unsigned long long) start,
+                ((unsigned long long) sz_min) / SZ_1M,
+                ((unsigned long long) sz_max) / SZ_1M);
+
+        add_memory_region(start, size, BOOT_MEM_RAM);
+}
+
 static void __init print_memory_map(void)
 {
         int i;
diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c
index 66bf4e22d9b9..596620dd7ee2 100644
--- a/arch/mips/kernel/smp.c
+++ b/arch/mips/kernel/smp.c
@@ -83,6 +83,7 @@ static inline void set_cpu_sibling_map(int cpu)
 }
 
 struct plat_smp_ops *mp_ops;
+EXPORT_SYMBOL(mp_ops);
 
 __cpuinit void register_smp_ops(struct plat_smp_ops *ops)
 {
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index 571a69c57d82..3c906e723fd4 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -60,9 +60,9 @@ extern void check_wait(void);
 extern asmlinkage void r4k_wait(void);
 extern asmlinkage void rollback_handle_int(void);
 extern asmlinkage void handle_int(void);
-extern asmlinkage void handle_tlbm(void);
-extern asmlinkage void handle_tlbl(void);
-extern asmlinkage void handle_tlbs(void);
+extern u32 handle_tlbl[];
+extern u32 handle_tlbs[];
+extern u32 handle_tlbm[];
 extern asmlinkage void handle_adel(void);
 extern asmlinkage void handle_ades(void);
 extern asmlinkage void handle_ibe(void);
@@ -1473,7 +1473,7 @@ unsigned long vi_handlers[64];
 void __init *set_except_vector(int n, void *addr)
 {
         unsigned long handler = (unsigned long) addr;
-        unsigned long old_handler = exception_handlers[n];
+        unsigned long old_handler;
 
 #ifdef CONFIG_CPU_MICROMIPS
         /*
@@ -1486,7 +1486,8 @@ void __init *set_except_vector(int n, void *addr)
         if (!(handler & 0x1))
                 handler |= 1;
 #endif
-        exception_handlers[n] = handler;
+        old_handler = xchg(&exception_handlers[n], handler);
+
         if (n == 0 && cpu_has_divec) {
 #ifdef CONFIG_CPU_MICROMIPS
                 unsigned long jump_mask = ~((1 << 27) - 1);
@@ -1508,7 +1509,7 @@ void __init *set_except_vector(int n, void *addr)
         return (void *)old_handler;
 }
 
-static asmlinkage void do_default_vi(void)
+static void do_default_vi(void)
 {
         show_regs(get_irq_regs());
         panic("Caught unexpected vectored interrupt.");
@@ -1841,7 +1842,12 @@ void __init trap_init(void)
                 ebase = (unsigned long)
                         __alloc_bootmem(size, 1 << fls(size), 0);
         } else {
-                ebase = CKSEG0;
+#ifdef CONFIG_KVM_GUEST
+#define KVM_GUEST_KSEG0     0x40000000
+        ebase = KVM_GUEST_KSEG0;
+#else
+        ebase = CKSEG0;
+#endif
                 if (cpu_has_mips_r2)
                         ebase += (read_c0_ebase() & 0x3ffff000);
         }