From patchwork Wed Mar 19 19:21:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Shu X-Patchwork-Id: 14023049 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 5C0D6C36000 for ; Wed, 19 Mar 2025 19:23:47 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tuyza-0007Mm-TE; Wed, 19 Mar 2025 15:22:18 -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 1tuyzY-0007LV-94 for qemu-devel@nongnu.org; Wed, 19 Mar 2025 15:22:16 -0400 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tuyzW-0002Bk-8p for qemu-devel@nongnu.org; Wed, 19 Mar 2025 15:22:15 -0400 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-225a28a511eso130577015ad.1 for ; Wed, 19 Mar 2025 12:22:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1742412132; x=1743016932; 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=JQssGOpztpWWFjOnWZYSMTHISmCvQCvOgUNRyvmYuFc=; b=ArwVeVvFQYCFlTEHdHDucckQBFFTRjDdHXpZX47f/XGhqKFKRIHZvNXAnxJd0ycdUg i9x+SdgrBc/rG5k6M5IX5/diSlN3iXh9qqfw5cxwByiZ9FCgKbdtBkLqDnt4fa5UjdQQ DqpW7Tsyxju8cda8arNTFjCy0iPMt1ckmlqLm9bwg5gWBdjvxzW9MlDQvU7ToY5wsNGn 5wAgvOKEekXe33YA8pmLXrEkL9oB4ILnj9IWwVkhiKuThxLgcs2bz2DO0rDgj6Pyr4Us 4IhqKm2RhWzPqPesjB247FAfUozs8fp5R925Qc1CwmInDHhSRhraUWHupgWC2OLvXaPm V9/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742412132; x=1743016932; 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=JQssGOpztpWWFjOnWZYSMTHISmCvQCvOgUNRyvmYuFc=; b=Dy4RPsNaX7C6loIcSX3DYKaFdMsJtEduPuybuOfHTbbiNDIw7tIALLcKqI7rx8WbBd OwI6kduuAwxZjCBS6oI6i6EVvRnqfdkwVEZl3NCro+f58qXnBocZXf7bhe0eUyiPsIDN V8Xk/tNDprrcaXLxBW7/nN++90YidlsqvQRyv+a0ajRLebSUk9p+itXgY7zHSPgVHu5/ tUQLdkzlID6StT01rLQ78XpN5klvgur5VEF64cyjVIAEpZZ2mP0RjNqXJ1NzpVnoLfe0 Pq2l4N0fJpL+N9UJO3EdPw+v05KrDEr4JdyPfWIj8VhtKopoImBp1KvdAfzeb4vZE4M6 ksvw== X-Gm-Message-State: AOJu0Yywbophntq3jlN170mkfqYcR3qAbrZ1x+UTN4VtHip9J+fe0jfg I8p/DmgJHxHtyiMG9uM7PrPda1zOcz030kn3emP1FKXzo+conBwai0/HCOMd3a8/PPHC0YQNvay aARRHCPvM78EN1qIc3XjQH+GnUKaFs5/hEoVo2J4ptcqemM5s6/mzy9bmP1G9RSs0SE5x0amOMg nBxFZwGokX9JGTG135tycfpSt9dHnxLB2K3w== X-Gm-Gg: ASbGncs1h1Q/8X+FKIIxR5ABPNi9MvQeqRFU6QJhcLpdmST2QRR/srjYtBDwiGhib1k 7FE3Lp806jSZ96VcFQZuNg+CEoJlEOEYUBEfjr4aTTDmON3O3DfhEA1hM8zxar4ANMi9K/iRyHT 0lniZ3urOTVn3sGEziYkkC4ssPgzkgE9C6RKDd5CV0Dg/R/MqtdMtcyn5h7x3iRSKOa7KYTXTCb DytrHj0XLbmK4nV9jq4oihueCMh6zH81+5BSVuxViYld8UtxxMeLDr3QEJjfSKrNaEglHFsvZbf fZ7MrgxMaRTGy5nN24nnxYj8DVgxgEIx54tUbyn8o+9p5YsebjMeZBCbuxjcJLg2cxo= X-Google-Smtp-Source: AGHT+IFOBEEk6Zvcy0YZNa94DqJbNRt8nM7g2pXo7E0hp0OY+ylUnVnSde/3M7z7paZURqHpnqVpBQ== X-Received: by 2002:a05:6a21:48c:b0:1f5:7eb5:72dc with SMTP id adf61e73a8af0-1fbeb1854b1mr6743816637.3.1742412132248; Wed, 19 Mar 2025 12:22:12 -0700 (PDT) Received: from hsinchu26.internal.sifive.com ([210.176.154.34]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af56ea947a4sm11432175a12.70.2025.03.19.12.22.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Mar 2025 12:22:11 -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 1/4] target/riscv: Add the checking into stimecmp write function. Date: Thu, 20 Mar 2025 03:21:50 +0800 Message-Id: <20250319192153.28549-2-jim.shu@sifive.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20250319192153.28549-1-jim.shu@sifive.com> References: <20250319192153.28549-1-jim.shu@sifive.com> Received-SPF: pass client-ip=2607:f8b0:4864:20::62d; envelope-from=jim.shu@sifive.com; helo=mail-pl1-x62d.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) { /*