From patchwork Wed Jul 3 19:07:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Behrens X-Patchwork-Id: 11030151 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 D5CBE18E8 for ; Wed, 3 Jul 2019 19:08:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C40B028A0B for ; Wed, 3 Jul 2019 19:08:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B4F1E28A0D; Wed, 3 Jul 2019 19:08:22 +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=-5.0 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5C2C228A0B for ; Wed, 3 Jul 2019 19:08:22 +0000 (UTC) Received: from localhost ([::1]:38722 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hikc8-0003JK-WC for patchwork-qemu-devel@patchwork.kernel.org; Wed, 03 Jul 2019 15:08:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39478) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hikba-0002Y8-QV for qemu-devel@nongnu.org; Wed, 03 Jul 2019 15:07:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hikbY-0007SS-0Z for qemu-devel@nongnu.org; Wed, 03 Jul 2019 15:07:46 -0400 Received: from rs224.mailgun.us ([209.61.151.224]:56434) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hikbX-0007Rh-Ks for qemu-devel@nongnu.org; Wed, 03 Jul 2019 15:07:43 -0400 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=fintelia.io; q=dns/txt; s=pic; t=1562180862; h=Content-Transfer-Encoding: MIME-Version: Message-Id: Date: Subject: Cc: To: From: Sender; bh=bhPgRYbSneY4s1bR3e/dhpZYjODq0ldO7IJvZCUOrog=; b=2ShDdEJvVVukQQVZpAFOIhRqArhP6dCGRQZioKxVDAllXuYuxfRmThE15vDguhp4mwkEdqXN bDGwfU9Y+Zo0RwEXdOqKyvdKSVAS8VDU/0oLhyfvzhJcEdbASHKxrimBuFfF0I5p3wGgocx/ +Lyf87pg+Yq6h+sX3Ghyn3AsVdsIVsGp4IrRkk8trRcdhDzE89teGuErK+5wNIalEjZqnId/ 3TYiDA0GQOFMmYy9eD08oxrfn9urcvOwGjE9Y0p8bSNtbBC46rsv9IbYMa2LBrL8vtyZdZVx F2VZk42+HABD/c21etus17h62uIwQDiGCv4C7qVGVwMRZMD4rD01/Q== X-Mailgun-Sending-Ip: 209.61.151.224 X-Mailgun-Sid: WyJlMGM5NSIsICJxZW11LWRldmVsQG5vbmdudS5vcmciLCAiOWI0ZTc2Il0= Received: from jonathan-ThinkPad-X1-Carbon.csail.mit.edu (30-9-3.wireless.csail.mit.edu [128.30.9.3]) by mxa.mailgun.org with ESMTP id 5d1cfcfc.7f5bee2bd210-smtp-out-n01; Wed, 03 Jul 2019 19:07:40 -0000 (UTC) From: Jonathan Behrens To: qemu-devel@nongnu.org Date: Wed, 3 Jul 2019 15:07:14 -0400 Message-Id: <20190703190715.5328-1-jonathan@fintelia.io> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.61.151.224 Subject: [Qemu-devel] [PATCH] target/riscv: Disallow WFI instruction from U-mode X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "open list:RISC-V TCG CPUs" , Sagar Karandikar , Jonathan Behrens , Palmer Dabbelt , Alistair Francis , Bastian Koppelmann Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Jonathan Behrens Reviewed-by: Alistair Francis --- target/riscv/op_helper.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/target/riscv/op_helper.c b/target/riscv/op_helper.c index 331cc36232..2e5a980192 100644 --- a/target/riscv/op_helper.c +++ b/target/riscv/op_helper.c @@ -129,10 +129,10 @@ target_ulong helper_mret(CPURISCVState *env, target_ulong cpu_pc_deb) void helper_wfi(CPURISCVState *env) { CPUState *cs = env_cpu(env); - - if (env->priv == PRV_S && - env->priv_ver >= PRIV_VERSION_1_10_0 && - get_field(env->mstatus, MSTATUS_TW)) { + if (!(env->priv >= PRV_S) || + (env->priv == PRV_S && + env->priv_ver >= PRIV_VERSION_1_10_0 && + get_field(env->mstatus, MSTATUS_TW))) { riscv_raise_exception(env, RISCV_EXCP_ILLEGAL_INST, GETPC()); } else { cs->halted = 1;