From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A9AB8C2D0CE for ; Tue, 21 Jan 2020 10:49:06 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7356322522 for ; Tue, 21 Jan 2020 10:49:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="e5EiV/2a" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7356322522 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:51350 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itr5l-00060r-LM for qemu-devel@archiver.kernel.org; Tue, 21 Jan 2020 05:49:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37653) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itr4y-0005Ug-Cm for qemu-devel@nongnu.org; Tue, 21 Jan 2020 05:48:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1itr4w-0008CG-9k for qemu-devel@nongnu.org; Tue, 21 Jan 2020 05:48:16 -0500 Received: from mail-lj1-x241.google.com ([2a00:1450:4864:20::241]:40966) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1itr4w-0008Bx-2b for qemu-devel@nongnu.org; Tue, 21 Jan 2020 05:48:14 -0500 Received: by mail-lj1-x241.google.com with SMTP id h23so2223105ljc.8 for ; Tue, 21 Jan 2020 02:48:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=lMK1nIIc9wgbENUnqtEmN31Kd3XFiwVAAC0pNc62PnE=; b=e5EiV/2afZIaFggbEeaaG3XaCw44/2xrZRhjopVqVbR9CgS27nd56j6DcQY5xgt5F2 sJ2bnUrtrxVVpnioGPgoG0R4lI/mnU5Q4SYU0p+w20ZAfdnndnB08FaDHgH1+lALLQB2 tzvIHNB5/pMwDwM/FPGkedz2T+qrGw9IH5mpabcgfLxVDO6DwSJrs8IQm8UL036knz8R LjC2Ms8r4c3GhUDHW8I39F3KReFsaQEFvQU3igseuEzXxh3vdBZFYiGv5COQGFwv4Koo 3bmgWVph0hHPxA1jfK4P38/tCu52YONNiORNWD9O/YGt48PB+OkkhmA0Gcnh0+iyz5I+ jP0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=lMK1nIIc9wgbENUnqtEmN31Kd3XFiwVAAC0pNc62PnE=; b=Tlrvz9CtjsGqd5kBLDK+ehggkUTBJBC4Qx7XiCZEopi+e0oJDfCUMwTfi2uLFpQcd7 XI95Ou6l1PBAmtAjCvT/QbzDBZ4RaR0viBf65cGR18d8LW5mjl7c5ZFzy9/Xl2vSKOov mq4MfqLOrUzFx9vuenkoC2/vWZ6ssBpxiP+C4fQZCfJGCT8NKXrYCgyXeP8AtrIjSbj7 iU74LjMLWe9DVN3dX/MgjX0vM73mmosP7+uzXSzXOaQ7unyEK2PJzaSRBeM+QlUXtdhq xjXEyQZ/RzBP1AS+HviV+aRvUWtzCe4H4HsEvQzMm2GoBCpzV+TbGAqYTP/OANRr/op5 qMDg== X-Gm-Message-State: APjAAAWC4K8cDCQMvwZXLInll+63YGwIjUtlA0uVDTnGcTgUUCCGJWgS es1e9hitCCYtGI/r8Ef8fR0tpyxRsj3WyzZJuDc= X-Google-Smtp-Source: APXvYqzdh2tZvajYtbMCsNEYmmrZPJJ+p2gbrzLfXOTOJV74LnbQ7WAlRXMkiwLM+qt63NSVovbCoIE3oMthYaFCwcg= X-Received: by 2002:a2e:9157:: with SMTP id q23mr2287937ljg.196.1579603692988; Tue, 21 Jan 2020 02:48:12 -0800 (PST) MIME-Version: 1.0 References: <20200121100732.28734-1-ianjiang.ict@gmail.com> In-Reply-To: <20200121100732.28734-1-ianjiang.ict@gmail.com> From: Alistair Francis Date: Tue, 21 Jan 2020 20:47:46 +1000 Message-ID: Subject: Re: [PATCH] riscv: Fix bug in setting xPIE of CSR for MRET and SRET instructions To: Ian Jiang Content-Type: text/plain; charset="UTF-8" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::241 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: Palmer Dabbelt , Alistair Francis , "qemu-devel@nongnu.org Developers" , Sagar Karandikar , Bastian Koppelmann Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Tue, Jan 21, 2020 at 8:08 PM Ian Jiang wrote: > > According to the RISC-V specification, when executing an MRET or SRET > instruction, xPIE in mstatus or sstatus should be set to 1. The orginal > QEMU does not give the right operations. > This patch fix the problem. > > Signed-off-by: Ian Jiang Reviewed-by: Alistair Francis Alistair > --- > target/riscv/op_helper.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/target/riscv/op_helper.c b/target/riscv/op_helper.c > index 331cc36232..e87c9115bc 100644 > --- a/target/riscv/op_helper.c > +++ b/target/riscv/op_helper.c > @@ -93,7 +93,7 @@ target_ulong helper_sret(CPURISCVState *env, target_ulong cpu_pc_deb) > env->priv_ver >= PRIV_VERSION_1_10_0 ? > MSTATUS_SIE : MSTATUS_UIE << prev_priv, > get_field(mstatus, MSTATUS_SPIE)); > - mstatus = set_field(mstatus, MSTATUS_SPIE, 0); > + mstatus = set_field(mstatus, MSTATUS_SPIE, 1); > mstatus = set_field(mstatus, MSTATUS_SPP, PRV_U); > riscv_cpu_set_mode(env, prev_priv); > env->mstatus = mstatus; > @@ -118,7 +118,7 @@ target_ulong helper_mret(CPURISCVState *env, target_ulong cpu_pc_deb) > env->priv_ver >= PRIV_VERSION_1_10_0 ? > MSTATUS_MIE : MSTATUS_UIE << prev_priv, > get_field(mstatus, MSTATUS_MPIE)); > - mstatus = set_field(mstatus, MSTATUS_MPIE, 0); > + mstatus = set_field(mstatus, MSTATUS_MPIE, 1); > mstatus = set_field(mstatus, MSTATUS_MPP, PRV_U); > riscv_cpu_set_mode(env, prev_priv); > env->mstatus = mstatus; > -- > 2.17.1 > >