From nobody Mon Sep 15 19:34:50 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cQZx63WWzz67wSn; Mon, 15 Sep 2025 19:34:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cQZx632MMz4Myj; Mon, 15 Sep 2025 19:34:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757964890; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Hc1e/UFpSzpgqypsIXw8O/Tblu6lgcm1E8EsZTAsNu0=; b=Yjx4Su3+CUDctNdRXuzXZHMpRQMdfEX7IKSOeb3Njjl/Vwkk3pKINmynPd4/pOlpH70w6e CG/oLp3KRA9PdR/jWUxbXW1Fb8pkJNCzt17YVUIJ9dcuYWgNsvfoqeoHgAwmlGrqLaDxE+ vrSWRuMDzpWjxhN71QrEbsr9QBG5aBv7msc+v9DXuqgmfYHo3lcRef7WbUBJaYG/9iwOK9 s9gSeAgli4k4u4/9umazMO9JfhSz81OZhPkdOgeLfvaFQYbREgYQCwrdcBl0F3SngcI9md sYMd2hthD01gXSTHVk1gHgJMLY/zydgBUjXFDPvwYT/bJwz4im4lNdb4FPgOhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757964890; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Hc1e/UFpSzpgqypsIXw8O/Tblu6lgcm1E8EsZTAsNu0=; b=fMiUM39XeMMgeXfTgdbxBCQiolBuhamrxT98BlPG8wOg1Kv60zzjlHjVyH/AzjdGpXZKde mmoLwL2un5lKRt5hmr4zfrNyY6YG/pFUn07OlQGeIeswgs5lbqjTFMXfvUqzKRDnx+XF8e r5Y7uve6MmJVq/5leidWNrid1c0bCYLYwaMDXoSAkgNIrMaD+uk9tK9aqVML+A1iMRZ+cn /7VyXjiOg8VL87lE8aU+1RiCuxoPw7d44oVLN7oQBVRnoPi02oD8J/VHO10lUYkLsDxwEk pghl2UjgfWnFr4EY8mY1LYei4we3kL9b6vjOW/ieMddQBxdz0jnX7Uux35KGEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757964890; a=rsa-sha256; cv=none; b=Z7Mw/1JCkIjdmr5QpMc/QJAZiUeZ9JVd3sRez4dmkhMGrW9lLeVABu331Ji3xmhRXopnYN LvVkSCG6j/PgRQLsx8Zu6vlz1LRFtIcpXORUDAG7tfSzxT+rInT8D0H4T1hiPIug7cWMB1 +0xNC8jvSbP9S5BjvQ6BIoCUPIXilNxq+RsdzBxbF3L3GcRRE5TsbqtaXefuYEEWu2SxO5 l7XwZjTTfBep8j7Ql1HI6cIGrPNuis3HWSpMPUe5tFMVwRcIfKiiVlz30s2/1k0nx3zTS4 MJFmCJSGFAHLb88E2l2pFNVIn9BaGI026D/Sur6LcIJZYJZ0XKJ9TBxPMGdXvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cQZx62RB9z17KV; Mon, 15 Sep 2025 19:34:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58FJYoDP092989; Mon, 15 Sep 2025 19:34:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58FJYor9092985; Mon, 15 Sep 2025 19:34:50 GMT (envelope-from git) Date: Mon, 15 Sep 2025 19:34:50 GMT Message-Id: <202509151934.58FJYor9092985@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 850182848dad - stable/13 - riscv: Fix SSTC extension support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 850182848dada6f8524e9df2a75a01aa50b09b69 Auto-Submitted: auto-generated The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=850182848dada6f8524e9df2a75a01aa50b09b69 commit 850182848dada6f8524e9df2a75a01aa50b09b69 Author: Ruslan Bukin AuthorDate: 2024-05-22 14:51:45 +0000 Commit: Mitchell Horne CommitDate: 2025-09-15 19:32:14 +0000 riscv: Fix SSTC extension support From the SSTC spec: "If the stimecmp (supervisor-mode timer compare) register is implemented, then STIP is read-only in mip and reflects the supervisor-level timer interrupt signal resulting from stimecmp. This timer interrupt signal is cleared by writing stimecmp with a value greater than the current time value." This fixes operation in Spike with sstc extension enabled. Example: spike --isa RV64IMAFDCH_zicntr_zihpm_sstc Reviewed by: mhorne Differential Revision: https://reviews.freebsd.org/D45226 (cherry picked from commit ddd0d4f4cd65341a07bb3bb833dee7982018fd60) --- sys/riscv/riscv/timer.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/riscv/riscv/timer.c b/sys/riscv/riscv/timer.c index 66131914607c..f7657130ff70 100644 --- a/sys/riscv/riscv/timer.c +++ b/sys/riscv/riscv/timer.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2015-2017 Ruslan Bukin + * Copyright (c) 2015-2024 Ruslan Bukin * All rights reserved. * * Portions of this software were developed by SRI International and the @@ -142,7 +142,10 @@ riscv_timer_intr(void *arg) sc = (struct riscv_timer_softc *)arg; - csr_clear(sip, SIP_STIP); + if (has_sstc) + csr_write(stimecmp, -1UL); + else + csr_clear(sip, SIP_STIP); if (sc->et.et_active) sc->et.et_event_cb(&sc->et, sc->et.et_arg);