From patchwork Wed Apr 9 02:51:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Shu X-Patchwork-Id: 14044026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id A0714C369A2 for ; Wed, 9 Apr 2025 02:53:11 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u2LXf-0000s0-8y; Tue, 08 Apr 2025 22:51:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u2LXd-0000rD-5V for qemu-devel@nongnu.org; Tue, 08 Apr 2025 22:51:53 -0400 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u2LXb-00018s-Ng for qemu-devel@nongnu.org; Tue, 08 Apr 2025 22:51:52 -0400 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-227aaa82fafso54092225ad.2 for ; Tue, 08 Apr 2025 19:51:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1744167110; x=1744771910; darn=nongnu.org; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=yRx0l1L38CJZ6hR/oSAgykoMwro5gt/zxtwEU7Os2aE=; b=MOR3XBiTT8OYwkGHRJH/CkQEL46XzFWWbsGo05MuUNYRAChVAQrNRzwjSK25vkckCf SIetCPn8Mvdc+iw79o5C/1Vzx0+RMS5e7/4uK6G6CYRqJPrkEEfPjS/o6oFZaN5fwsSl oRT8lRkpDZCExMz4cvF7g2og0Hz385ij0D1hmUPYeq4ix5iWnYpoaYSuAU2vCsGdC0lX NveTHJRH3nLcIBhxh3eJGEPVn8eILmZC8B0t5iqNFBTxZ7lupzWj5M64U1EuaiEYiKH1 itxP2oSepm4OsVnA8CGkW0GNQ1jc/d56LEteHRbCpEtJ2I7qrKWX/FzEEpdiftPIAiON JNMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744167110; x=1744771910; h=references:in-reply-to:message-id:date:subject:cc:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=yRx0l1L38CJZ6hR/oSAgykoMwro5gt/zxtwEU7Os2aE=; b=d5oVS4RgboEproeLT8TFfs7aTcPYYip3HFIyTvOEAcbO+dZmBf/bxNRF1/x3hAzInx U86rzUOVGZvVKWVnU/ocjAS+CnY2ZaL5hYMbpxMKeaIRYchr8qqqlRSdK28JhA9188no tBW2Kl3js12PVUTTeHY6CZsdfeNJiWwENgPABZUO03cSjRzOwtcRpkVbn+4T7cuEu5vk R0ttjoLaZHMZJX/+LoVKTGVueth3zHC2jkPbUfcwDX7lYG1xEieIUQdOa84DBV2jUD8C ZOVNXhtblfjMujiE2WDYo5z7kp2krV1535S2qUkHasG+wUEZOGUKk7fb+CkCOC79Aqwa c4cA== X-Gm-Message-State: AOJu0YyF2QWhqTvZ69L8kFa34nmkrvaSz9k4+3h0YaNvs9gY2XqEOOj5 jLMHTpdMZjl3QhvDKu13CebLIZxktCA8kGh6KifEvimK0wKQJdq7TaryY+lnG2GNX7CRNouto3m zwEH9fAU/MbTXnwZo02GctWY3n+zTmO2poPj/Ooxr8mONGm8clo0CvubHZgMm/4AaaT7QMbFf48 FLBIm20E2MPQ+xz8Md5m+TL/sPKX130quUDg== X-Gm-Gg: ASbGnct01yMeH0Fs3aTefuekRUriBWeo+hBpf4bunIOuMtpoEgwK0ZQwzaJfdbd3JVG AVyyHyQ9YWBc62fMOUzhg4kmebhN0MuF5yAWPnAuIlu7Vj3AacXC8w2mAECcuTffa+y75ancYYy 7xRDsMX7GiouBxsIT/MBwQtrR4ECfw5UEIQVUyyFOXYEm19LEhluKCy1ul7EQvIc707z3E/F34g lkNc+PxuvGTqEznJrFMowoSdtRvZoOKTQxk0BlW/1T1/nHtWtyDHPGxbAAxM2nh5CnG76bYeaYj rCgPua+JTkWTA89pTcGofjnmIqq6YUJ6M6L1waBNc9VB9mWxE6bhUOQY3SVcXGk8H2k= X-Google-Smtp-Source: AGHT+IGRUXOuHV5k9iXh7SQCDO8A9xOvUc5azGqlveS/QbakTaTBbUMMC+pp/tmf3CftcI1EnyaiQw== X-Received: by 2002:a17:902:ccc8:b0:227:e7c7:d451 with SMTP id d9443c01a7336-22ac3f9a8fcmr17212835ad.29.1744167109526; Tue, 08 Apr 2025 19:51:49 -0700 (PDT) Received: from hsinchu26.internal.sifive.com ([210.176.154.34]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22ac7cb5463sm665725ad.195.2025.04.08.19.51.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Apr 2025 19:51:49 -0700 (PDT) From: Jim Shu To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Cc: Palmer Dabbelt , Alistair Francis , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , Jim Shu Subject: [PATCH v2 1/4] target/riscv: Add the checking into stimecmp write function. Date: Wed, 9 Apr 2025 10:51:28 +0800 Message-Id: <20250409025131.3670-2-jim.shu@sifive.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20250409025131.3670-1-jim.shu@sifive.com> References: <20250409025131.3670-1-jim.shu@sifive.com> Received-SPF: pass client-ip=2607:f8b0:4864:20::636; envelope-from=jim.shu@sifive.com; helo=mail-pl1-x636.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Preparation commit to let aclint timer to use stimecmp write function. Aclint timer doesn't call sstc() predicate so we need to check inside the stimecmp write function. Signed-off-by: Jim Shu Acked-by: Alistair Francis --- target/riscv/time_helper.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/target/riscv/time_helper.c b/target/riscv/time_helper.c index bc0d9a0c4c..aebf0798d0 100644 --- a/target/riscv/time_helper.c +++ b/target/riscv/time_helper.c @@ -46,8 +46,23 @@ void riscv_timer_write_timecmp(CPURISCVState *env, QEMUTimer *timer, { uint64_t diff, ns_diff, next; RISCVAclintMTimerState *mtimer = env->rdtime_fn_arg; - uint32_t timebase_freq = mtimer->timebase_freq; - uint64_t rtc_r = env->rdtime_fn(env->rdtime_fn_arg) + delta; + uint32_t timebase_freq; + uint64_t rtc_r; + + if (!riscv_cpu_cfg(env)->ext_sstc || !env->rdtime_fn || + !env->rdtime_fn_arg || !get_field(env->menvcfg, MENVCFG_STCE)) { + /* S/VS Timer IRQ depends on sstc extension, rdtime_fn(), and STCE. */ + return; + } + + if (timer_irq == MIP_VSTIP && + (!riscv_has_ext(env, RVH) || !get_field(env->henvcfg, HENVCFG_STCE))) { + /* VS Timer IRQ also depends on RVH and henvcfg.STCE. */ + return; + } + + timebase_freq = mtimer->timebase_freq; + rtc_r = env->rdtime_fn(env->rdtime_fn_arg) + delta; if (timecmp <= rtc_r) { /* From patchwork Wed Apr 9 02:51:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Shu X-Patchwork-Id: 14044025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id D669FC36010 for ; Wed, 9 Apr 2025 02:53:06 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u2LXi-0000tO-Fj; Tue, 08 Apr 2025 22:51:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u2LXg-0000sD-P1 for qemu-devel@nongnu.org; Tue, 08 Apr 2025 22:51:56 -0400 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u2LXf-00019a-1F for qemu-devel@nongnu.org; Tue, 08 Apr 2025 22:51:56 -0400 Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-22401f4d35aso71642155ad.2 for ; Tue, 08 Apr 2025 19:51:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1744167113; x=1744771913; darn=nongnu.org; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=34lLEwB0Gg3cwH10oPYf9tvhYdTQGgJnGI9qEibZYP8=; b=h5dXJeE8JN+k1C4AU4i2Wc9u+Ke2t5BWUKvsXgXXCSIfhjvpKnihS7sZx6F2YzFQcy KwM9Nd/I/RUwSTFSElU9lYeI4bm82yPkLX9vqmFdmWHcCN/jMVS/K0pO403/c4wC1ZaH FWZFpLVNLlDGFgGe2vQCrWwD6J16GbmUaUK39si3uADdtRVJgOBTR+6QNvPieYJbeeFh L/NvA9gLQ1jBW1IsxhhWEys8hNOyyMrVnENZk8UEGUk3y7es5ha1V0bXOhBJG/Ze5iQN De67tfcMocv3mFz389sh/zbMV2KV3eTnJCKFCg9jOxritceqlRMo0aBUARKeE01+GlWU 0yOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744167113; x=1744771913; h=references:in-reply-to:message-id:date:subject:cc:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=34lLEwB0Gg3cwH10oPYf9tvhYdTQGgJnGI9qEibZYP8=; b=EimITTMvW0we+Q9Zf9UkmWaX2QAFf3AhQ2I+Ufo5skQgHY0LZEa9bZ/suvS6HfjfCi 50uygJUQqim+jd0QKoHybam5CJNOf6un9oT0iMZs91a1ajNOOYkA2jWbYA8ssEoOj3Ng P8HN5F71Lse4It9ZtIXYvBpZbqzqgkB6LakFZ2UBeKjXh8o3ijpQ9OG3QFHYWcnMgmu+ 3yIfolro7kupgJqNC8dVgGQM54mOBrnLMWV+TCM90Olaoa18yCYuHvJMqd6uw7sJ/SYq B53MX2K8yxPwG1rX5LvXQFbyoBuNA91TSvCz7ySj1u3J7GW9EF8eu5WQUf/7u6c7N4Hb nB7A== X-Gm-Message-State: AOJu0YxtP7DA9l/4XHQTKGOJDa5Y3QTb4GRNuOhbJLVRH0HabPwZzslH rX57ydg3PY9AOQxXEocb3RQdi4v8F1/vGEC/f6bU3YqBHsgYbZ58kq2n5G6vVrCNPiPgyt06tZg WR8ddYUcsfryG4A248GsOsNqhYRXXM4vMqNN+3C6li2zn6BD5VThJQWW79fOqP3fFZq7kgCr/Cl ktnSKlIU34a1uPr5+KP008Kf7jTmtXiG9p/g== X-Gm-Gg: ASbGncu45G6If3HMYzemqoFpQrjLz0ziAUy1lY50t4M6fG14/3AupaAOXiTC/fwFUjA sdxZGynPuwfOxvzvpVSDr2WvAL8fdG56Rsu86IN3bQNwFSkEqRFS6w77VWPDUMrfwRvVRyPqJtO e/fQJllmjCXjXUHCyqBRqbhLSy99sdcC01vbo4+dyA+MiUG4m7UQalHuYmyrDpXMNiuq4gBKPH7 vST17WQwQ2CBpfxL9NEGSuvJeNypqhLJecY8sMfGsYqVIO8sLKcjAO85/KSfH6oKMxE6Wyhyeje hhXszNGILVEjB4U4NyqiT4zxCu2iMOMxkFuCO3Ssd0WZpxkfB04VkltmIL7XwWMgDsXRZw+mSxH ppA== X-Google-Smtp-Source: AGHT+IHuZxg1XkNr9HdgCzep2yi5FoOs4gQYQjdn86csPg0WTyyAoPp3Pa3tlKPVjO2/r354THkDLQ== X-Received: by 2002:a17:902:f9c3:b0:224:78e:4ebe with SMTP id d9443c01a7336-22ac2a1df74mr12899575ad.33.1744167113040; Tue, 08 Apr 2025 19:51:53 -0700 (PDT) Received: from hsinchu26.internal.sifive.com ([210.176.154.34]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22ac7cb5463sm665725ad.195.2025.04.08.19.51.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Apr 2025 19:51:52 -0700 (PDT) From: Jim Shu To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Cc: Palmer Dabbelt , Alistair Francis , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , Jim Shu Subject: [PATCH v2 2/4] hw/intc: riscv_aclint: Fix mtime write for sstc extension Date: Wed, 9 Apr 2025 10:51:29 +0800 Message-Id: <20250409025131.3670-3-jim.shu@sifive.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20250409025131.3670-1-jim.shu@sifive.com> References: <20250409025131.3670-1-jim.shu@sifive.com> Received-SPF: pass client-ip=2607:f8b0:4864:20::632; envelope-from=jim.shu@sifive.com; helo=mail-pl1-x632.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org When changing the mtime value, the period of [s|vs]timecmp timers should also be updated, similar to the period of mtimecmp timer. The period of the stimecmp timer is the time until the next S-mode timer IRQ. The value is calculated as "stimecmp - time". [1] It is equal to "stimecmp - mtime" since the time CSR is a read-only shadow of the memory-mapped mtime register. Thus, changing mtime value will update the period of stimecmp timer. Similarly, the period of vstimecmp timer is calculated as "vstimecmp - (mtime + htimedelta)" [2], so changing mtime value will update the period of vstimecmp timer. [1] RISC-V Priv spec ch 9.1.1. Supervisor Timer (stimecmp) Register A supervisor timer interrupt becomes pending, as reflected in the STIP bit in the mip and sip registers whenever time contains a value greater than or equal to stimecmp. [2] RISC-V Priv spec ch19.2.1. Virtual Supervisor Timer (vstimecmp) Register A virtual supervisor timer interrupt becomes pending, as reflected in the VSTIP bit in the hip register, whenever (time + htimedelta), truncated to 64 bits, contains a value greater than or equal to vstimecmp Signed-off-by: Jim Shu --- hw/intc/riscv_aclint.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/intc/riscv_aclint.c b/hw/intc/riscv_aclint.c index db374a7c2d..5f4a17e177 100644 --- a/hw/intc/riscv_aclint.c +++ b/hw/intc/riscv_aclint.c @@ -28,6 +28,7 @@ #include "qemu/module.h" #include "hw/sysbus.h" #include "target/riscv/cpu.h" +#include "target/riscv/time_helper.h" #include "hw/qdev-properties.h" #include "hw/intc/riscv_aclint.h" #include "qemu/timer.h" @@ -240,6 +241,10 @@ static void riscv_aclint_mtimer_write(void *opaque, hwaddr addr, riscv_aclint_mtimer_write_timecmp(mtimer, RISCV_CPU(cpu), mtimer->hartid_base + i, mtimer->timecmp[i]); + riscv_timer_write_timecmp(env, env->stimer, env->stimecmp, 0, MIP_STIP); + riscv_timer_write_timecmp(env, env->vstimer, env->vstimecmp, + env->htimedelta, MIP_VSTIP); + } return; } From patchwork Wed Apr 9 02:51:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Shu X-Patchwork-Id: 14044022 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 8D8AEC369A2 for ; Wed, 9 Apr 2025 02:52:19 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u2LXl-0000ue-1P; Tue, 08 Apr 2025 22:52:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u2LXj-0000tn-Ml for qemu-devel@nongnu.org; Tue, 08 Apr 2025 22:51:59 -0400 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u2LXi-0001AS-9G for qemu-devel@nongnu.org; Tue, 08 Apr 2025 22:51:59 -0400 Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-224191d92e4so59533755ad.3 for ; Tue, 08 Apr 2025 19:51:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1744167116; x=1744771916; darn=nongnu.org; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=RnrAzFeyhhVN5kCbVsK0iZFX3OvBg6SXh0USMwim+O0=; b=d9N1b0AgY+5F1dC8PCFIB+G/fLe9Bmh0NWGzbCRipHjbgy520vrUKmOetjNNN9Q7le OSO+cLhBVaEt3F3R546STP8e/HMuiiuU89DEYb+MHI7EjTWv7Sm2ZbxroTr3TUfPpHUX 1Yne+jCKk3cDNzc3kj7onfDdU/0vgb1wpjvC4yuCd67BBkmh1GyzJ1ROtHH0WdyRy7y5 ikxLvlgtNxRTM4fo12+8h7dLm2Rjks09aKAkABeBZ/e6JnEpalfkQV4VzCvAePmJ2htK ng5H/rHy8Hadw0xicKamxxq2ozIegGdg9wzEw7rBanbB/l/DE8FIUkrvywYzJHs/knLC ap0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744167116; x=1744771916; h=references:in-reply-to:message-id:date:subject:cc:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=RnrAzFeyhhVN5kCbVsK0iZFX3OvBg6SXh0USMwim+O0=; b=IH6g0HiY32j0mnAboBo890mGFBAlSNV6f6PSi20N8O2f6V2AMr0Xi+x530kePgmvjF CmrKek86UoNEWvCUBPabGS0Y7esSbg5RYgZZMZIbyjMnddnK/1wj9YDiE5trWZ/U2HWs xU/PcJBrpCSSRzkT5VaZ3DojMWHiXg90JOB1pubn8ACn9fmrpBXUrCY5L+TrU5vUhl41 sONCH2p5gFbDtOJpvbX+bANHT7l0Da2x2fu909BKcofsPs2hVnJuj6KJntQzmn2DMO17 iFZHo5K+dlXAdcHLYQT9fmoSJhYxaRKvOqAeojako2hpQn1z3ydpO2u7/8C0JmbhkMk0 2pYA== X-Gm-Message-State: AOJu0Yy50GL4j2EcVN/UouU1EKjIYzmw7Ftrr82y/tmUD4Wm0O46cud/ gslsWfRbfq+Kd+Ipw1XLCALK3Uf9Gtun5EJEKHGTcsm6RZE0Q140g+F8a0dmcXD91QklTMJVsbw 8JY/ggVhSwLxWraerYyxgiGxJjRMfJV0iOqw+iH1Y1+N0xHRYgpZtbj3l3UYedpUnTZaK5dBfCb I4mhsyGkiA2sih6BV9y0CKcqG++mSs//+pnA== X-Gm-Gg: ASbGncvrAMifqub+arrKrxWTD33ysHlCrgUcCI3h629ePvw51ScLUPjjq5KVsGEtKzz ZSQ31LHqSYQRWSZt/q67SS7slW4/ZxIVR4lB6DztV0IzFoGKVgtoo4epdOuYsTiBinHaGboFJzY 1LZbgpwTdqQjUNVuKyfc6GhuS2IE8x6AxfkoA4znoiL/m4OtBp05Xt5v09XiK9BWoA6k4xvwCsP Wyj7sJxDfl6zkAdWcVKYkFcI0bvM4bahXwv07muQslBTtUVFubSXnEk7UrVKMEfy77mf5lo8id2 hIOuZ72lIZNBM3l0WYLE73ySidzepKRpTgc3DykyCLUNU3PIE3vie2aiMITipQAY0/k= X-Google-Smtp-Source: AGHT+IGGslaLVHdpyphTNDAohz50hEJQ7oHY0FFaQInvSilIa5TeeVkxwn7/ot1LzImsN4zpjqYVvg== X-Received: by 2002:a17:903:3b4e:b0:229:1717:882a with SMTP id d9443c01a7336-22ac3f321e2mr12042385ad.4.1744167115812; Tue, 08 Apr 2025 19:51:55 -0700 (PDT) Received: from hsinchu26.internal.sifive.com ([210.176.154.34]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22ac7cb5463sm665725ad.195.2025.04.08.19.51.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Apr 2025 19:51:55 -0700 (PDT) From: Jim Shu To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Cc: Palmer Dabbelt , Alistair Francis , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , Jim Shu Subject: [PATCH v2 3/4] target/riscv: Fix VSTIP bit in sstc extension. Date: Wed, 9 Apr 2025 10:51:30 +0800 Message-Id: <20250409025131.3670-4-jim.shu@sifive.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20250409025131.3670-1-jim.shu@sifive.com> References: <20250409025131.3670-1-jim.shu@sifive.com> Received-SPF: pass client-ip=2607:f8b0:4864:20::62a; envelope-from=jim.shu@sifive.com; helo=mail-pl1-x62a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org VSTIP is only writable when both [mh]envcfg.STCE is enabled, or it will revert it's defined behavior as if sstc extension is not implemented. Signed-off-by: Jim Shu Acked-by: Alistair Francis --- target/riscv/csr.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/target/riscv/csr.c b/target/riscv/csr.c index 7948188356..e86808fd98 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -3635,7 +3635,14 @@ static RISCVException rmw_mip64(CPURISCVState *env, int csrno, if (riscv_cpu_cfg(env)->ext_sstc && (env->priv == PRV_M) && get_field(env->menvcfg, MENVCFG_STCE)) { /* sstc extension forbids STIP & VSTIP to be writeable in mip */ - mask = mask & ~(MIP_STIP | MIP_VSTIP); + + /* STIP is not writable when menvcfg.STCE is enabled. */ + mask = mask & ~MIP_STIP; + + /* VSTIP is not writable when both [mh]envcfg.STCE are enabled. */ + if (get_field(env->henvcfg, HENVCFG_STCE)) { + mask = mask & ~MIP_VSTIP; + } } if (mask) { From patchwork Wed Apr 9 02:51:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Shu X-Patchwork-Id: 14044024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id EBEBCC36010 for ; Wed, 9 Apr 2025 02:52:57 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u2LXo-0000vu-E1; Tue, 08 Apr 2025 22:52:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u2LXn-0000vA-0T for qemu-devel@nongnu.org; Tue, 08 Apr 2025 22:52:03 -0400 Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u2LXl-0001An-6x for qemu-devel@nongnu.org; Tue, 08 Apr 2025 22:52:02 -0400 Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-22435603572so61039815ad.1 for ; Tue, 08 Apr 2025 19:52:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1744167119; x=1744771919; darn=nongnu.org; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=O1yC7t4bFmshXR5zuXWZMZ4iZ+UYQDfScvC8lHg5VFY=; b=WpEYtVkuXEEQw4XJkZwQ7I0+TpvRnUsS10/XUP4TnCZVqlmKteim/3Y/7V1xrvGqu6 4us1shdhyEFxFUVv4JJC7Qd7c4J3PT4vl/Sr+fyKg6KYzgAm7l2OGV+dj4AATVWZBCiq JGqW7nzpQ7TB0SaUqiNvcjs+4sQMdeB2UxOsmED4+e27VgfE7HKSuIKY9lZM7k7jKzfg gol+VwT03rC4a26br0BA7z6o2iVzYNinBE5a/sh3bsbsFK3toRmpsVzBPS65/X4D2NhE WICJI3J4DcvupJMM6ADUhk7j3T5FLvSHULutD1rE9Ie6YE5WTmXu0r2nozjMXVi8DgyO wHpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744167119; x=1744771919; h=references:in-reply-to:message-id:date:subject:cc:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=O1yC7t4bFmshXR5zuXWZMZ4iZ+UYQDfScvC8lHg5VFY=; b=egm65Q+FSCSCVSEfT9FZrOX8cQYeo0WyYZJFgBwj5UFHEuidz2Z5Xy+/p8PrGGaqqq tc+hIeage6IkDBvOdmbz9GXC+L9TTFJ/MWdOm371xNVnsgZoO3OgHmgh1sXcxhrK8JXt 3sUGS0kI+eecq0PNk2UNwNZp+qPuV3ac8XaSR6fwbicqSZo3LluOE5aWb3l1eG3eR05Y 5tpqep4phVQyA1LpUIHo4ydAYygGLopbYjwINSxAk2uJNUzo0ElYL8OwbFBgYyfBjRz3 QBYG955LnF2O7qnQvLJEUjC31sfrA2kWcW8QQzMC1MaS8vzI1pzc2KE+3aEy92RmoCKM WR+A== X-Gm-Message-State: AOJu0Yx4FzTsssLDMB85J6LXWXJj1UKnyjSojtcgTwg3ojBWc4j2uxi0 U1cVLhVflmu8GYJtVxsn1JIxZIPDqjglD8ERjtrDC2lmwe+PdD3ZvsdE42QNZMGKQc+WRHrhSea R2/O2sW17NO6RLzUG4bxUwuI1Jlz4DO6ErOtIkmltZspUoZg+7F87oo+Rn4FiikjYDeB1notpy2 rCmoPlc48CdK7CGSobe+C2SAYL+QYqAnNDrg== X-Gm-Gg: ASbGncvYOdivO7Gz5TogN77bqVQow2K7FFUeS5gSVlqHiXUS1cgcSbm/p+FdwbdwUXP 3UoXIYbv1YLwAlxpB++R4pTKVM2J4L6M+RA1h1gkC7/Cf6iGu1w6YIMD34WbxJFedGHTtjSQN+H KNwtDh7bVre+57vkEvKop59Is3BtvdJvMlzQ5GKSr4P6+6dLxBNrmm2n2mqfI1wWUvcWt+KXACO GHqglvcsBuQNrkYMJqOF5DT7KcGnrFGgxicG1ZMJY7S0ydeV3b3n47goNI2Q7l44X+lZUA9ZVlx rRI3O+Xj8WC+Shx3TpYFTzfAN7iUE4ZqBeq+AVoA9iv7GIDulNMdyEezwfQNVFN3uwE= X-Google-Smtp-Source: AGHT+IE1HPHnR4Mun/8Z2/lb5Ju5lCeHrQwUsf6KjTDAz6zsmWOoRoPxdePnqCVqe+Kn1GPDlxa9Ww== X-Received: by 2002:a17:903:a06:b0:224:3c9:19ae with SMTP id d9443c01a7336-22ac2a1a5damr17161965ad.34.1744167118876; Tue, 08 Apr 2025 19:51:58 -0700 (PDT) Received: from hsinchu26.internal.sifive.com ([210.176.154.34]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22ac7cb5463sm665725ad.195.2025.04.08.19.51.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Apr 2025 19:51:58 -0700 (PDT) From: Jim Shu To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Cc: Palmer Dabbelt , Alistair Francis , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , Jim Shu Subject: [PATCH v2 4/4] target/riscv: Enable/Disable S/VS-mode Timer when STCE bit is changed Date: Wed, 9 Apr 2025 10:51:31 +0800 Message-Id: <20250409025131.3670-5-jim.shu@sifive.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20250409025131.3670-1-jim.shu@sifive.com> References: <20250409025131.3670-1-jim.shu@sifive.com> Received-SPF: pass client-ip=2607:f8b0:4864:20::62c; envelope-from=jim.shu@sifive.com; helo=mail-pl1-x62c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Updating STCE will enable/disable SSTC in S-mode or/and VS-mode, so we also need to update S/VS-mode Timer and S/VSTIP bits in $mip CSR. Signed-off-by: Jim Shu --- target/riscv/csr.c | 44 ++++++++++++++++++++++++++++++++++++ target/riscv/time_helper.c | 46 ++++++++++++++++++++++++++++++++++++++ target/riscv/time_helper.h | 1 + 3 files changed, 91 insertions(+) diff --git a/target/riscv/csr.c b/target/riscv/csr.c index e86808fd98..548daf6a7a 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -3161,6 +3161,7 @@ static RISCVException write_menvcfg(CPURISCVState *env, int csrno, const RISCVCPUConfig *cfg = riscv_cpu_cfg(env); uint64_t mask = MENVCFG_FIOM | MENVCFG_CBIE | MENVCFG_CBCFE | MENVCFG_CBZE | MENVCFG_CDE; + bool stce_changed = false; if (riscv_cpu_mxl(env) == MXL_RV64) { mask |= (cfg->ext_svpbmt ? MENVCFG_PBMTE : 0) | @@ -3186,10 +3187,19 @@ static RISCVException write_menvcfg(CPURISCVState *env, int csrno, if ((val & MENVCFG_DTE) == 0) { env->mstatus &= ~MSTATUS_SDT; } + + if (cfg->ext_sstc && + ((env->menvcfg & MENVCFG_STCE) != (val & MENVCFG_STCE))) { + stce_changed = true; + } } env->menvcfg = (env->menvcfg & ~mask) | (val & mask); write_henvcfg(env, CSR_HENVCFG, env->henvcfg); + if (stce_changed) { + riscv_timer_stce_changed(env, true, !!(val & MENVCFG_STCE)); + } + return RISCV_EXCP_NONE; } @@ -3212,6 +3222,12 @@ static RISCVException write_menvcfgh(CPURISCVState *env, int csrno, (cfg->ext_smcdeleg ? MENVCFG_CDE : 0) | (cfg->ext_ssdbltrp ? MENVCFG_DTE : 0); uint64_t valh = (uint64_t)val << 32; + bool stce_changed = false; + + if (cfg->ext_sstc && + ((env->menvcfg & MENVCFG_STCE) != (valh & MENVCFG_STCE))) { + stce_changed = true; + } if ((valh & MENVCFG_DTE) == 0) { env->mstatus &= ~MSTATUS_SDT; @@ -3220,6 +3236,10 @@ static RISCVException write_menvcfgh(CPURISCVState *env, int csrno, env->menvcfg = (env->menvcfg & ~mask) | (valh & mask); write_henvcfgh(env, CSR_HENVCFGH, env->henvcfg >> 32); + if (stce_changed) { + riscv_timer_stce_changed(env, true, !!(valh & MENVCFG_STCE)); + } + return RISCV_EXCP_NONE; } @@ -3297,8 +3317,10 @@ static RISCVException read_henvcfg(CPURISCVState *env, int csrno, static RISCVException write_henvcfg(CPURISCVState *env, int csrno, target_ulong val) { + const RISCVCPUConfig *cfg = riscv_cpu_cfg(env); uint64_t mask = HENVCFG_FIOM | HENVCFG_CBIE | HENVCFG_CBCFE | HENVCFG_CBZE; RISCVException ret; + bool stce_changed = false; ret = smstateen_acc_ok(env, 0, SMSTATEEN0_HSENVCFG); if (ret != RISCV_EXCP_NONE) { @@ -3324,6 +3346,11 @@ static RISCVException write_henvcfg(CPURISCVState *env, int csrno, get_field(val, HENVCFG_PMM) != PMM_FIELD_RESERVED) { mask |= HENVCFG_PMM; } + + if (cfg->ext_sstc && + ((env->henvcfg & HENVCFG_STCE) != (val & HENVCFG_STCE))) { + stce_changed = true; + } } env->henvcfg = val & mask; @@ -3331,6 +3358,10 @@ static RISCVException write_henvcfg(CPURISCVState *env, int csrno, env->vsstatus &= ~MSTATUS_SDT; } + if (stce_changed) { + riscv_timer_stce_changed(env, false, !!(val & HENVCFG_STCE)); + } + return RISCV_EXCP_NONE; } @@ -3352,19 +3383,32 @@ static RISCVException read_henvcfgh(CPURISCVState *env, int csrno, static RISCVException write_henvcfgh(CPURISCVState *env, int csrno, target_ulong val) { + const RISCVCPUConfig *cfg = riscv_cpu_cfg(env); uint64_t mask = env->menvcfg & (HENVCFG_PBMTE | HENVCFG_STCE | HENVCFG_ADUE | HENVCFG_DTE); uint64_t valh = (uint64_t)val << 32; RISCVException ret; + bool stce_changed = false; ret = smstateen_acc_ok(env, 0, SMSTATEEN0_HSENVCFG); if (ret != RISCV_EXCP_NONE) { return ret; } + + if (cfg->ext_sstc && + ((env->henvcfg & HENVCFG_STCE) != (valh & HENVCFG_STCE))) { + stce_changed = true; + } + env->henvcfg = (env->henvcfg & 0xFFFFFFFF) | (valh & mask); if ((env->henvcfg & HENVCFG_DTE) == 0) { env->vsstatus &= ~MSTATUS_SDT; } + + if (stce_changed) { + riscv_timer_stce_changed(env, false, !!(val & HENVCFG_STCE)); + } + return RISCV_EXCP_NONE; } diff --git a/target/riscv/time_helper.c b/target/riscv/time_helper.c index aebf0798d0..400e917354 100644 --- a/target/riscv/time_helper.c +++ b/target/riscv/time_helper.c @@ -140,6 +140,52 @@ void riscv_timer_write_timecmp(CPURISCVState *env, QEMUTimer *timer, timer_mod(timer, next); } +/* + * When disabling xenvcfg.STCE, the S/VS Timer may be disabled at the same time. + * It is safe to call this function regardless of whether the timer has been + * deleted or not. timer_del() will do nothing if the timer has already + * been deleted. + */ +static void riscv_timer_disable_timecmp(CPURISCVState *env, QEMUTimer *timer, + uint32_t timer_irq) +{ + /* Disable S-mode Timer IRQ and HW-based STIP */ + if ((timer_irq == MIP_STIP) && !get_field(env->menvcfg, MENVCFG_STCE)) { + riscv_cpu_update_mip(env, timer_irq, BOOL_TO_MASK(0)); + timer_del(timer); + return; + } + + /* Disable VS-mode Timer IRQ and HW-based VSTIP */ + if ((timer_irq == MIP_VSTIP) && + (!get_field(env->menvcfg, MENVCFG_STCE) || + !get_field(env->henvcfg, HENVCFG_STCE))) { + env->vstime_irq = 0; + riscv_cpu_update_mip(env, 0, BOOL_TO_MASK(0)); + timer_del(timer); + return; + } +} + +/* Enable or disable S/VS-mode Timer when xenvcfg.STCE is changed */ +void riscv_timer_stce_changed(CPURISCVState *env, bool is_m_mode, bool enable) +{ + if (enable) { + riscv_timer_write_timecmp(env, env->vstimer, env->vstimecmp, + env->htimedelta, MIP_VSTIP); + } else { + riscv_timer_disable_timecmp(env, env->vstimer, MIP_VSTIP); + } + + if (is_m_mode) { + if (enable) { + riscv_timer_write_timecmp(env, env->stimer, env->stimecmp, 0, MIP_STIP); + } else { + riscv_timer_disable_timecmp(env, env->stimer, MIP_STIP); + } + } +} + void riscv_timer_init(RISCVCPU *cpu) { CPURISCVState *env; diff --git a/target/riscv/time_helper.h b/target/riscv/time_helper.h index cacd79b80c..af1f634f89 100644 --- a/target/riscv/time_helper.h +++ b/target/riscv/time_helper.h @@ -25,6 +25,7 @@ void riscv_timer_write_timecmp(CPURISCVState *env, QEMUTimer *timer, uint64_t timecmp, uint64_t delta, uint32_t timer_irq); +void riscv_timer_stce_changed(CPURISCVState *env, bool is_m_mode, bool enable); void riscv_timer_init(RISCVCPU *cpu); #endif