From patchwork Sat May 5 23:35:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Clark X-Patchwork-Id: 10382503 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 54BC660208 for ; Sat, 5 May 2018 23:54:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 40D6E28F78 for ; Sat, 5 May 2018 23:54:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 351A428F7B; Sat, 5 May 2018 23:54:48 +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 A6BB428F78 for ; Sat, 5 May 2018 23:54:47 +0000 (UTC) Received: from localhost ([::1]:40348 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fF70p-0000CI-0m for patchwork-qemu-devel@patchwork.kernel.org; Sat, 05 May 2018 19:54:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54613) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fF6kc-0004cb-JW for qemu-devel@nongnu.org; Sat, 05 May 2018 19:38:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fF6kY-0004AV-MV for qemu-devel@nongnu.org; Sat, 05 May 2018 19:38:02 -0400 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]:35779) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fF6kY-00049w-33 for qemu-devel@nongnu.org; Sat, 05 May 2018 19:37:58 -0400 Received: by mail-pf0-x242.google.com with SMTP id x9so932301pfm.2 for ; Sat, 05 May 2018 16:37:57 -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=8aeU5ABUVuJllnFu+Xb6Txv4vMRZ+bEt/Kmtn6S0UTY=; b=THHE0GBMErS5+CAe6kT0Umux0Sv9PzmwKTnq7sobVLrDf7VoU3DPLtQ4PWv51amhDv U3UpGa+521n8fJysZ2YBHZDKszdRbIKBdpFTsX7/FqtG9pplh0pR4FhWto9UMw1w5aZt pt8s5a73Kic5HqpWV1byxezWrSD2RP47zgSA92Vl054JmXAYb8iiRAFR+BVP+diFBHDx WJMHFAJzQjLotEEquH/lZbZmEkRs6ShvGpTbQTlZdCGMaF2F2FNkz/VtQo0NuqkqxqX6 aSJ6pwboPjCyXvWD3ydBF3WDuQSx2lYzc5n6BgZiB/kIGgURpVNblqY9Adk0pZeUaHqt gawg== 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=8aeU5ABUVuJllnFu+Xb6Txv4vMRZ+bEt/Kmtn6S0UTY=; b=X3pjYli0C4S7MvBknCSdcnMK6w+T8PcKHv3SYKHVCQ8VFKqwEM9m4WVGE20BT11iyb jxmeKb3L+V8sGAYO2BT+fXwr4nKo7jQMnGI+xNmBlOXtIcByUFAwE/TDv1EQgFFvrJ// 6GeThGkJ4OMu8F1uvjC/KQMhes3s3jtVtmYri4osFjKhYYxURmCQV4WqA+zDDDlLBkNH Z5m4VrPZrMFRWl6NPwnDdDQZ+h3co7L9KGhi/WhxmCoZmDIZabeuXa61rxzxLm27w82f YBhRItpUbaTPjzEUyrb3YLay5WSwt6szxa6zicAMScLFbzxfHxy0qOst5BeFoZIPWbS1 0inA== X-Gm-Message-State: ALQs6tATRkLOyDMPPCLNKCowFRqLqm305H1a3f7QFYwW354tM0Sbc+xu JBL+LEda6Wr5lziOsdafzWYhFJlykhI= X-Google-Smtp-Source: AB8JxZoVZ1eQPjGbQIapDdBlI3FJKN7u7vSmPUJh6TphD4uYX2o3K7sCLkqfYw2IFcnGr2wbbYwuCg== X-Received: by 2002:a17:902:2804:: with SMTP id e4-v6mr32910444plb.153.1525563477148; Sat, 05 May 2018 16:37:57 -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.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 05 May 2018 16:37:56 -0700 (PDT) From: Michael Clark To: qemu-devel@nongnu.org Date: Sun, 6 May 2018 11:35:24 +1200 Message-Id: <1525563325-62963-20-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::242 Subject: [Qemu-devel] [PULL 19/20] RISC-V: No traps on writes to misa, minstret, mcycle 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 These fields are marked WARL (Write Any Values, Reads Legal Values) in the RISC-V Privileged Architecture Specification so instead of raising exceptions, illegal writes are silently dropped. Cc: Sagar Karandikar Cc: Bastian Koppelmann Cc: Palmer Dabbelt Cc: Alistair Francis Signed-off-by: Michael Clark --- target/riscv/op_helper.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/target/riscv/op_helper.c b/target/riscv/op_helper.c index af0c52a48418..3abf52453cfc 100644 --- a/target/riscv/op_helper.c +++ b/target/riscv/op_helper.c @@ -213,17 +213,19 @@ void csr_write_helper(CPURISCVState *env, target_ulong val_to_write, break; } case CSR_MINSTRET: - qemu_log_mask(LOG_UNIMP, "CSR_MINSTRET: write not implemented"); - goto do_illegal; + /* minstret is WARL so unsupported writes are ignored */ + break; case CSR_MCYCLE: - qemu_log_mask(LOG_UNIMP, "CSR_MCYCLE: write not implemented"); - goto do_illegal; + /* mcycle is WARL so unsupported writes are ignored */ + break; +#if defined(TARGET_RISCV32) case CSR_MINSTRETH: - qemu_log_mask(LOG_UNIMP, "CSR_MINSTRETH: write not implemented"); - goto do_illegal; + /* minstreth is WARL so unsupported writes are ignored */ + break; case CSR_MCYCLEH: - qemu_log_mask(LOG_UNIMP, "CSR_MCYCLEH: write not implemented"); - goto do_illegal; + /* mcycleh is WARL so unsupported writes are ignored */ + break; +#endif case CSR_MUCOUNTEREN: if (env->priv_ver <= PRIV_VERSION_1_09_1) { env->scounteren = val_to_write; @@ -337,10 +339,9 @@ void csr_write_helper(CPURISCVState *env, target_ulong val_to_write, case CSR_MBADADDR: env->mbadaddr = val_to_write; break; - case CSR_MISA: { - qemu_log_mask(LOG_UNIMP, "CSR_MISA: misa writes not supported"); - goto do_illegal; - } + case CSR_MISA: + /* misa is WARL so unsupported writes are ignored */ + break; case CSR_PMPCFG0: case CSR_PMPCFG1: case CSR_PMPCFG2: