From: Paolo Bonzini <pbonzini@redhat.com>
Date: Mon, 11 Nov 2013 11:05:20 +0000 (+0100)
Subject: Merge tag 'kvm-arm64/for-3.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.13-rc1~80^2~1
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=ede582224231e64e41af0f89117a302580a2da2e;p=linux-block.git

Merge tag 'kvm-arm64/for-3.13-1' of git://git./linux/kernel/git/maz/arm-platforms into kvm-next

A handful of fixes for KVM/arm64:

- A couple a basic fixes for running BE guests on a LE host
- A performance improvement for overcommitted VMs (same as the equivalent
  patch for ARM)

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Conflicts:
	arch/arm/include/asm/kvm_emulate.h
	arch/arm64/include/asm/kvm_emulate.h
---

ede582224231e64e41af0f89117a302580a2da2e
diff --cc arch/arm/include/asm/kvm_emulate.h
index 708e4d8a647f,e844b335e33a..0fa90c962ac8
--- a/arch/arm/include/asm/kvm_emulate.h
+++ b/arch/arm/include/asm/kvm_emulate.h
@@@ -157,9 -157,50 +157,55 @@@ static inline u32 kvm_vcpu_hvc_get_imm(
  	return kvm_vcpu_get_hsr(vcpu) & HSR_HVC_IMM_MASK;
  }
  
 +static inline unsigned long kvm_vcpu_get_mpidr(struct kvm_vcpu *vcpu)
 +{
 +	return vcpu->arch.cp15[c0_MPIDR];
 +}
 +
+ static inline void kvm_vcpu_set_be(struct kvm_vcpu *vcpu)
+ {
+ 	*vcpu_cpsr(vcpu) |= PSR_E_BIT;
+ }
+ 
+ static inline bool kvm_vcpu_is_be(struct kvm_vcpu *vcpu)
+ {
+ 	return !!(*vcpu_cpsr(vcpu) & PSR_E_BIT);
+ }
+ 
+ static inline unsigned long vcpu_data_guest_to_host(struct kvm_vcpu *vcpu,
+ 						    unsigned long data,
+ 						    unsigned int len)
+ {
+ 	if (kvm_vcpu_is_be(vcpu)) {
+ 		switch (len) {
+ 		case 1:
+ 			return data & 0xff;
+ 		case 2:
+ 			return be16_to_cpu(data & 0xffff);
+ 		default:
+ 			return be32_to_cpu(data);
+ 		}
+ 	}
+ 
+ 	return data;		/* Leave LE untouched */
+ }
+ 
+ static inline unsigned long vcpu_data_host_to_guest(struct kvm_vcpu *vcpu,
+ 						    unsigned long data,
+ 						    unsigned int len)
+ {
+ 	if (kvm_vcpu_is_be(vcpu)) {
+ 		switch (len) {
+ 		case 1:
+ 			return data & 0xff;
+ 		case 2:
+ 			return cpu_to_be16(data & 0xffff);
+ 		default:
+ 			return cpu_to_be32(data);
+ 		}
+ 	}
+ 
+ 	return data;		/* Leave LE untouched */
+ }
+ 
  #endif /* __ARM_KVM_EMULATE_H__ */
diff --cc arch/arm64/include/asm/kvm_emulate.h
index 6df93cdc652b,db805092698c..dd8ecfc3f995
--- a/arch/arm64/include/asm/kvm_emulate.h
+++ b/arch/arm64/include/asm/kvm_emulate.h
@@@ -177,9 -177,60 +177,65 @@@ static inline u8 kvm_vcpu_trap_get_faul
  	return kvm_vcpu_get_hsr(vcpu) & ESR_EL2_FSC_TYPE;
  }
  
 +static inline unsigned long kvm_vcpu_get_mpidr(struct kvm_vcpu *vcpu)
 +{
 +	return vcpu_sys_reg(vcpu, MPIDR_EL1);
 +}
 +
+ static inline void kvm_vcpu_set_be(struct kvm_vcpu *vcpu)
+ {
+ 	if (vcpu_mode_is_32bit(vcpu))
+ 		*vcpu_cpsr(vcpu) |= COMPAT_PSR_E_BIT;
+ 	else
+ 		vcpu_sys_reg(vcpu, SCTLR_EL1) |= (1 << 25);
+ }
+ 
+ static inline bool kvm_vcpu_is_be(struct kvm_vcpu *vcpu)
+ {
+ 	if (vcpu_mode_is_32bit(vcpu))
+ 		return !!(*vcpu_cpsr(vcpu) & COMPAT_PSR_E_BIT);
+ 
+ 	return !!(vcpu_sys_reg(vcpu, SCTLR_EL1) & (1 << 25));
+ }
+ 
+ static inline unsigned long vcpu_data_guest_to_host(struct kvm_vcpu *vcpu,
+ 						    unsigned long data,
+ 						    unsigned int len)
+ {
+ 	if (kvm_vcpu_is_be(vcpu)) {
+ 		switch (len) {
+ 		case 1:
+ 			return data & 0xff;
+ 		case 2:
+ 			return be16_to_cpu(data & 0xffff);
+ 		case 4:
+ 			return be32_to_cpu(data & 0xffffffff);
+ 		default:
+ 			return be64_to_cpu(data);
+ 		}
+ 	}
+ 
+ 	return data;		/* Leave LE untouched */
+ }
+ 
+ static inline unsigned long vcpu_data_host_to_guest(struct kvm_vcpu *vcpu,
+ 						    unsigned long data,
+ 						    unsigned int len)
+ {
+ 	if (kvm_vcpu_is_be(vcpu)) {
+ 		switch (len) {
+ 		case 1:
+ 			return data & 0xff;
+ 		case 2:
+ 			return cpu_to_be16(data & 0xffff);
+ 		case 4:
+ 			return cpu_to_be32(data & 0xffffffff);
+ 		default:
+ 			return cpu_to_be64(data);
+ 		}
+ 	}
+ 
+ 	return data;		/* Leave LE untouched */
+ }
+ 
  #endif /* __ARM64_KVM_EMULATE_H__ */