From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42642) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YJJEV-0006Ah-LZ for qemu-devel@nongnu.org; Thu, 05 Feb 2015 05:00:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YJJER-0003SK-3F for qemu-devel@nongnu.org; Thu, 05 Feb 2015 05:00:23 -0500 Received: from mail-pd0-f175.google.com ([209.85.192.175]:42880) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YJJEQ-0003SA-Us for qemu-devel@nongnu.org; Thu, 05 Feb 2015 05:00:19 -0500 Received: by pdjy10 with SMTP id y10so6838803pdj.9 for ; Thu, 05 Feb 2015 02:00:18 -0800 (PST) From: Pranavkumar Sawargaonkar Date: Thu, 5 Feb 2015 15:29:42 +0530 Message-Id: <1423130382-18640-3-git-send-email-pranavkumar@linaro.org> In-Reply-To: <1423130382-18640-1-git-send-email-pranavkumar@linaro.org> References: <1423130382-18640-1-git-send-email-pranavkumar@linaro.org> Subject: [Qemu-devel] [PATCH V3 2/2] target-arm: Guest cpu endianness determination for virtio KVM ARM/ARM64 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, patches@apm.com, alex.bennee@linaro.org, kvmarm@lists.cs.columbia.edu, christoffer.dall@linaro.org, Pranavkumar Sawargaonkar This patch implements a fucntion pointer "virtio_is_big_endian" from "CPUClass" structure for arm/arm64. Function arm_cpu_is_big_endian() is added to determine and return the guest cpu endianness to virtio. This is required for running cross endian guests with virtio on ARM/ARM64. Signed-off-by: Pranavkumar Sawargaonkar --- target-arm/cpu.c | 24 ++++++++++++++++++++++++ target-arm/cpu.h | 2 ++ 2 files changed, 26 insertions(+) diff --git a/target-arm/cpu.c b/target-arm/cpu.c index 285947f..4d9cded 100644 --- a/target-arm/cpu.c +++ b/target-arm/cpu.c @@ -320,6 +320,29 @@ static void arm_cpu_kvm_set_irq(void *opaque, int irq, int level) kvm_set_irq(kvm_state, kvm_irq, level ? 1 : 0); #endif } + +static bool arm_cpu_is_big_endian(CPUState *cs) +{ + ARMCPU *cpu = ARM_CPU(cs); + CPUARMState *env = &cpu->env; + int cur_el; + + cpu_synchronize_state(cs); + + /* In 32bit guest endianess is determined by looking at CPSR's E bit */ + if (!is_a64(env)) { + return (env->pstate & CPSR_E) ? 1 : 0; + } + + cur_el = arm_current_el(env); + + if (cur_el == 0) { + return (env->cp15.sctlr_el[1] & SCTLR_E0E) != 0; + } + + return (env->cp15.sctlr_el[cur_el] & SCTLR_EE) != 0; +} + #endif static inline void set_feature(CPUARMState *env, int feature) @@ -1189,6 +1212,7 @@ static void arm_cpu_class_init(ObjectClass *oc, void *data) cc->do_interrupt = arm_cpu_do_interrupt; cc->get_phys_page_debug = arm_cpu_get_phys_page_debug; cc->vmsd = &vmstate_arm_cpu; + cc->virtio_is_big_endian = arm_cpu_is_big_endian; #endif cc->gdb_num_core_regs = 26; cc->gdb_core_xml_file = "arm-core.xml"; diff --git a/target-arm/cpu.h b/target-arm/cpu.h index cd7a9e8..317e801 100644 --- a/target-arm/cpu.h +++ b/target-arm/cpu.h @@ -32,6 +32,8 @@ # define ELF_MACHINE EM_ARM #endif +#define TARGET_IS_BIENDIAN 1 + #define CPUArchState struct CPUARMState #include "qemu-common.h" -- 1.9.1