From patchwork Sat May 5 23:35:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Clark X-Patchwork-Id: 10382485 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 DE8666053F for ; Sat, 5 May 2018 23:47:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C883128F60 for ; Sat, 5 May 2018 23:47:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BAF5A28F74; Sat, 5 May 2018 23:47:09 +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=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, 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 10C3C28F60 for ; Sat, 5 May 2018 23:47:09 +0000 (UTC) Received: from localhost ([::1]:40316 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fF6tQ-0003hb-8n for patchwork-qemu-devel@patchwork.kernel.org; Sat, 05 May 2018 19:47:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54495) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fF6kK-0004N6-Ec for qemu-devel@nongnu.org; Sat, 05 May 2018 19:37:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fF6kJ-0003z3-Hm for qemu-devel@nongnu.org; Sat, 05 May 2018 19:37:44 -0400 Received: from mail-pf0-x243.google.com ([2607:f8b0:400e:c00::243]:46609) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fF6kJ-0003yZ-CI for qemu-devel@nongnu.org; Sat, 05 May 2018 19:37:43 -0400 Received: by mail-pf0-x243.google.com with SMTP id p12so20071052pff.13 for ; Sat, 05 May 2018 16:37:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hzYHz6It3AnWry9x4xd8y7/vHlQd0K6YIrGLt3sNlSw=; b=OP7XsU5/JA7Pcai5TwVbsQgVg1CAfBonq08uyRngXR9X5C44pdV/Qw3pQKq0BkH2TU HJIXixnOgLL1eXU5rs2rT3zlQF7XG0ZVfkQ54x40Iq0AYgYC22UulGt7uws0U3gysIy3 iK0WdVda6DnHhO4Ot4dinqU+n8oY0ecMg5uXR9O80v/XTBQUSlTG37Die+yVjWuE26d3 G9Zu4d4YtTYWd5+UpeE/ILTJaC2ccP5NeXsNc4TkCylDyBa2+VZ3Rgh/POsGTIFiSM1Y eakMQBm9tnlfiAR4tNJlUfakvoCCoWockaGtXpu41aaN6fcHd+0XPaPOEHnO1IC9N8iv AtgQ== 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=hzYHz6It3AnWry9x4xd8y7/vHlQd0K6YIrGLt3sNlSw=; b=PFye0dQ/iHLzVOQyWM8e1vOcjr0ENm8nnLXUmf+I/mzAQTOqtAYuoecqVuB9U0Dcjq s8CCIWU7wa0XccrIrZ0suQiia6aLTqCQEMkAzAUDQoeCb+MHPYZU4oZ3QdTbMEf4xFMa kC2qqV8xB5EnF6PXQmpvQ992XmYw5QNEZ+JshZu223FQBIrwty9268KtKdxMzdD0pKYz gOmxOcN5Fqo/HxF9MB2z6TuD71HDJpXNTYdtgxbG3gFvMICBj2pwBgVdM8EO/KD5qmHq g6cDtGvtSkTqF+Q6y1Ds66eTfQzR/V+PO/cE2cqgWXHAOoDATViwPtj/GUKuDeyjNYvi 1BEg== X-Gm-Message-State: ALQs6tBn/BIx6vxXzUs+l2OrTQsB0CDOSyVNnWWArN8gjEhbLIvJnFC/ evOeqy+1odKnc2pGaG1RSkp+TFLKfW8= X-Google-Smtp-Source: AB8JxZrU/JvREh3G0AmhlNizn/UMRorvjMTDRJz/PLxalT3TrhUUP+1F7lyvcDge9VVZU0RWBB7xdA== X-Received: by 2002:a63:385a:: with SMTP id h26-v6mr26340531pgn.147.1525563462466; Sat, 05 May 2018 16:37:42 -0700 (PDT) Received: from localhost.localdomain (122-58-167-38-fibre.bb.spark.co.nz. [122.58.167.38]) by smtp.gmail.com with ESMTPSA id x8sm47297094pfa.173.2018.05.05.16.37.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 05 May 2018 16:37:42 -0700 (PDT) From: Michael Clark To: qemu-devel@nongnu.org Date: Sun, 6 May 2018 11:35:20 +1200 Message-Id: <1525563325-62963-16-git-send-email-mjc@sifive.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1525563325-62963-1-git-send-email-mjc@sifive.com> References: <1525563325-62963-1-git-send-email-mjc@sifive.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::243 Subject: [Qemu-devel] [PULL 15/20] RISC-V: Allow S-mode mxr access when priv ISA >= v1.10 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: Sagar Karandikar , Bastian Koppelmann , Palmer Dabbelt , Michael Clark , Alistair Francis , patches@groups.riscv.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP The mstatus.MXR alias in sstatus should only be writable by S-mode if the privileged ISA version >= v1.10. Also MXR was masked in sstatus CSR read but not sstatus CSR writes. Now we correctly mask sstatus.mxr in both read and write. Cc: Sagar Karandikar Cc: Bastian Koppelmann Cc: Palmer Dabbelt Cc: Alistair Francis Signed-off-by: Michael Clark Reviewed-by: Alistair Francis --- target/riscv/op_helper.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/target/riscv/op_helper.c b/target/riscv/op_helper.c index 101dac1ee8dc..f45ac7306c38 100644 --- a/target/riscv/op_helper.c +++ b/target/riscv/op_helper.c @@ -234,7 +234,10 @@ void csr_write_helper(CPURISCVState *env, target_ulong val_to_write, target_ulong ms = env->mstatus; target_ulong mask = SSTATUS_SIE | SSTATUS_SPIE | SSTATUS_UIE | SSTATUS_UPIE | SSTATUS_SPP | SSTATUS_FS | SSTATUS_XS - | SSTATUS_SUM | SSTATUS_MXR | SSTATUS_SD; + | SSTATUS_SUM | SSTATUS_SD; + if (env->priv_ver >= PRIV_VERSION_1_10_0) { + mask |= SSTATUS_MXR; + } ms = (ms & ~mask) | (val_to_write & mask); csr_write_helper(env, ms, CSR_MSTATUS); break; @@ -441,7 +444,7 @@ target_ulong csr_read_helper(CPURISCVState *env, target_ulong csrno) case CSR_SSTATUS: { target_ulong mask = SSTATUS_SIE | SSTATUS_SPIE | SSTATUS_UIE | SSTATUS_UPIE | SSTATUS_SPP | SSTATUS_FS | SSTATUS_XS - | SSTATUS_SUM | SSTATUS_SD; + | SSTATUS_SUM | SSTATUS_SD; if (env->priv_ver >= PRIV_VERSION_1_10_0) { mask |= SSTATUS_MXR; }