From patchwork Wed Jun 14 19:48:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9787347 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E584960325 for ; Wed, 14 Jun 2017 19:53:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D9552280B0 for ; Wed, 14 Jun 2017 19:53:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CC47C284F1; Wed, 14 Jun 2017 19:53:08 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 33452280B0 for ; Wed, 14 Jun 2017 19:53:08 +0000 (UTC) Received: from localhost ([::1]:50621 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dLELj-0003zG-He for patchwork-qemu-devel@patchwork.kernel.org; Wed, 14 Jun 2017 15:53:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54047) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dLEHJ-00016i-GL for qemu-devel@nongnu.org; Wed, 14 Jun 2017 15:48:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dLEHI-0008WD-Da for qemu-devel@nongnu.org; Wed, 14 Jun 2017 15:48:33 -0400 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:35162) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dLEHI-0008W0-93; Wed, 14 Jun 2017 15:48:32 -0400 Received: by mail-qt0-x243.google.com with SMTP id x58so2210560qtc.2; Wed, 14 Jun 2017 12:48:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=EHln7mvAkRHwv9Qze1WRY4taLrjRwniYNbupA8mu76U=; b=uodO6Ntm1J/5gxoF4u2gZZWDAlZY1jRoojuS0gSeZMyfK50PPQVK8/RPxrC837fUkb RBreFOWrDRCdL2q1PoBJ2YwCT054NO+ltA6Au488rk39AtQkgJxsHkJ/dS7n4u8vW11m UXRKt0XLMQg5+u+iJ4XI2fe3Tu5YAwlGnttX3RVvzzeDUoJa1xgIcW7v1qQrG9Xee0Mj pepdil6ExuG6pb14h1sgkc12h0p61nxDvJfFXjYd/Zw7CGqCC3+xvA6KW/1lDErukclB V7nt87kPnX9PjgmhMi3Zz+6gWW7lPwEsfF2aiMGKFS3ZPZd8Yl1v/1urUnMNOaMWxYS/ Mmsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=EHln7mvAkRHwv9Qze1WRY4taLrjRwniYNbupA8mu76U=; b=ZpdJ1fd7vCNiE3QBHB2nJzvheQgGyaoFIEKcgcyqOu26R7E3ThOd61frWxB7HQ6pm4 tWcSiEJJj9+ZPBd40nJgAznzan16g2tCBEnUEivboczon3gpryAg5OAqM2Ttmx73gVNB GGWg5qFiziwEpuj0td4sSEFouhphLzAIBnG9lmulCwSEwy0QtUuGoeSmjiUP9x7pQHxk aUBdMxjfJL4krs0QdB4bHrmpa+vSKDfFl/Uc08Vhydckix3E11oMQiDYTrmwH+ALzrbz rqht63rHeMC0qH33YFUBGD0izDLkfW4HxhN0pszZ4eH8WeGVZ7Tprh6wRbml2FAGHTPf CDHQ== X-Gm-Message-State: AKS2vOyfnwqMzjJWMBn/iTvj/5nKfVJ3mX3SuP5AYyqGR6gbc5eQrVuO AF9rdw+GeKQPDZpdf1s= X-Received: by 10.237.54.71 with SMTP id e65mr2312788qtb.146.1497469711524; Wed, 14 Jun 2017 12:48:31 -0700 (PDT) Received: from bigtime.twiddle.net.com (97-113-165-157.tukw.qwest.net. [97.113.165.157]) by smtp.gmail.com with ESMTPSA id o93sm628571qte.41.2017.06.14.12.48.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Jun 2017 12:48:30 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 14 Jun 2017 12:48:21 -0700 Message-Id: <20170614194821.8754-6-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170614194821.8754-1-rth@twiddle.net> References: <20170614194821.8754-1-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::243 Subject: [Qemu-devel] [PATCH v2 5/5] target/arm: Exit after clearing interrupt mask 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: pbonzini@redhat.com, cota@braap.org, alex.bennee@linaro.org, qemu-arm@nongnu.org, Peter Maydell Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Exit to cpu loop so we reevaluate cpu_arm_hw_interrupts. Cc: qemu-arm@nongnu.org Cc: Peter Maydell Signed-off-by: Richard Henderson Reviewed-by: Alex Bennée Tested-by: Alex Bennée --- target/arm/translate-a64.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index 860e279..e55547d 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -1422,7 +1422,9 @@ static void handle_msr_i(DisasContext *s, uint32_t insn, gen_helper_msr_i_pstate(cpu_env, tcg_op, tcg_imm); tcg_temp_free_i32(tcg_imm); tcg_temp_free_i32(tcg_op); - s->is_jmp = DISAS_UPDATE; + /* For DAIFClear, exit the cpu loop to re-evaluate pending IRQs. */ + gen_a64_set_pc_im(s->pc); + s->is_jmp = (op == 0x1f ? DISAS_EXIT : DISAS_JUMP); break; } default: @@ -11369,6 +11371,9 @@ void gen_intermediate_code_a64(ARMCPU *cpu, TranslationBlock *tb) case DISAS_JUMP: tcg_gen_lookup_and_goto_ptr(cpu_pc); break; + case DISAS_EXIT: + tcg_gen_exit_tb(0); + break; case DISAS_TB_JUMP: case DISAS_EXC: case DISAS_SWI: