Merge branch 'next/kvm' into mips-for-linux-next

5 files changed, 81 insertions, 1 deletions

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 07b847d77f5d..fd75d7144524 100644
--- a/arch/mips/kernel/cevt-r4k.c
+++ b/arch/mips/kernel/cevt-r4k.c
@@ -118,6 +118,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/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 3b98b7b8487f..7a99e60dadbd 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -1712,7 +1712,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);
         }