From: James Raphael Tiovalen <jamestiotio@gmail.com>
To: kvm@vger.kernel.org, kvm-riscv@lists.infradead.org
Cc: andrew.jones@linux.dev, atishp@rivosinc.com,
cade.richard@berkeley.edu,
James Raphael Tiovalen <jamestiotio@gmail.com>
Subject: [kvm-unit-tests PATCH 3/4] riscv: Add methods to toggle interrupt enable bits
Date: Wed, 19 Jun 2024 01:30:52 +0800 [thread overview]
Message-ID: <20240618173053.364776-4-jamestiotio@gmail.com> (raw)
In-Reply-To: <20240618173053.364776-1-jamestiotio@gmail.com>
Add some helper methods to toggle the interrupt enable bits in the SIE
register.
Signed-off-by: James Raphael Tiovalen <jamestiotio@gmail.com>
---
riscv/Makefile | 1 +
lib/riscv/asm/csr.h | 7 +++++++
lib/riscv/asm/interrupt.h | 12 ++++++++++++
lib/riscv/interrupt.c | 39 +++++++++++++++++++++++++++++++++++++++
4 files changed, 59 insertions(+)
create mode 100644 lib/riscv/asm/interrupt.h
create mode 100644 lib/riscv/interrupt.c
diff --git a/riscv/Makefile b/riscv/Makefile
index 919a3ebb..108d4481 100644
--- a/riscv/Makefile
+++ b/riscv/Makefile
@@ -30,6 +30,7 @@ cflatobjs += lib/memregions.o
cflatobjs += lib/on-cpus.o
cflatobjs += lib/vmalloc.o
cflatobjs += lib/riscv/bitops.o
+cflatobjs += lib/riscv/interrupt.o
cflatobjs += lib/riscv/io.o
cflatobjs += lib/riscv/isa.o
cflatobjs += lib/riscv/mmu.o
diff --git a/lib/riscv/asm/csr.h b/lib/riscv/asm/csr.h
index c1777744..da58b0ce 100644
--- a/lib/riscv/asm/csr.h
+++ b/lib/riscv/asm/csr.h
@@ -4,15 +4,22 @@
#include <linux/const.h>
#define CSR_SSTATUS 0x100
+#define CSR_SIE 0x104
#define CSR_STVEC 0x105
#define CSR_SSCRATCH 0x140
#define CSR_SEPC 0x141
#define CSR_SCAUSE 0x142
#define CSR_STVAL 0x143
+#define CSR_SIP 0x144
#define CSR_SATP 0x180
#define SSTATUS_SIE (_AC(1, UL) << 1)
+#define SIE_SSIE (_AC(1, UL) << 1)
+#define SIE_STIE (_AC(1, UL) << 5)
+#define SIE_SEIE (_AC(1, UL) << 9)
+#define SIE_LCOFIE (_AC(1, UL) << 13)
+
/* Exception cause high bit - is an interrupt if set */
#define CAUSE_IRQ_FLAG (_AC(1, UL) << (__riscv_xlen - 1))
diff --git a/lib/riscv/asm/interrupt.h b/lib/riscv/asm/interrupt.h
new file mode 100644
index 00000000..b760afbb
--- /dev/null
+++ b/lib/riscv/asm/interrupt.h
@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+#ifndef _ASMRISCV_INTERRUPT_H_
+#define _ASMRISCV_INTERRUPT_H_
+
+#include <stdbool.h>
+
+void toggle_software_interrupt(bool enable);
+void toggle_timer_interrupt(bool enable);
+void toggle_external_interrupt(bool enable);
+void toggle_local_cof_interrupt(bool enable);
+
+#endif /* _ASMRISCV_INTERRUPT_H_ */
diff --git a/lib/riscv/interrupt.c b/lib/riscv/interrupt.c
new file mode 100644
index 00000000..bc0e16f1
--- /dev/null
+++ b/lib/riscv/interrupt.c
@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (C) 2024, James Raphael Tiovalen <jamestiotio@gmail.com>
+ */
+#include <libcflat.h>
+#include <asm/csr.h>
+#include <asm/interrupt.h>
+
+void toggle_software_interrupt(bool enable)
+{
+ if (enable)
+ csr_set(CSR_SIE, SIE_SSIE);
+ else
+ csr_clear(CSR_SIE, SIE_SSIE);
+}
+
+void toggle_timer_interrupt(bool enable)
+{
+ if (enable)
+ csr_set(CSR_SIE, SIE_STIE);
+ else
+ csr_clear(CSR_SIE, SIE_STIE);
+}
+
+void toggle_external_interrupt(bool enable)
+{
+ if (enable)
+ csr_set(CSR_SIE, SIE_SEIE);
+ else
+ csr_clear(CSR_SIE, SIE_SEIE);
+}
+
+void toggle_local_cof_interrupt(bool enable)
+{
+ if (enable)
+ csr_set(CSR_SIE, SIE_LCOFIE);
+ else
+ csr_clear(CSR_SIE, SIE_LCOFIE);
+}
--
2.43.0
next prev parent reply other threads:[~2024-06-18 17:32 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-18 17:30 [kvm-unit-tests PATCH 0/4] riscv: sbi: Add support to test timer extension James Raphael Tiovalen
2024-06-18 17:30 ` [kvm-unit-tests PATCH 1/4] riscv: Extend exception handling support for interrupts James Raphael Tiovalen
2024-06-18 17:30 ` [kvm-unit-tests PATCH 2/4] riscv: Update exception cause list James Raphael Tiovalen
2024-06-19 8:30 ` Andrew Jones
2024-06-19 13:35 ` James R T
2024-06-18 17:30 ` James Raphael Tiovalen [this message]
2024-06-19 8:39 ` [kvm-unit-tests PATCH 3/4] riscv: Add methods to toggle interrupt enable bits Andrew Jones
2024-06-19 13:40 ` James R T
2024-06-18 17:30 ` [kvm-unit-tests PATCH 4/4] riscv: sbi: Add test for timer extension James Raphael Tiovalen
2024-07-04 16:06 ` Andrew Jones
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240618173053.364776-4-jamestiotio@gmail.com \
--to=jamestiotio@gmail.com \
--cc=andrew.jones@linux.dev \
--cc=atishp@rivosinc.com \
--cc=cade.richard@berkeley.edu \
--cc=kvm-riscv@lists.infradead.org \
--cc=kvm@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox