From nobody Wed Mar 26 08:25:46 2025
X-Original-To: dev-commits-src-main@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 4ZN0Gz10Vdz5rZxw;
Wed, 26 Mar 2025 08:25:47 +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 "R10" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4ZN0Gz0BbXz3GVd;
Wed, 26 Mar 2025 08:25:47 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1742977547;
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=0IYM+uTQqzLC+o86vlLo8Fd9UlIATA+cGJGtscU+0TM=;
b=fK/YKQ5U4I06SBoJSY674SJAjD1mhVtHZhYGZYqpJ31Xs7qvyy3CCtP/BbwFOI9jBfsCiF
8I0MuUu3g1TVQtonM44Bw1Eb7Bba9x55QTEfVTrBqnjxPgNr371s55Qg53QWcNc4sCbZHW
CbCUHsiUFajPFDd4wgDP4NGZDKqqTZ110HHKqTyBjqMEBVS9KvGCzv7h/H4fW4mT4aCyDk
YH/G5+YEP4xCT2emzYU607dJeTLhC2Oi3SAoe1jKUM8LUf5KzlcFOSG2RZ6BdxA3FKl5qr
rBUrsK5O49SVZHK/Ub4C5nsMgdtNBFkuSoMP9vYdI4kpekm9WiAxikUYKGGoYQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742977547; a=rsa-sha256; cv=none;
b=C53goDpRkfv0/xXVcjiKQxZk4dRYkP1JJNjehVLdFrh0LhgQV5lzh3sBcM2XbNiCT92KxA
DmnPka0Pgia8NQbYSPg4W8t3i6WLBQE+ZX6q00xJG4XF0WqwkNzb59oXv02UtG60R4iAWo
PX0e4oBWBJzMW0x9LorHB8mFKfVClm/SPZMFasqDHmetFWQ18arb0Wg3STAp6xpcXxpNBR
j5abWQXL1nYWGPaV7IDn57D7O0ya0KW3UE5iS2A/dPF3eBS+BExihhLrTNgnDeFNmzGrGd
7VBeYlvz4c18COeTTqPRUDGvEZCbXGXpwuLJYgvy3mC5oE+t0JiSxHrVdE1pAQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1742977547;
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=0IYM+uTQqzLC+o86vlLo8Fd9UlIATA+cGJGtscU+0TM=;
b=EGygYdveDt1GgWDiDf+VgcOpLVbG6zJH4/4de24O9+lD3MIBXp1be+1RYvp14AaBHQtInd
jnbo9GRMBUfMH/vaE2IdJ3rTBqIvyn0lfxR5uIupepr9Za0cUvDivWJHrv5SK6VBWr+TTm
d5niNIiLgwtaCz3itMBq3v2YPbKCFIhyu3SWR/2c2FuwF3e2DZkXpVTeyjzwW6aLNWOL88
4wPEzUWPjYX2OWi8D4/4zFlc6ICRf7rvfPbie3rMYVhQSuD1mdmpSjjqLsHKyPbOSZHL3v
p26VMHkJazz88qKGqbMkaUbZgR+fx4f7WIxwRFA1v8OjJnFs/2zcZ5R2B7vy4w==
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 4ZN0Gy6YPwz1HX0;
Wed, 26 Mar 2025 08:25:46 +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 52Q8PkDT032197;
Wed, 26 Mar 2025 08:25:46 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52Q8PkJ1032194;
Wed, 26 Mar 2025 08:25:46 GMT
(envelope-from git)
Date: Wed, 26 Mar 2025 08:25:46 GMT
Message-Id: <202503260825.52Q8PkJ1032194@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Ruslan Bukin
Subject: git: 6d58c670060a - main - riscv timer: fix interrupt
handling.
List-Id: Commit messages for the main branch of the src repository
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help:
List-Post:
List-Subscribe:
List-Unsubscribe:
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: br
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 6d58c670060a17817fa0c8ebf4e7543c3d2b4523
Auto-Submitted: auto-generated
The branch main has been updated by br:
URL: https://cgit.FreeBSD.org/src/commit/?id=6d58c670060a17817fa0c8ebf4e7543c3d2b4523
commit 6d58c670060a17817fa0c8ebf4e7543c3d2b4523
Author: Ruslan Bukin
AuthorDate: 2025-03-26 08:09:50 +0000
Commit: Ruslan Bukin
CommitDate: 2025-03-26 08:22:50 +0000
riscv timer: fix interrupt handling.
Based on the spec the STIP bit of SIP register is read-only.
To clear STIP bit from supervisor we have to do an SBI call to firmware.
Upon reception of SBI request, the machine-mode firmware clears the STIP
bit in the MIP register.
This fixes operation on Codasip A730.
Reviewed by: mhorne
Differential Revision: https://reviews.freebsd.org/D49487
---
sys/riscv/riscv/timer.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys/riscv/riscv/timer.c b/sys/riscv/riscv/timer.c
index dc909082edae..652e5c8db62b 100644
--- a/sys/riscv/riscv/timer.c
+++ b/sys/riscv/riscv/timer.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2015-2024 Ruslan Bukin
+ * Copyright (c) 2015-2025 Ruslan Bukin
* All rights reserved.
*
* Portions of this software were developed by SRI International and the
@@ -146,7 +146,7 @@ riscv_timer_intr(void *arg)
if (has_sstc)
csr_write(stimecmp, -1UL);
else
- csr_clear(sip, SIP_STIP);
+ sbi_set_timer(-1UL);
if (sc->et.et_active)
sc->et.et_event_cb(&sc->et, sc->et.et_arg);