From patchwork Mon Jun 19 18:18:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9797155 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 EB799600C5 for ; Mon, 19 Jun 2017 18:28:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C1A2128456 for ; Mon, 19 Jun 2017 18:28:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B2BB828469; Mon, 19 Jun 2017 18:28:02 +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 2DFBF28456 for ; Mon, 19 Jun 2017 18:28:02 +0000 (UTC) Received: from localhost ([::1]:43862 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dN1P7-0007Fs-Jp for patchwork-qemu-devel@patchwork.kernel.org; Mon, 19 Jun 2017 14:28:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33424) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dN1GL-0008Sr-ML for qemu-devel@nongnu.org; Mon, 19 Jun 2017 14:18:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dN1GK-0002JA-O2 for qemu-devel@nongnu.org; Mon, 19 Jun 2017 14:18:57 -0400 Received: from mail-pf0-x241.google.com ([2607:f8b0:400e:c00::241]:32778) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dN1GK-0002Ij-I8 for qemu-devel@nongnu.org; Mon, 19 Jun 2017 14:18:56 -0400 Received: by mail-pf0-x241.google.com with SMTP id w12so18592149pfk.0 for ; Mon, 19 Jun 2017 11:18:56 -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 :mime-version:content-transfer-encoding; bh=bhNMdqFWXeXkkhr/D/CuwqzF9FHBL9QuRVAA1OOkrxg=; b=ZH9g5KnKxEp7PfSxqwcw8iGHMoHCDZrWitCkV+UCAFHbS3HyeXwOuZiHBIVfXH37f6 LjFXxjJNpQhDMla1EyPZAOnGEq/sPpvO3OHyVju6Dy//qWTZJXg4GHQX42uFyXBw7aGR 05SwBPrzRWtldo1qmQGtTM7xibU2+LGdhAkwfn9ajnvCR6CYopqvmxhTXraOBRupBZMM ECQ6liimH6/6oPHHBfZBWJjPMbC7Opxa7elVxqNv2b3rh99niGNQ0p+9iaNNMIzBgKWM BnjZ5gjrQdwg3olLftk0ni5QTdBb3iBnTQDk9sWsy65zSfa6Xu1/XOWJNUQJl+z3wMew +9nQ== 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:mime-version:content-transfer-encoding; bh=bhNMdqFWXeXkkhr/D/CuwqzF9FHBL9QuRVAA1OOkrxg=; b=SRFpkLwebJyw8eWUgYSIH+0yxhIK1c22vk42vddUPfPgcEEPWrcLKdXKoOssE0scQG HAICm2w9dCPnEnFGvl2dOT2BqVUspyO/rVpZ9Y2d8IxGQt38ZzkjN79mT1QKdrlRm9bG 1TNclQQpB2c1Kn1AZ1WPx8OXPNNwHTfFPTAvXVoTi3WIXt1rZ0V8TNREswKLcu+FYa6D d4uoyhJhsWbL5V1vldk8mSn8nPqQ++4m7Z7ifM8EeDf6kRfv8DvoOlvjZNDN7nW/BFAg ZnqadYltG47kWV/L7XqsFF9GDdIeFC89WzAZhaEUwpMYKVRMqdpSBtWNUI5+ljtdQgJX aHyQ== X-Gm-Message-State: AKS2vOwxgaJScE192FrIiG7lTMFD7RqbUCa1+/HMNQbm7zTZK6ujK4yI 0FY4gD6f0uS8a5/u0i8= X-Received: by 10.84.177.131 with SMTP id x3mr31107644plb.39.1497896335576; Mon, 19 Jun 2017 11:18:55 -0700 (PDT) Received: from pike.twiddle.net (97-113-165-157.tukw.qwest.net. [97.113.165.157]) by smtp.gmail.com with ESMTPSA id e63sm22917171pfb.18.2017.06.19.11.18.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Jun 2017 11:18:54 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 19 Jun 2017 11:18:39 -0700 Message-Id: <20170619181839.25249-13-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170619181839.25249-1-rth@twiddle.net> References: <20170619181839.25249-1-rth@twiddle.net> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::241 Subject: [Qemu-devel] [PULL 12/12] target/arm: Exit after clearing aarch64 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: 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 Exit to cpu loop so we reevaluate cpu_arm_hw_interrupts. Tested-by: Emilio G. Cota Tested-by: Alex Bennée Reviewed-by: Emilio G. Cota Reviewed-by: Alex Bennée Signed-off-by: Richard Henderson --- 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: