diff options
author | Victor Kamensky <victor.kamensky@linaro.org> | 2014-06-12 12:30:08 -0400 |
---|---|---|
committer | Christoffer Dall <christoffer.dall@linaro.org> | 2014-07-11 07:57:41 -0400 |
commit | b30070862edbdb252f9d0d3a1e61b8dc4c68e3d2 (patch) | |
tree | e6ee1ef3449c95983ef8753d65f4e455f0140a55 /arch/arm64 | |
parent | f5aa462147a209dab40b02f0f70234784b913bf9 (diff) |
ARM64: KVM: MMIO support BE host running LE code
In case of guest CPU running in LE mode and host runs in
BE mode we need byteswap data, so read/write is emulated correctly.
Signed-off-by: Victor Kamensky <victor.kamensky@linaro.org>
Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
Reviewed-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'arch/arm64')
-rw-r--r-- | arch/arm64/include/asm/kvm_emulate.h | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/kvm_emulate.h b/arch/arm64/include/asm/kvm_emulate.h index dd8ecfc3f995..fdc3e21abd8d 100644 --- a/arch/arm64/include/asm/kvm_emulate.h +++ b/arch/arm64/include/asm/kvm_emulate.h | |||
@@ -213,6 +213,17 @@ static inline unsigned long vcpu_data_guest_to_host(struct kvm_vcpu *vcpu, | |||
213 | default: | 213 | default: |
214 | return be64_to_cpu(data); | 214 | return be64_to_cpu(data); |
215 | } | 215 | } |
216 | } else { | ||
217 | switch (len) { | ||
218 | case 1: | ||
219 | return data & 0xff; | ||
220 | case 2: | ||
221 | return le16_to_cpu(data & 0xffff); | ||
222 | case 4: | ||
223 | return le32_to_cpu(data & 0xffffffff); | ||
224 | default: | ||
225 | return le64_to_cpu(data); | ||
226 | } | ||
216 | } | 227 | } |
217 | 228 | ||
218 | return data; /* Leave LE untouched */ | 229 | return data; /* Leave LE untouched */ |
@@ -233,6 +244,17 @@ static inline unsigned long vcpu_data_host_to_guest(struct kvm_vcpu *vcpu, | |||
233 | default: | 244 | default: |
234 | return cpu_to_be64(data); | 245 | return cpu_to_be64(data); |
235 | } | 246 | } |
247 | } else { | ||
248 | switch (len) { | ||
249 | case 1: | ||
250 | return data & 0xff; | ||
251 | case 2: | ||
252 | return cpu_to_le16(data & 0xffff); | ||
253 | case 4: | ||
254 | return cpu_to_le32(data & 0xffffffff); | ||
255 | default: | ||
256 | return cpu_to_le64(data); | ||
257 | } | ||
236 | } | 258 | } |
237 | 259 | ||
238 | return data; /* Leave LE untouched */ | 260 | return data; /* Leave LE untouched */ |