|
@@ -751,9 +751,16 @@ int kvm_arch_vcpu_fault(struct kvm_vcpu *vcpu, struct vm_fault *vmf)
|
|
|
|
|
|
static int kvm_vm_ioctl_get_pvinfo(struct kvm_ppc_pvinfo *pvinfo)
|
|
|
{
|
|
|
+ u32 inst_nop = 0x60000000;
|
|
|
+#ifdef CONFIG_KVM_BOOKE_HV
|
|
|
+ u32 inst_sc1 = 0x44000022;
|
|
|
+ pvinfo->hcall[0] = inst_sc1;
|
|
|
+ pvinfo->hcall[1] = inst_nop;
|
|
|
+ pvinfo->hcall[2] = inst_nop;
|
|
|
+ pvinfo->hcall[3] = inst_nop;
|
|
|
+#else
|
|
|
u32 inst_lis = 0x3c000000;
|
|
|
u32 inst_ori = 0x60000000;
|
|
|
- u32 inst_nop = 0x60000000;
|
|
|
u32 inst_sc = 0x44000002;
|
|
|
u32 inst_imm_mask = 0xffff;
|
|
|
|
|
@@ -770,6 +777,7 @@ static int kvm_vm_ioctl_get_pvinfo(struct kvm_ppc_pvinfo *pvinfo)
|
|
|
pvinfo->hcall[1] = inst_ori | (KVM_SC_MAGIC_R0 & inst_imm_mask);
|
|
|
pvinfo->hcall[2] = inst_sc;
|
|
|
pvinfo->hcall[3] = inst_nop;
|
|
|
+#endif
|
|
|
|
|
|
return 0;
|
|
|
}
|