From patchwork Thu Mar 7 17:04:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 10843463 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 798DF14DE for ; Thu, 7 Mar 2019 17:15:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5BDF22F4B0 for ; Thu, 7 Mar 2019 17:15:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 503632F4BA; Thu, 7 Mar 2019 17:15:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id EB74C2F4B0 for ; Thu, 7 Mar 2019 17:15:25 +0000 (UTC) Received: from localhost ([127.0.0.1]:55721 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1wc9-0005cK-52 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 07 Mar 2019 12:15:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59080) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1wT3-00077y-DP for qemu-devel@nongnu.org; Thu, 07 Mar 2019 12:06:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1wSu-0005mU-6e for qemu-devel@nongnu.org; Thu, 07 Mar 2019 12:05:55 -0500 Received: from mail-pf1-x42b.google.com ([2607:f8b0:4864:20::42b]:34589) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h1wSm-0004fw-09 for qemu-devel@nongnu.org; Thu, 07 Mar 2019 12:05:44 -0500 Received: by mail-pf1-x42b.google.com with SMTP id u9so11902046pfn.1 for ; Thu, 07 Mar 2019 09:05:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=05lF+sqRrBX0u4SK6E3TesbjPVIKMjJkzGqQZca+AAo=; b=i9T+UKnXWUpSOkJG6kakYXZKI2T7dj84Y3Akf7WnIiIJsJrWlPOnxUy8OJCBrIz5ec 4AbC4OfSwq3CHFrVs3veyxOkDRbC5/cienaKXvtxqbWcmNcL6ju7g+okWxQ4J4Hi83vp YGeAdEKczPKaRKFMhiBHRMeMRymZnSBNFzXLtVb55oYM41MKlTycUrueTgzDw/u1YdNx glbcvftfzdRQsVW+mEqJtzXibDHmDR1hcVI4kTz/CkWUzZrdHNVz7ndtcmjxYD9LQ4QF Ak41D8HJuUJ/r0E+r8GTAri+2Q79pjNSS6lHH1aEJxbrU0pV+tJiZcwxWH3rTpM/Y38/ V7jQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=05lF+sqRrBX0u4SK6E3TesbjPVIKMjJkzGqQZca+AAo=; b=b9JGTQtCX64QYeAXr3+sJWPTBXLQMawmHQb+NTu+bTfBHdEV6XgAfDLIpsQ0QEIkeS NxTjRnq5zTSGw0tpczFvQC78foSFT9wypP/32JMKC3lsRWpO3lBUEr1M2TOAt63LyUPC KY5qTeuuVZjePriAH4VceiqyQkJguKpqo+mMnAg/IMsIOWtykEBGK0r5NkxvAdFeLUIG t5gR/ywF82tMRYG/78Qg3noPM0k81WboT6V5Bzoc4++mK+VXSJ4JyhZSY3rNe0Jr7EoR fzqK4U+DSn5j9g6j81usSGx+vs4SzBsTL2fg5efZalPpMaEvATFAVaVcfbZuyFUBeWxk /NKQ== X-Gm-Message-State: APjAAAWPTZCFOm9I7AcSzCkpzNuU9iBB54JQ2t+Yo2lbC3Lm/PtFm9kL 76/Uc7CUzTUnsgGya9fXnPHd3eSSP44= X-Google-Smtp-Source: APXvYqy5tPaghLe4+Hj0IE6NeGazZWegYnnqGyuRLigw2xiWYVhRaouUbNlbpP0B6ePRPWGPQ4VNbA== X-Received: by 2002:a63:4542:: with SMTP id u2mr12127091pgk.291.1551978303838; Thu, 07 Mar 2019 09:05:03 -0800 (PST) Received: from cloudburst.twiddle.net (97-113-188-82.tukw.qwest.net. [97.113.188.82]) by smtp.gmail.com with ESMTPSA id r82sm10040562pfa.161.2019.03.07.09.05.02 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Mar 2019 09:05:03 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 7 Mar 2019 09:04:35 -0800 Message-Id: <20190307170440.3113-18-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190307170440.3113-1-richard.henderson@linaro.org> References: <20190307170440.3113-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::42b Subject: [Qemu-devel] [PATCH v4 17/22] target/arm: Set PSTATE.TCO on exception entry X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP R0085 specifies that exception handlers begin with tag checks overridden. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- v2: Only set if MTE feature present. --- target/arm/helper.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index c8773a5528..a529d30700 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -9628,6 +9628,7 @@ static void arm_cpu_do_interrupt_aarch64(CPUState *cs) target_ulong addr = env->cp15.vbar_el[new_el]; unsigned int new_mode = aarch64_pstate_mode(new_el, true); unsigned int cur_el = arm_current_el(env); + unsigned int new_pstate; /* * Note that new_el can never be 0. If cur_el is 0, then @@ -9721,7 +9722,11 @@ static void arm_cpu_do_interrupt_aarch64(CPUState *cs) qemu_log_mask(CPU_LOG_INT, "...with ELR 0x%" PRIx64 "\n", env->elr_el[new_el]); - pstate_write(env, PSTATE_DAIF | new_mode); + new_pstate = new_mode | PSTATE_DAIF; + if (cpu_isar_feature(aa64_mte, cpu)) { + new_pstate |= PSTATE_TCO; + } + pstate_write(env, new_pstate); env->aarch64 = 1; aarch64_restore_sp(env, new_el);