From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42228) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b07w7-0000A0-CN for qemu-devel@nongnu.org; Tue, 10 May 2016 09:42:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b07vz-0000gd-TX for qemu-devel@nongnu.org; Tue, 10 May 2016 09:42:53 -0400 Received: from mail-pf0-x230.google.com ([2607:f8b0:400e:c00::230]:34764) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b07vz-0000gG-N3 for qemu-devel@nongnu.org; Tue, 10 May 2016 09:42:47 -0400 Received: by mail-pf0-x230.google.com with SMTP id y69so6111287pfb.1 for ; Tue, 10 May 2016 06:42:46 -0700 (PDT) References: <1462814989-24360-1-git-send-email-peter.maydell@linaro.org> <1462814989-24360-4-git-send-email-peter.maydell@linaro.org> From: Shannon Zhao Message-ID: <5731E54E.2060006@linaro.org> Date: Tue, 10 May 2016 21:42:38 +0800 MIME-Version: 1.0 In-Reply-To: <1462814989-24360-4-git-send-email-peter.maydell@linaro.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH 03/23] target-arm: Define new arm_is_el3_or_mon() function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell , qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: patches@linaro.org, Pavel Fedin , Shlomo Pongratz , Shlomo Pongratz , Christoffer Dall On 2016年05月10日 01:29, Peter Maydell wrote: > The GICv3 system registers need to know if the CPU is AArch64 > in EL3 or AArch32 in Monitor mode. This happens to be the first > part of the check for arm_is_secure(), so factor it out into a > new arm_is_el3_or_mon() function that the GIC can also use. > > Signed-off-by: Peter Maydell > --- > target-arm/cpu.h | 13 +++++++++++-- > 1 file changed, 11 insertions(+), 2 deletions(-) > > diff --git a/target-arm/cpu.h b/target-arm/cpu.h > index 066ff67..6ffc13b 100644 > --- a/target-arm/cpu.h > +++ b/target-arm/cpu.h > @@ -960,8 +960,8 @@ static inline bool arm_is_secure_below_el3(CPUARMState *env) > } > } > > -/* Return true if the processor is in secure state */ > -static inline bool arm_is_secure(CPUARMState *env) > +/* Return true if the CPU is AArch64 EL3 or AArch32 Mon */ > +static bool arm_is_el3_or_mon(CPUARMState *env) inline? > { > if (arm_feature(env, ARM_FEATURE_EL3)) { > if (is_a64(env) && extract32(env->pstate, 2, 2) == 3) { > @@ -973,6 +973,15 @@ static inline bool arm_is_secure(CPUARMState *env) > return true; > } > } > + return false; > +} > + > +/* Return true if the processor is in secure state */ > +static inline bool arm_is_secure(CPUARMState *env) > +{ > + if (arm_is_el3_or_mon(env)) { > + return true; > + } > return arm_is_secure_below_el3(env); > } > > Thanks, -- Shannon