From patchwork Tue Jun 17 08:45:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 360395 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 178EB140087 for ; Tue, 17 Jun 2014 18:57:04 +1000 (EST) Received: from localhost ([::1]:48241 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwpCP-0000t3-S4 for incoming@patchwork.ozlabs.org; Tue, 17 Jun 2014 04:57:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37364) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwpBl-00085Q-Ep for qemu-devel@nongnu.org; Tue, 17 Jun 2014 04:56:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WwpBf-0006Lx-Er for qemu-devel@nongnu.org; Tue, 17 Jun 2014 04:56:21 -0400 Received: from mail-pa0-x22c.google.com ([2607:f8b0:400e:c03::22c]:36901) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwpBf-0006Lq-4l for qemu-devel@nongnu.org; Tue, 17 Jun 2014 04:56:15 -0400 Received: by mail-pa0-f44.google.com with SMTP id rd3so4192098pab.17 for ; Tue, 17 Jun 2014 01:56:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=6ADjOOjCwE2I3JE4dCl+vNYcd0nssoshRmGe9K0JdqU=; b=cfS30hjoIcfY68dDY4wlwcj8wTHfH4OU5TZRZ6yfv1/AhBWG3/bDnKETR2bV936bkr zXvD0hmJdqOXWjNx7gGx90qH/m1loPWSu9C0Hw6ed/ewruWnCZQzKbzlsMSXbzvO14uQ LOiy7RzBMkpaQA/Pgl9i6MM97DZJ0mOy67JTe0C9Yz50Rfc69TnY7TC4OF0/g5IEd92M NJn96zHpvOwCoa2yT5NNDlWDb3MfTSLBXcEdRlqg0gScJfX+z4ADrSCMcKcJmJvVWFZu a7jRm7BNib2geuHyn8lCPg26NT3S5Z/akXcqYGklc0Xoe21u4EkrY82U22s64v7vFcPC LtVg== X-Received: by 10.68.181.165 with SMTP id dx5mr31187256pbc.38.1402995373151; Tue, 17 Jun 2014 01:56:13 -0700 (PDT) Received: from localhost ([203.126.243.116]) by mx.google.com with ESMTPSA id ek2sm22863430pbd.30.2014.06.17.01.56.06 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 17 Jun 2014 01:56:12 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Tue, 17 Jun 2014 18:45:44 +1000 Message-Id: <1402994746-8328-15-git-send-email-edgar.iglesias@gmail.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1402994746-8328-1-git-send-email-edgar.iglesias@gmail.com> References: <1402994746-8328-1-git-send-email-edgar.iglesias@gmail.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c03::22c Cc: rob.herring@linaro.org, peter.crosthwaite@xilinx.com, aggelerf@ethz.ch, agraf@suse.de, blauwirbel@gmail.com, john.williams@xilinx.com, greg.bellows@linaro.org, pbonzini@redhat.com, alex.bennee@linaro.org, christoffer.dall@linaro.org, rth@twiddle.net Subject: [Qemu-devel] [PATCH v3 14/16] target-arm: A64: Emulate the SMC insn X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: "Edgar E. Iglesias" Signed-off-by: Edgar E. Iglesias Reviewed-by: Greg Bellows --- target-arm/cpu.h | 1 + target-arm/helper-a64.c | 1 + target-arm/helper.c | 6 ++++++ target-arm/helper.h | 1 + target-arm/internals.h | 6 ++++++ target-arm/op_helper.c | 27 +++++++++++++++++++++++++++ target-arm/translate-a64.c | 10 ++++++++++ 7 files changed, 52 insertions(+) diff --git a/target-arm/cpu.h b/target-arm/cpu.h index 258bc09..42e0ed3 100644 --- a/target-arm/cpu.h +++ b/target-arm/cpu.h @@ -52,6 +52,7 @@ #define EXCP_KERNEL_TRAP 9 /* Jumped to kernel code page. */ #define EXCP_STREX 10 #define EXCP_HVC 11 /* HyperVisor Call */ +#define EXCP_SMC 12 /* Secure Monitor Call */ #define ARMV7M_EXCP_RESET 1 #define ARMV7M_EXCP_NMI 2 diff --git a/target-arm/helper-a64.c b/target-arm/helper-a64.c index 7382d0a..f0f33af 100644 --- a/target-arm/helper-a64.c +++ b/target-arm/helper-a64.c @@ -476,6 +476,7 @@ void aarch64_cpu_do_interrupt(CPUState *cs) case EXCP_UDEF: case EXCP_SWI: case EXCP_HVC: + case EXCP_SMC: env->cp15.esr_el[new_el] = env->exception.syndrome; break; case EXCP_IRQ: diff --git a/target-arm/helper.c b/target-arm/helper.c index 44e8d47..4945f67 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -3306,6 +3306,12 @@ unsigned int arm_excp_target_el(CPUState *cs, unsigned int excp_idx) case EXCP_HVC: target_el = MAX(target_el, 2); break; + case EXCP_SMC: + target_el = 3; + if (!secure && cur_el == 1 && (env->cp15.hcr_el2 & HCR_TSC)) { + target_el = 2; + } + break; } return target_el; } diff --git a/target-arm/helper.h b/target-arm/helper.h index 70cfd28..4293453 100644 --- a/target-arm/helper.h +++ b/target-arm/helper.h @@ -51,6 +51,7 @@ DEF_HELPER_3(exception_with_syndrome, void, env, i32, i32) DEF_HELPER_1(wfi, void, env) DEF_HELPER_1(wfe, void, env) DEF_HELPER_2(hvc, void, env, i32) +DEF_HELPER_2(smc, void, env, i32) DEF_HELPER_3(cpsr_write, void, env, i32, i32) DEF_HELPER_1(cpsr_read, i32, env) diff --git a/target-arm/internals.h b/target-arm/internals.h index b68e6f9..f6b7156 100644 --- a/target-arm/internals.h +++ b/target-arm/internals.h @@ -54,6 +54,7 @@ static const char * const excnames[] = { [EXCP_KERNEL_TRAP] = "QEMU intercept of kernel commpage", [EXCP_STREX] = "QEMU intercept of STREX", [EXCP_HVC] = "Hypervisor Call", + [EXCP_SMC] = "Secure Monitor Call", }; static inline void arm_log_exception(int idx) @@ -210,6 +211,11 @@ static inline uint32_t syn_aa64_hvc(uint16_t imm16) return (EC_AA64_HVC << ARM_EL_EC_SHIFT) | ARM_EL_IL | imm16; } +static inline uint32_t syn_aa64_smc(uint16_t imm16) +{ + return (EC_AA64_SMC << ARM_EL_EC_SHIFT) | ARM_EL_IL | imm16; +} + static inline uint32_t syn_aa32_svc(uint32_t imm16, bool is_thumb) { return (EC_AA32_SVC << ARM_EL_EC_SHIFT) | (imm16 & 0xffff) diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c index c1fa797..11636e3 100644 --- a/target-arm/op_helper.c +++ b/target-arm/op_helper.c @@ -402,6 +402,33 @@ void HELPER(hvc)(CPUARMState *env, uint32_t syndrome) raise_exception(env, EXCP_HVC); } +void HELPER(smc)(CPUARMState *env, uint32_t syndrome) +{ + int cur_el = arm_current_pl(env); + /* FIXME: Use real secure state. */ + bool secure = false; + bool smd = env->cp15.scr_el3 & SCR_SMD; + /* On ARMv8 AArch32, SMD only applies to NS mode. + * On ARMv7 SMD only applies to NS mode and only if EL2 is available. + * For ARMv7 non EL2, we force SMD to zero so we don't need to re-check + * the EL2 condition here. + */ + bool udef = is_a64(env) ? smd : !secure && smd; + + /* In NS EL1, HCR controlled routing to EL2 has priority over SMD. */ + if (!secure && cur_el == 1 && (env->cp15.hcr_el2 & HCR_TSC)) { + udef = false; + } + + /* We've already checked that EL3 exists at translation time. */ + if (udef) { + env->exception.syndrome = syn_uncategorized(); + raise_exception(env, EXCP_UDEF); + } + env->exception.syndrome = syndrome; + raise_exception(env, EXCP_SMC); +} + void HELPER(exception_return)(CPUARMState *env) { int cur_el = arm_current_pl(env); diff --git a/target-arm/translate-a64.c b/target-arm/translate-a64.c index 5692dff..dca98168 100644 --- a/target-arm/translate-a64.c +++ b/target-arm/translate-a64.c @@ -1454,6 +1454,16 @@ static void disas_exc(DisasContext *s, uint32_t insn) gen_helper_hvc(cpu_env, tmp); tcg_temp_free_i32(tmp); break; + case 3: + if (!arm_dc_feature(s, ARM_FEATURE_EL3) || s->current_pl == 0) { + unallocated_encoding(s); + break; + } + tmp = tcg_const_i32(syn_aa64_smc(imm16)); + gen_a64_set_pc_im(s->pc); + gen_helper_smc(cpu_env, tmp); + tcg_temp_free_i32(tmp); + break; default: unallocated_encoding(s); break;