You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ac...@apache.org on 2024/07/31 15:43:11 UTC
(nuttx) branch master updated (780366de62 -> b35f7aed48)
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
from 780366de62 tools: nxstyle if statement check
new 5f70307111 arch/risc-v: introduce AIA support
new b35f7aed48 arch/risc-v: qemu: add AIA support
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../risc-v/qemu-rv/boards/rv-virt/index.rst | 16 +-
arch/risc-v/Kconfig | 24 ++
arch/risc-v/include/csr.h | 180 +++++++++++++
arch/risc-v/include/mode.h | 12 +
arch/risc-v/src/common/CMakeLists.txt | 8 +
arch/risc-v/src/common/Make.defs | 4 +
arch/risc-v/src/common/riscv_aia.h | 290 +++++++++++++++++++++
.../bl602_irq_dispatch.c => common/riscv_aplic.c} | 55 ++--
.../risc-v/src/common/riscv_imsic.c | 47 ++--
arch/risc-v/src/common/riscv_internal.h | 32 +++
arch/risc-v/src/qemu-rv/chip.h | 1 +
.../src/qemu-rv/hardware/qemu_rv_aplic.h} | 11 +-
arch/risc-v/src/qemu-rv/hardware/qemu_rv_clint.h | 2 +
.../src/qemu-rv/hardware/qemu_rv_memorymap.h | 8 +
arch/risc-v/src/qemu-rv/qemu_rv_irq.c | 99 ++++++-
arch/risc-v/src/qemu-rv/qemu_rv_irq_dispatch.c | 102 ++++++--
16 files changed, 806 insertions(+), 85 deletions(-)
create mode 100644 arch/risc-v/src/common/riscv_aia.h
copy arch/risc-v/src/{bl602/bl602_irq_dispatch.c => common/riscv_aplic.c} (55%)
copy libs/libc/queue/sq_remafter.c => arch/risc-v/src/common/riscv_imsic.c (63%)
copy arch/{arm/src/mps/chip.h => risc-v/src/qemu-rv/hardware/qemu_rv_aplic.h} (83%)
(nuttx) 02/02: arch/risc-v: qemu: add AIA support
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit b35f7aed4891920a387bfdc3b8f3b9f5f60b5e55
Author: Inochi Amaoto <in...@outlook.com>
AuthorDate: Sun May 12 20:16:37 2024 +0800
arch/risc-v: qemu: add AIA support
Implement AIA support for qemu rv-virt.
Signed-off-by: Inochi Amaoto <in...@outlook.com>
---
.../risc-v/qemu-rv/boards/rv-virt/index.rst | 16 +++-
arch/risc-v/src/qemu-rv/chip.h | 1 +
.../{qemu_rv_memorymap.h => qemu_rv_aplic.h} | 20 ++--
arch/risc-v/src/qemu-rv/hardware/qemu_rv_clint.h | 2 +
.../src/qemu-rv/hardware/qemu_rv_memorymap.h | 8 ++
arch/risc-v/src/qemu-rv/qemu_rv_irq.c | 99 +++++++++++++++++++-
arch/risc-v/src/qemu-rv/qemu_rv_irq_dispatch.c | 102 ++++++++++++++++-----
7 files changed, 210 insertions(+), 38 deletions(-)
diff --git a/Documentation/platforms/risc-v/qemu-rv/boards/rv-virt/index.rst b/Documentation/platforms/risc-v/qemu-rv/boards/rv-virt/index.rst
index 9a17aae940..cc9b7aa0b9 100644
--- a/Documentation/platforms/risc-v/qemu-rv/boards/rv-virt/index.rst
+++ b/Documentation/platforms/risc-v/qemu-rv/boards/rv-virt/index.rst
@@ -34,7 +34,21 @@ Build and install ``qemu``::
$ make
$ sudo make install
-QEMU 7.2.9 or later and OpenSBI v1.1 or later (usually shipped with QEMU) is required, to support RISC-V "Sstc" Extension. It is also recommended to use the latest QEMU and OpenSBI.
+Minimum Requirement
+===================
+
+The table below lists all the minimum versions for QEMU and OpenSBI.
+For stability, it is also recommended to use the latest QEMU and OpenSBI.
+
++----------------------------+--------------+-----------------+
+| Extension | QEMU Version | OpenSBI Version |
++============================+==============+=================+
+| No extension | 6.2.0 | v1.0 |
++----------------------------+--------------+-----------------+
+| SSTC | 7.2.9 | v1.1 |
++----------------------------+--------------+-----------------+
+| AIA | 8.2.0 | v1.2 |
++----------------------------+--------------+-----------------+
For users who wish to use their own OpenSBI, please refer to `OpenSBI repository <https://github.com/riscv-software-src/opensbi>`_.
diff --git a/arch/risc-v/src/qemu-rv/chip.h b/arch/risc-v/src/qemu-rv/chip.h
index 604aca3c2f..005ce39459 100644
--- a/arch/risc-v/src/qemu-rv/chip.h
+++ b/arch/risc-v/src/qemu-rv/chip.h
@@ -34,6 +34,7 @@
#include "hardware/qemu_rv_clint.h"
#include "hardware/qemu_rv_memorymap.h"
#include "hardware/qemu_rv_plic.h"
+#include "hardware/qemu_rv_aplic.h"
#include "riscv_internal.h"
#include "riscv_percpu.h"
diff --git a/arch/risc-v/src/qemu-rv/hardware/qemu_rv_memorymap.h b/arch/risc-v/src/qemu-rv/hardware/qemu_rv_aplic.h
similarity index 71%
copy from arch/risc-v/src/qemu-rv/hardware/qemu_rv_memorymap.h
copy to arch/risc-v/src/qemu-rv/hardware/qemu_rv_aplic.h
index ce821fe32c..699757abaa 100644
--- a/arch/risc-v/src/qemu-rv/hardware/qemu_rv_memorymap.h
+++ b/arch/risc-v/src/qemu-rv/hardware/qemu_rv_aplic.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/risc-v/src/qemu-rv/hardware/qemu_rv_memorymap.h
+ * arch/risc-v/src/qemu-rv/hardware/qemu_rv_aplic.h
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -18,19 +18,19 @@
*
****************************************************************************/
-#ifndef __ARCH_RISCV_SRC_QEMU_RV_HARDWARE_QEMU_RV_MEMORYMAP_H
-#define __ARCH_RISCV_SRC_QEMU_RV_HARDWARE_QEMU_RV_MEMORYMAP_H
+#ifndef __ARCH_RISCV_SRC_QEMU_RV_HARDWARE_QEMU_RV_APLIC_H
+#define __ARCH_RISCV_SRC_QEMU_RV_HARDWARE_QEMU_RV_APLIC_H
/****************************************************************************
- * Pre-processor Definitions
+ * Included Files
****************************************************************************/
-/* Register Base Address ****************************************************/
+#include <nuttx/config.h>
-#define QEMU_RV_CLINT_BASE 0x02000000
-#define QEMU_RV_ACLINT_BASE 0x02f00000
-#define QEMU_RV_PLIC_BASE 0x0c000000
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
-#define QEMU_RV_RESET_BASE 0x100000
+#define QEMU_RV_APLIC_NR_IRQ 0x60
-#endif /* __ARCH_RISCV_SRC_QEMU_RV_HARDWARE_QEMU_RV_MEMORYMAP_H */
+#endif /* __ARCH_RISCV_SRC_QEMU_RV_HARDWARE_QEMU_RV_APLIC_H */
diff --git a/arch/risc-v/src/qemu-rv/hardware/qemu_rv_clint.h b/arch/risc-v/src/qemu-rv/hardware/qemu_rv_clint.h
index 65014cc26c..b385ebd08c 100644
--- a/arch/risc-v/src/qemu-rv/hardware/qemu_rv_clint.h
+++ b/arch/risc-v/src/qemu-rv/hardware/qemu_rv_clint.h
@@ -34,10 +34,12 @@
#define RISCV_CLINT_MSIP QEMU_RV_CLINT_MSIP
#define RISCV_ACLINT_SSIP QEMU_RV_ACLINT_SSIP
+#ifndef CONFIG_ARCH_RV_USE_IMSIC_IPI
#ifdef CONFIG_ARCH_USE_S_MODE
# define RISCV_IPI RISCV_ACLINT_SSIP
#else
# define RISCV_IPI RISCV_CLINT_MSIP
#endif
+#endif
#endif /* __ARCH_RISCV_SRC_QEMU_RV_HARDWARE_QEMU_RV_CLINT_H */
diff --git a/arch/risc-v/src/qemu-rv/hardware/qemu_rv_memorymap.h b/arch/risc-v/src/qemu-rv/hardware/qemu_rv_memorymap.h
index ce821fe32c..420cefefe9 100644
--- a/arch/risc-v/src/qemu-rv/hardware/qemu_rv_memorymap.h
+++ b/arch/risc-v/src/qemu-rv/hardware/qemu_rv_memorymap.h
@@ -33,4 +33,12 @@
#define QEMU_RV_RESET_BASE 0x100000
+#ifdef CONFIG_ARCH_USE_S_MODE
+# define QEMU_RV_APLIC_BASE 0x0d000000
+# define QEMU_RV_IMSIC_BASE 0x28000000
+#else
+# define QEMU_RV_APLIC_BASE 0x0c000000
+# define QEMU_RV_IMSIC_BASE 0x24000000
+#endif
+
#endif /* __ARCH_RISCV_SRC_QEMU_RV_HARDWARE_QEMU_RV_MEMORYMAP_H */
diff --git a/arch/risc-v/src/qemu-rv/qemu_rv_irq.c b/arch/risc-v/src/qemu-rv/qemu_rv_irq.c
index 202cedab44..145a56d591 100644
--- a/arch/risc-v/src/qemu-rv/qemu_rv_irq.c
+++ b/arch/risc-v/src/qemu-rv/qemu_rv_irq.c
@@ -34,6 +34,7 @@
#include "riscv_internal.h"
#include "riscv_ipi.h"
+#include "riscv_aia.h"
#include "chip.h"
/****************************************************************************
@@ -52,8 +53,12 @@ void up_irqinitialize(void)
/* Disable all global interrupts */
+#ifndef CONFIG_ARCH_RV_HAVE_APLIC
putreg32(0x0, QEMU_RV_PLIC_ENABLE1);
putreg32(0x0, QEMU_RV_PLIC_ENABLE2);
+#else
+ riscv_aplic_disable_irqs(QEMU_RV_APLIC_BASE, QEMU_RV_APLIC_NR_IRQ);
+#endif
/* Colorize the interrupt stack for debug purposes */
@@ -62,10 +67,31 @@ void up_irqinitialize(void)
riscv_stack_color(g_intstackalloc, intstack_size);
#endif
- /* Set priority for all global interrupts to 1 (lowest) */
-
int id;
+#ifdef CONFIG_ARCH_RV_HAVE_IMSIC
+ /* Set default IRQ target hart index to 0 and EIID */
+
+ for (id = 0; id < QEMU_RV_APLIC_NR_IRQ; id++)
+ {
+ riscv_aplic_configure_irq(QEMU_RV_APLIC_BASE, id + 1, 0, id + 1);
+ }
+
+ riscv_aplic_init_msi(QEMU_RV_APLIC_BASE, QEMU_RV_IMSIC_BASE, 0, 3, 0, 0);
+#elif defined(CONFIG_ARCH_RV_HAVE_APLIC)
+ /* Set default IRQ target hart index to 0 and priority */
+
+ for (id = 0; id < QEMU_RV_APLIC_NR_IRQ; id++)
+ {
+ riscv_aplic_configure_irq(QEMU_RV_APLIC_BASE, id + 1,
+ RISCV_APLIC_DEFAULT_PRIORITY, 0);
+ }
+
+ riscv_aplic_init(QEMU_RV_APLIC_BASE, RISCV_APLIC_ENABLE_IDELIVERY,
+ RISCV_APLIC_ENABLE_ITHRESHOLD);
+#else
+ /* Set priority for all global interrupts to 1 (lowest) */
+
for (id = 1; id <= 52; id++)
{
putreg32(1, (uintptr_t)(QEMU_RV_PLIC_PRIORITY + 4 * id));
@@ -74,6 +100,7 @@ void up_irqinitialize(void)
/* Set irq threshold to 0 (permits all global interrupts) */
putreg32(0, QEMU_RV_PLIC_THRESHOLD);
+#endif
/* Attach the common interrupt handler */
@@ -84,8 +111,12 @@ void up_irqinitialize(void)
riscv_ipi_clear(0);
+#ifdef CONFIG_ARCH_RV_USE_IMSIC_IPI
+ riscv_imsic_local_eie_enable(RISCV_IMSIC_IPI_ID);
+#else
up_enable_irq(RISCV_IRQ_SOFT);
#endif
+#endif
#ifndef CONFIG_SUPPRESS_INTERRUPTS
@@ -119,6 +150,24 @@ void up_disable_irq(int irq)
CLEAR_CSR(CSR_IE, IE_TIE);
}
+ else if (irq == RISCV_IRQ_EXT)
+ {
+ /* Read m/sstatus & clear external interrupt enable in m/sie */
+
+ CLEAR_CSR(CSR_IE, IE_EIE);
+
+#ifdef CONFIG_ARCH_RV_HAVE_IMSIC
+ /* Set IMSIC irq threshold to 0 (permits all global interrupts) */
+
+ riscv_imsic_csr_write(ISELECT_EITHRESHOLD,
+ RISCV_IMSIC_DISABLE_EITHRESHOLD);
+
+ /* Enable irq delivery for IMSIC */
+
+ riscv_imsic_csr_write(ISELECT_EIDELIVERY,
+ RISCV_IMSIC_DISABLE_EIDELIVERY);
+#endif
+ }
else if (irq > RISCV_IRQ_EXT)
{
extirq = irq - RISCV_IRQ_EXT;
@@ -127,8 +176,15 @@ void up_disable_irq(int irq)
if (0 <= extirq && extirq <= 63)
{
+#ifndef CONFIG_ARCH_RV_HAVE_APLIC
modifyreg32(QEMU_RV_PLIC_ENABLE1 + (4 * (extirq / 32)),
1 << (extirq % 32), 0);
+#else
+ riscv_aplic_disable_irq(QEMU_RV_APLIC_BASE, extirq);
+#endif
+#ifdef CONFIG_ARCH_RV_HAVE_IMSIC
+ riscv_imsic_local_eie_disable(extirq);
+#endif
}
else
{
@@ -161,6 +217,24 @@ void up_enable_irq(int irq)
SET_CSR(CSR_IE, IE_TIE);
}
+ else if (irq == RISCV_IRQ_EXT)
+ {
+ /* Read m/sstatus & set external interrupt enable in m/sie */
+
+ SET_CSR(CSR_IE, IE_EIE);
+
+#ifdef CONFIG_ARCH_RV_HAVE_IMSIC
+ /* Set IMSIC irq threshold to 0 (permits all global interrupts) */
+
+ riscv_imsic_csr_write(ISELECT_EITHRESHOLD,
+ RISCV_IMSIC_ENABLE_EITHRESHOLD);
+
+ /* Enable irq delivery for IMSIC */
+
+ riscv_imsic_csr_write(ISELECT_EIDELIVERY,
+ RISCV_IMSIC_ENABLE_EIDELIVERY);
+#endif
+ }
else if (irq > RISCV_IRQ_EXT)
{
extirq = irq - RISCV_IRQ_EXT;
@@ -169,8 +243,18 @@ void up_enable_irq(int irq)
if (0 <= extirq && extirq <= 63)
{
+#ifndef CONFIG_ARCH_RV_HAVE_APLIC
modifyreg32(QEMU_RV_PLIC_ENABLE1 + (4 * (extirq / 32)),
0, 1 << (extirq % 32));
+#else
+ riscv_aplic_configure_irq(QEMU_RV_APLIC_BASE, extirq,
+ RISCV_APLIC_SOURCECFG_SM_EDGE_RISE,
+ riscv_mhartid());
+#ifdef CONFIG_ARCH_RV_HAVE_IMSIC
+ riscv_imsic_local_eie_enable(extirq);
+#endif
+ riscv_aplic_enable_irq(QEMU_RV_APLIC_BASE, extirq);
+#endif
}
else
{
@@ -185,11 +269,20 @@ irqstate_t up_irq_enable(void)
/* Enable external interrupts (mie/sie) */
- SET_CSR(CSR_IE, IE_EIE);
+ up_enable_irq(RISCV_IRQ_EXT);
/* Read and enable global interrupts (M/SIE) in m/sstatus */
oldstat = READ_AND_SET_CSR(CSR_STATUS, STATUS_IE);
+ /* Enable APLIC irq */
+#ifdef CONFIG_ARCH_RV_HAVE_IMSIC
+ modifyreg32(QEMU_RV_APLIC_BASE + RISCV_APLIC_DOMAINCFG, 0x0,
+ RISCV_APLIC_DOMAINCFG_IE | RISCV_APLIC_DOMAINCFG_DM);
+#elif defined(CONFIG_ARCH_RV_HAVE_APLIC)
+ modifyreg32(QEMU_RV_APLIC_BASE + RISCV_APLIC_DOMAINCFG, 0x0,
+ RISCV_APLIC_DOMAINCFG_IE);
+#endif
+
return oldstat;
}
diff --git a/arch/risc-v/src/qemu-rv/qemu_rv_irq_dispatch.c b/arch/risc-v/src/qemu-rv/qemu_rv_irq_dispatch.c
index e397d74223..1821a4cd5b 100644
--- a/arch/risc-v/src/qemu-rv/qemu_rv_irq_dispatch.c
+++ b/arch/risc-v/src/qemu-rv/qemu_rv_irq_dispatch.c
@@ -32,6 +32,7 @@
#include <sys/types.h>
#include "riscv_internal.h"
+#include "riscv_aia.h"
#include "hardware/qemu_rv_memorymap.h"
#include "hardware/qemu_rv_plic.h"
@@ -39,49 +40,102 @@
* Pre-processor Definitions
****************************************************************************/
-#ifdef CONFIG_ARCH_RV32
-# define RV_IRQ_MASK 27
-#else
-# define RV_IRQ_MASK 59
-#endif
-
/****************************************************************************
* Public Functions
****************************************************************************/
-/****************************************************************************
- * riscv_dispatch_irq
- ****************************************************************************/
-
-void *riscv_dispatch_irq(uintreg_t vector, uintreg_t *regs)
+#ifdef CONFIG_ARCH_RV_HAVE_IMSIC
+static void *riscv_dispatch_irq_ext(uintreg_t irq, uintreg_t *regs)
{
- int irq = (vector >> RV_IRQ_MASK) | (vector & 0xf);
+ int extirq;
- /* Firstly, check if the irq is machine external interrupt */
+ while ((extirq = SWAP_CSR(CSR_TOPEI, 0)) != 0)
+ {
+ extirq = (extirq >> TOPI_IID_SHIFT) + irq;
+ regs = riscv_doirq(extirq, regs);
+ }
+
+ return regs;
+}
+#elif defined(CONFIG_ARCH_RV_HAVE_APLIC)
+static void *riscv_dispatch_irq_ext(uintreg_t irq, uintreg_t *regs)
+{
+ int extirq;
+ int hartid = riscv_mhartid();
+ uintptr_t aplic_base = RISCV_APLIC_IDC(QEMU_RV_APLIC_BASE, hartid) +
+ RISCV_APLIC_IDC_CLAIMI;
- if (RISCV_IRQ_EXT == irq)
+ while ((extirq = getreg32(aplic_base)) != 0)
{
- uintptr_t val = getreg32(QEMU_RV_PLIC_CLAIM);
+ extirq = (extirq >> RISCV_APLIC_IDC_TOPI_ID_SHIFT) + irq;
+ regs = riscv_doirq(extirq, regs);
+ }
- /* Add the value to nuttx irq which is offset to the mext */
+ return regs;
+}
+#else
+static void *riscv_dispatch_irq_ext(uintreg_t irq, uintreg_t *regs)
+{
+ int extirq;
- irq += val;
+ while ((extirq = getreg32(QEMU_RV_PLIC_CLAIM)) != 0)
+ {
+ regs = riscv_doirq(irq + extirq, regs);
+ putreg32(extirq, QEMU_RV_PLIC_CLAIM);
}
- /* EXT means no interrupt */
+ return regs;
+}
+#endif
- if (RISCV_IRQ_EXT != irq)
+#ifdef CONFIG_ARCH_RV_EXT_AIA
+static void *riscv_dispatch_async_irq(uintreg_t irq, uintreg_t *regs)
+{
+ while ((irq = READ_CSR(CSR_TOPI)) != 0)
{
- /* Deliver the IRQ */
+ irq = (irq >> TOPI_IID_SHIFT) + RISCV_IRQ_ASYNC;
+
+ if (RISCV_IRQ_EXT == irq)
+ {
+ regs = riscv_dispatch_irq_ext(irq, regs);
+ }
+ else
+ {
+ regs = riscv_doirq(irq, regs);
+ }
+ }
+ return regs;
+}
+#else
+static void *riscv_dispatch_async_irq(uintreg_t irq, uintreg_t *regs)
+{
+ irq += RISCV_IRQ_ASYNC;
+
+ if (irq == RISCV_IRQ_EXT)
+ {
+ regs = riscv_dispatch_irq_ext(irq, regs);
+ }
+ else
+ {
regs = riscv_doirq(irq, regs);
}
- if (RISCV_IRQ_EXT <= irq)
- {
- /* Then write PLIC_CLAIM to clear pending in PLIC */
+ return regs;
+}
+#endif
+
+void *riscv_dispatch_irq(uintreg_t vector, uintreg_t *regs)
+{
+ int irq = vector & (~RISCV_IRQ_BIT);
- putreg32(irq - RISCV_IRQ_EXT, QEMU_RV_PLIC_CLAIM);
+ if ((vector & RISCV_IRQ_BIT) != 0)
+ {
+ regs = riscv_dispatch_async_irq(irq, regs);
+ }
+ else
+ {
+ regs = riscv_doirq(irq, regs);
}
return regs;
(nuttx) 01/02: arch/risc-v: introduce AIA support
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 5f70307111eeeebd48ae65788dd8112d2d7114c0
Author: Inochi Amaoto <in...@outlook.com>
AuthorDate: Sun May 12 20:15:58 2024 +0800
arch/risc-v: introduce AIA support
Advanced Interrupt Architecture (AIA) introduces flexiable interrupt
controll for RISC-V. It includes three parts: AIA CSRs, Incoming Message
Signaled Interrupt Controller (IMSIC) and Advanced Platform-Level
Interrupt Controller (APLIC).
Signed-off-by: Inochi Amaoto <in...@outlook.com>
---
arch/risc-v/Kconfig | 24 +++
arch/risc-v/include/csr.h | 180 ++++++++++++++++++++
arch/risc-v/include/mode.h | 12 ++
arch/risc-v/src/common/CMakeLists.txt | 8 +
arch/risc-v/src/common/Make.defs | 4 +
arch/risc-v/src/common/riscv_aia.h | 290 ++++++++++++++++++++++++++++++++
arch/risc-v/src/common/riscv_aplic.c | 61 +++++++
arch/risc-v/src/common/riscv_imsic.c | 63 +++++++
arch/risc-v/src/common/riscv_internal.h | 32 ++++
9 files changed, 674 insertions(+)
diff --git a/arch/risc-v/Kconfig b/arch/risc-v/Kconfig
index d8da0c5d85..17361b7231 100644
--- a/arch/risc-v/Kconfig
+++ b/arch/risc-v/Kconfig
@@ -553,6 +553,30 @@ config ARCH_RV_EXT_SSTC
default n
depends on ARCH_USE_S_MODE
+config ARCH_RV_HAVE_APLIC
+ bool "Enable RISC-V Advanced Platform-Level Interrupt Controller support"
+ default n
+ ---help---
+ Instead of PLIC, RISC-V also defines Advanced Platform-Level Interrupt
+ Controller (APLIC) to provide flexible interrupt control. This device
+ is not backward compatible with PLIC.
+
+config ARCH_RV_EXT_AIA
+ bool "Enable RISC-V SxAIA support"
+ default n
+ ---help---
+ Advanced Interrupt Architecture defines necessary features that
+ impact the ISA at a hart. This should not be selected if the
+ target does not support SxAIA for the operating mode of NuttX.
+
+if ARCH_RV_EXT_AIA
+
+config ARCH_RV_HAVE_IMSIC
+ bool "Enable RISC-V AIA Incoming Message Controller support"
+ default n
+
+endif # ARCH_RV_EXT_AIA
+
choice
prompt "Toolchain Selection"
default RISCV_TOOLCHAIN_GNU_RV64
diff --git a/arch/risc-v/include/csr.h b/arch/risc-v/include/csr.h
index a75d63844d..2350982313 100644
--- a/arch/risc-v/include/csr.h
+++ b/arch/risc-v/include/csr.h
@@ -390,6 +390,31 @@
#define MISELECT_CLICINTIE 0x1400 /* MIREG2 */
#define MISELECT_CLICINTTRIG 0x1480 /* MIREG */
+/* AIA Machine-Level CSRs */
+
+#define CSR_MTOPEI 0x35c /* Machine top external interrupt */
+#define CSR_MTOPI 0xfb0 /* Machine top interrupt */
+#define CSR_MVIEN 0x308 /* Machine virtual interrupt enables */
+#define CSR_MVIP 0x309 /* Machine virtual interrupt-pending bits */
+
+/* AIA Machine-Level CSRs (High-Half) */
+
+#define CSR_MIDELEGH 0x313
+#define CSR_MIEH 0x314
+#define CSR_MVIENH 0x318
+#define CSR_MVIPH 0x319
+#define CSR_MIPH 0x354
+
+/* AIA Supervisor-Level CSRs */
+
+#define CSR_STOPEI 0x15c /* Supervisor top external interrupt */
+#define CSR_STOPI 0xdb0 /* Supervisor top interrupt */
+
+/* AIA Supervisor-Level CSRs (High-Half) */
+
+#define CSR_SIEH 0x114
+#define CSR_SIPH 0x154
+
/* In mstatus register */
#define MSTATUS_UIE (0x1 << 0) /* User Interrupt Enable */
@@ -554,6 +579,161 @@
#define COUNTEREN_HPM30 (0x1 << 30)
#define COUNTEREN_HPM31 (0x1 << 31)
+/* In topi/topei register */
+
+#define TOPI_IID_SHIFT 16
+#define TOPI_IPRIO_BITS 8
+#define TOPEI_ID_SHIFT 16
+
+/* In iselect register (AIA) */
+
+#define ISELECT_IPRIO0 0x30
+#define ISELECT_IPRIO1 0x31
+#define ISELECT_IPRIO2 0x32
+#define ISELECT_IPRIO3 0x33
+#define ISELECT_IPRIO4 0x34
+#define ISELECT_IPRIO5 0x35
+#define ISELECT_IPRIO6 0x36
+#define ISELECT_IPRIO7 0x37
+#define ISELECT_IPRIO8 0x38
+#define ISELECT_IPRIO9 0x39
+#define ISELECT_IPRIO10 0x3a
+#define ISELECT_IPRIO11 0x3b
+#define ISELECT_IPRIO12 0x3c
+#define ISELECT_IPRIO13 0x3d
+#define ISELECT_IPRIO14 0x3e
+#define ISELECT_IPRIO15 0x3f
+#define ISELECT_EIDELIVERY 0x70
+#define ISELECT_EITHRESHOLD 0x72
+#define ISELECT_EIP0 0x80
+#define ISELECT_EIP1 0x81
+#define ISELECT_EIP2 0x82
+#define ISELECT_EIP3 0x83
+#define ISELECT_EIP4 0x84
+#define ISELECT_EIP5 0x85
+#define ISELECT_EIP6 0x86
+#define ISELECT_EIP7 0x87
+#define ISELECT_EIP8 0x88
+#define ISELECT_EIP9 0x89
+#define ISELECT_EIP10 0x8a
+#define ISELECT_EIP11 0x8b
+#define ISELECT_EIP12 0x8c
+#define ISELECT_EIP13 0x8d
+#define ISELECT_EIP14 0x8e
+#define ISELECT_EIP15 0x8f
+#define ISELECT_EIP16 0x90
+#define ISELECT_EIP17 0x91
+#define ISELECT_EIP18 0x92
+#define ISELECT_EIP19 0x93
+#define ISELECT_EIP20 0x94
+#define ISELECT_EIP21 0x95
+#define ISELECT_EIP22 0x96
+#define ISELECT_EIP23 0x97
+#define ISELECT_EIP24 0x98
+#define ISELECT_EIP25 0x99
+#define ISELECT_EIP26 0x9a
+#define ISELECT_EIP27 0x9b
+#define ISELECT_EIP28 0x9c
+#define ISELECT_EIP29 0x9d
+#define ISELECT_EIP30 0x9e
+#define ISELECT_EIP31 0x9f
+#define ISELECT_EIP32 0xa0
+#define ISELECT_EIP33 0xa1
+#define ISELECT_EIP34 0xa2
+#define ISELECT_EIP35 0xa3
+#define ISELECT_EIP36 0xa4
+#define ISELECT_EIP37 0xa5
+#define ISELECT_EIP38 0xa6
+#define ISELECT_EIP39 0xa7
+#define ISELECT_EIP40 0xa8
+#define ISELECT_EIP41 0xa9
+#define ISELECT_EIP42 0xaa
+#define ISELECT_EIP43 0xab
+#define ISELECT_EIP44 0xac
+#define ISELECT_EIP45 0xad
+#define ISELECT_EIP46 0xae
+#define ISELECT_EIP47 0xaf
+#define ISELECT_EIP48 0xb0
+#define ISELECT_EIP49 0xb1
+#define ISELECT_EIP50 0xb2
+#define ISELECT_EIP51 0xb3
+#define ISELECT_EIP52 0xb4
+#define ISELECT_EIP53 0xb5
+#define ISELECT_EIP54 0xb6
+#define ISELECT_EIP55 0xb7
+#define ISELECT_EIP56 0xb8
+#define ISELECT_EIP57 0xb9
+#define ISELECT_EIP58 0xba
+#define ISELECT_EIP59 0xbb
+#define ISELECT_EIP60 0xbc
+#define ISELECT_EIP61 0xbd
+#define ISELECT_EIP62 0xbe
+#define ISELECT_EIP63 0xbf
+#define ISELECT_EIE0 0xc0
+#define ISELECT_EIE1 0xc1
+#define ISELECT_EIE2 0xc2
+#define ISELECT_EIE3 0xc3
+#define ISELECT_EIE4 0xc4
+#define ISELECT_EIE5 0xc5
+#define ISELECT_EIE6 0xc6
+#define ISELECT_EIE7 0xc7
+#define ISELECT_EIE8 0xc8
+#define ISELECT_EIE9 0xc9
+#define ISELECT_EIE10 0xca
+#define ISELECT_EIE11 0xcb
+#define ISELECT_EIE12 0xcc
+#define ISELECT_EIE13 0xcd
+#define ISELECT_EIE14 0xce
+#define ISELECT_EIE15 0xcf
+#define ISELECT_EIE16 0xd0
+#define ISELECT_EIE17 0xd1
+#define ISELECT_EIE18 0xd2
+#define ISELECT_EIE19 0xd3
+#define ISELECT_EIE20 0xd4
+#define ISELECT_EIE21 0xd5
+#define ISELECT_EIE22 0xd6
+#define ISELECT_EIE23 0xd7
+#define ISELECT_EIE24 0xd8
+#define ISELECT_EIE25 0xd9
+#define ISELECT_EIE26 0xda
+#define ISELECT_EIE27 0xdb
+#define ISELECT_EIE28 0xdc
+#define ISELECT_EIE29 0xdd
+#define ISELECT_EIE30 0xde
+#define ISELECT_EIE31 0xdf
+#define ISELECT_EIE32 0xe0
+#define ISELECT_EIE33 0xe1
+#define ISELECT_EIE34 0xe2
+#define ISELECT_EIE35 0xe3
+#define ISELECT_EIE36 0xe4
+#define ISELECT_EIE37 0xe5
+#define ISELECT_EIE38 0xe6
+#define ISELECT_EIE39 0xe7
+#define ISELECT_EIE40 0xe8
+#define ISELECT_EIE41 0xe9
+#define ISELECT_EIE42 0xea
+#define ISELECT_EIE43 0xeb
+#define ISELECT_EIE44 0xec
+#define ISELECT_EIE45 0xed
+#define ISELECT_EIE46 0xee
+#define ISELECT_EIE47 0xef
+#define ISELECT_EIE48 0xf0
+#define ISELECT_EIE49 0xf1
+#define ISELECT_EIE50 0xf2
+#define ISELECT_EIE51 0xf3
+#define ISELECT_EIE52 0xf4
+#define ISELECT_EIE53 0xf5
+#define ISELECT_EIE54 0xf6
+#define ISELECT_EIE55 0xf7
+#define ISELECT_EIE56 0xf8
+#define ISELECT_EIE57 0xf9
+#define ISELECT_EIE58 0xfa
+#define ISELECT_EIE59 0xfb
+#define ISELECT_EIE60 0xfc
+#define ISELECT_EIE61 0xfd
+#define ISELECT_EIE62 0xfe
+#define ISELECT_EIE63 0xff
+
/****************************************************************************
* Public Types
****************************************************************************/
diff --git a/arch/risc-v/include/mode.h b/arch/risc-v/include/mode.h
index 27bff35806..e8f7be5ca8 100644
--- a/arch/risc-v/include/mode.h
+++ b/arch/risc-v/include/mode.h
@@ -45,6 +45,12 @@
# define CSR_TVAL CSR_STVAL /* Trap value register */
# define CSR_TVEC CSR_STVEC /* Trap vector base addr register */
# define CSR_ENVCFG CSR_SENVCFG /* Env configuration register */
+# define CSR_IEH CSR_SIEH
+# define CSR_ISELECT CSR_SISELECT /* Indirect select register */
+# define CSR_IREG CSR_SIREG /* Indirect alias register */
+# define CSR_IPH CSR_SIPH
+# define CSR_TOPEI CSR_STOPEI /* Top external interrupt register */
+# define CSR_TOPI CSR_STOPI /* Top interrupt register */
/* In status register */
@@ -88,6 +94,12 @@
# define CSR_TVAL CSR_MTVAL /* Trap value register */
# define CSR_TVEC CSR_MTVEC /* Trap vector base addr register */
# define CSR_ENVCFG CSR_MENVCFG /* Env configuration register */
+# define CSR_IEH CSR_MIEH
+# define CSR_ISELECT CSR_MISELECT /* Indirect select register */
+# define CSR_IREG CSR_MIREG /* Indirect alias register */
+# define CSR_IPH CSR_MIPH
+# define CSR_TOPEI CSR_MTOPEI /* Top external interrupt register */
+# define CSR_TOPI CSR_MTOPI /* Top interrupt register */
/* In status register */
diff --git a/arch/risc-v/src/common/CMakeLists.txt b/arch/risc-v/src/common/CMakeLists.txt
index 092188d49a..b1dd33db88 100644
--- a/arch/risc-v/src/common/CMakeLists.txt
+++ b/arch/risc-v/src/common/CMakeLists.txt
@@ -88,6 +88,14 @@ if(CONFIG_ARCH_RV_ISA_A)
list(APPEND SRCS riscv_testset.S)
endif()
+if(CONFIG_ARCH_RV_HAVE_APLIC)
+ list(APPEND SRCS riscv_aplic.c)
+endif()
+
+if(CONFIG_ARCH_RV_HAVE_IMSIC)
+ list(APPEND SRCS riscv_imsic.c)
+endif()
+
if(CONFIG_RISCV_SEMIHOSTING_HOSTFS)
list(APPEND SRCS riscv_semihost.S riscv_hostfs.c)
endif()
diff --git a/arch/risc-v/src/common/Make.defs b/arch/risc-v/src/common/Make.defs
index b3d21641f7..e3c46f6fca 100644
--- a/arch/risc-v/src/common/Make.defs
+++ b/arch/risc-v/src/common/Make.defs
@@ -91,6 +91,10 @@ ifeq ($(CONFIG_ARCH_RV_ISA_A),y)
CMN_ASRCS += riscv_testset.S
endif
+ifeq ($(CONFIG_ARCH_RV_HAVE_APLIC),y)
+CMN_CSRCS += riscv_aia.c
+endif
+
ifeq ($(CONFIG_RISCV_SEMIHOSTING_HOSTFS),y)
CMN_ASRCS += riscv_semihost.S
CMN_CSRCS += riscv_hostfs.c
diff --git a/arch/risc-v/src/common/riscv_aia.h b/arch/risc-v/src/common/riscv_aia.h
new file mode 100644
index 0000000000..5cae3e6215
--- /dev/null
+++ b/arch/risc-v/src/common/riscv_aia.h
@@ -0,0 +1,290 @@
+/****************************************************************************
+ * arch/risc-v/src/common/riscv_aia.h
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership. The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+#ifndef __ARCH_RISCV_SRC_COMMON_RISCV_AIA_H
+#define __ARCH_RISCV_SRC_COMMON_RISCV_AIA_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/bits.h>
+#include <arch/csr.h>
+#include "riscv_internal.h"
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* AIA IMSIC */
+
+#define RISCV_IMSIC_MAX_REGS 16
+
+#define RISCV_IMSIC_MMIO_PAGE_LE 0x00
+#define RISCV_IMSIC_MMIO_PAGE_BE 0x04
+#define RISCV_IMSIC_MMIO_PAGE_BIT 12
+
+#define RISCV_IMSIC_TOPEI_ID_BIT 16
+
+#define RISCV_IMSIC_EIP_BITS 32
+#define RISCV_IMSIC_EIE_BITS 32
+
+#define RISCV_IMSIC_DISABLE_EIDELIVERY 0
+#define RISCV_IMSIC_ENABLE_EIDELIVERY 1
+#define RISCV_IMSIC_DISABLE_EITHRESHOLD 1
+#define RISCV_IMSIC_ENABLE_EITHRESHOLD 0
+
+#define RISCV_IMSIC_IPI_ID 1
+
+/* AIA APLIC */
+
+#define RISCV_APLIC_MAX_DELEGATE 16
+
+#define RISCV_APLIC_MAX_IDC (1UL << 14)
+#define RISCV_APLIC_MAX_SOURCE 1024
+
+#define RISCV_APLIC_DOMAINCFG 0x0000
+#define RISCV_APLIC_DOMAINCFG_IE (1 << 8)
+#define RISCV_APLIC_DOMAINCFG_DM (1 << 2)
+#define RISCV_APLIC_DOMAINCFG_BE (1 << 0)
+
+#define RISCV_APLIC_SOURCECFG_BASE 0x0004
+#define RISCV_APLIC_SOURCECFG_D (1 << 10)
+#define RISCV_APLIC_SOURCECFG_CHILDIDX_MASK 0x000003ff
+#define RISCV_APLIC_SOURCECFG_SM_MASK 0x00000007
+#define RISCV_APLIC_SOURCECFG_SM_INACTIVE 0x0
+#define RISCV_APLIC_SOURCECFG_SM_DETACH 0x1
+#define RISCV_APLIC_SOURCECFG_SM_EDGE_RISE 0x4
+#define RISCV_APLIC_SOURCECFG_SM_EDGE_FALL 0x5
+#define RISCV_APLIC_SOURCECFG_SM_LEVEL_HIGH 0x6
+#define RISCV_APLIC_SOURCECFG_SM_LEVEL_LOW 0x7
+
+#define RISCV_APLIC_MMSICFGADDR 0x1bc0
+#define RISCV_APLIC_MMSICFGADDRH 0x1bc4
+#define RISCV_APLIC_SMSICFGADDR 0x1bc8
+#define RISCV_APLIC_SMSICFGADDRH 0x1bcc
+
+#define RISCV_APLIC_MSICFGADDRH_L (1UL << 31)
+#define RISCV_APLIC_MSICFGADDRH_HHXS_SHIFT 24
+#define RISCV_APLIC_MSICFGADDRH_LHXS_SHIFT 20
+#define RISCV_APLIC_MSICFGADDRH_HHXW_SHIFT 16
+#define RISCV_APLIC_MSICFGADDRH_LHXW_SHIFT 12
+
+#define RISCV_APLIC_MSICFGADDR_PPN_SHIFT 12
+
+#define RISCV_APLIC_SETIP_BASE 0x1c00
+#define RISCV_APLIC_SETIPNUM 0x1cdc
+
+#define RISCV_APLIC_CLRIP_BASE 0x1d00
+#define RISCV_APLIC_CLRIPNUM 0x1ddc
+
+#define RISCV_APLIC_SETIE_BASE 0x1e00
+#define RISCV_APLIC_SETIENUM 0x1edc
+
+#define RISCV_APLIC_CLRIE_BASE 0x1f00
+#define RISCV_APLIC_CLRIENUM 0x1fdc
+
+#define RISCV_APLIC_SETIPNUM_LE 0x2000
+#define RISCV_APLIC_SETIPNUM_BE 0x2004
+
+#define RISCV_APLIC_TARGET_BASE 0x3004
+#define RISCV_APLIC_TARGET_HART_IDX_SHIFT 18
+#define RISCV_APLIC_TARGET_GUEST_IDX_SHIFT 12
+
+#define RISCV_APLIC_IDC_BASE 0x4000
+#define RISCV_APLIC_IDC_SIZE 32
+
+#define RISCV_APLIC_IDC_IDELIVERY 0x00
+
+#define RISCV_APLIC_IDC_IFORCE 0x04
+
+#define RISCV_APLIC_IDC_ITHRESHOLD 0x08
+
+#define RISCV_APLIC_IDC_TOPI 0x18
+#define RISCV_APLIC_IDC_TOPI_ID_SHIFT 16
+
+#define RISCV_APLIC_IDC_CLAIMI 0x1c
+
+#define RISCV_APLIC_DEFAULT_PRIORITY 1
+#define RISCV_APLIC_DISABLE_IDELIVERY 0
+#define RISCV_APLIC_ENABLE_IDELIVERY 1
+#define RISCV_APLIC_DISABLE_ITHRESHOLD 1
+#define RISCV_APLIC_ENABLE_ITHRESHOLD 0
+
+#define RISCV_APLIC_IDC(base, i) \
+ ((base) + RISCV_APLIC_IDC_BASE + RISCV_APLIC_IDC_SIZE * (i))
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+union aplic_mode_arg_u
+{
+ struct
+ {
+ uint32_t idelivery;
+ uint32_t ithreshold;
+ } direct;
+
+ struct
+ {
+ uint64_t imsic_ppn;
+ uint32_t lhxs;
+ uint32_t lhxw;
+ uint32_t hhxs;
+ uint32_t hhxw;
+ } msi;
+};
+
+/****************************************************************************
+ * Public Function
+ ****************************************************************************/
+
+#ifdef __cplusplus
+#define EXTERN extern "C"
+extern "C"
+{
+#else
+#define EXTERN extern
+#endif
+
+/* IMSIC */
+#define riscv_imsic_csr_write(reg, val) WRITE_INDIRECT_CSR_REG0(reg, val)
+#define riscv_imsic_csr_read(reg, val) READ_INDIRECT_CSR_REG0(reg, val)
+#define riscv_imsic_csr_set(reg, val) SET_INDIRECT_CSR_REG0(reg, val)
+#define riscv_imsic_csr_clear(reg, val) CLEAR_INDIRECT_CSR_REG0(reg, val)
+
+void riscv_imsic_local_eix_update(unsigned long base_id,
+ unsigned long num_id,
+ bool pend, bool val);
+
+static inline void riscv_imsic_local_eie_update(unsigned long base_id,
+ unsigned long num_id, bool val)
+{
+ return riscv_imsic_local_eix_update(base_id, num_id, false, val);
+}
+
+static inline void riscv_imsic_local_eip_update(unsigned long base_id,
+ unsigned long num_id, bool val)
+{
+ return riscv_imsic_local_eix_update(base_id, num_id, true, val);
+}
+
+static inline void riscv_imsic_local_eie_enable(unsigned long base_id)
+{
+ return riscv_imsic_local_eie_update(base_id, 1, true);
+}
+
+static inline void riscv_imsic_local_eie_disable(unsigned long base_id)
+{
+ return riscv_imsic_local_eie_update(base_id, 1, false);
+}
+
+void riscv_imsic_send_ipi(int cpu);
+
+/* APLIC */
+
+static inline int riscv_aplic_set_delegate(uintptr_t base,
+ uint32_t first_irq,
+ uint32_t last_irq,
+ uint32_t child_id)
+{
+ uint32_t j;
+ uintptr_t sourcecfg_base = base + RISCV_APLIC_SOURCECFG_BASE;
+
+ if (!first_irq || !last_irq)
+ return 0;
+
+ if (RISCV_APLIC_SOURCECFG_CHILDIDX_MASK < child_id)
+ return -EINVAL;
+
+ for (j = first_irq; j <= last_irq; j++)
+ {
+ putreg32(RISCV_APLIC_SOURCECFG_D | child_id,
+ sourcecfg_base + (j - 1) * sizeof(uint32_t));
+ }
+
+ return 0;
+}
+
+static inline void riscv_aplic_enable_irq(uintptr_t base, uint32_t irq)
+{
+ putreg32(irq, base + RISCV_APLIC_SETIENUM);
+}
+
+static inline void riscv_aplic_disable_irq(uintptr_t base, uint32_t irq)
+{
+ putreg32(irq, base + RISCV_APLIC_CLRIENUM);
+}
+
+static inline void riscv_aplic_configure_irq(uintptr_t base, uint32_t irq,
+ uint32_t mode, uint32_t hartid)
+{
+ uint32_t val = (hartid << RISCV_APLIC_TARGET_HART_IDX_SHIFT) | irq;
+ putreg32(mode, base + RISCV_APLIC_SOURCECFG_BASE
+ + (irq - 1) * sizeof(uint32_t));
+ putreg32(val, base + RISCV_APLIC_TARGET_BASE
+ + (irq - 1) * sizeof(uint32_t));
+}
+
+static inline void riscv_aplic_disable_irqs(uintptr_t base,
+ uint32_t num_source)
+{
+ uint32_t i;
+
+ putreg32(0, base + RISCV_APLIC_DOMAINCFG);
+
+ /* Disable all interrupts */
+
+ for (i = 0; i < num_source; i += 32)
+ {
+ putreg32(-1U, base + RISCV_APLIC_CLRIE_BASE
+ + (i / 32) * sizeof(uint32_t));
+ }
+}
+
+/****************************************************************************
+ * Name: riscv_aplic_init
+ *
+ * Description:
+ * Init APLIC to direct mode
+ *
+ ****************************************************************************/
+
+void riscv_aplic_init(uintptr_t base,
+ uint32_t idelivery, uint32_t ithreshold);
+
+/****************************************************************************
+ * Name: riscv_aplic_init
+ *
+ * Description:
+ * Init APLIC to msi mode
+ *
+ ****************************************************************************/
+
+void riscv_aplic_init_msi(uintptr_t base, uint64_t imsic_addr,
+ uint32_t lhxs, uint32_t lhxw,
+ uint32_t hhxs, uint32_t hhxw);
+
+#undef EXTERN
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ARCH_RISCV_SRC_COMMON_RISCV_AIA_H */
diff --git a/arch/risc-v/src/common/riscv_aplic.c b/arch/risc-v/src/common/riscv_aplic.c
new file mode 100644
index 0000000000..a5b09386cf
--- /dev/null
+++ b/arch/risc-v/src/common/riscv_aplic.c
@@ -0,0 +1,61 @@
+/****************************************************************************
+ * arch/risc-v/src/common/riscv_aplic.c
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership. The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include "riscv_internal.h"
+#include "riscv_aia.h"
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+void riscv_aplic_init(uintptr_t base,
+ uint32_t idelivery, uint32_t ithreshold)
+{
+ int i;
+
+ for (i = 0; i < CONFIG_SMP_NCPUS; i++)
+ {
+ uintptr_t idc_base = RISCV_APLIC_IDC(base, i);
+
+ putreg32(idelivery, idc_base + RISCV_APLIC_IDC_IDELIVERY);
+ putreg32(0, idc_base + RISCV_APLIC_IDC_IFORCE);
+ putreg32(ithreshold, idc_base + RISCV_APLIC_IDC_ITHRESHOLD);
+ }
+}
+
+void riscv_aplic_init_msi(uintptr_t base, uint64_t imsic_addr,
+ uint32_t lhxs, uint32_t lhxw,
+ uint32_t hhxs, uint32_t hhxw)
+{
+ uint32_t tmp;
+
+ tmp = imsic_addr >> RISCV_IMSIC_MMIO_PAGE_BIT;
+ putreg32(tmp, base + RISCV_APLIC_MMSICFGADDR);
+ tmp = (uint32_t)(imsic_addr >> 32) |
+ (lhxw << RISCV_APLIC_MSICFGADDRH_LHXW_SHIFT) |
+ (lhxs << RISCV_APLIC_MSICFGADDRH_LHXS_SHIFT) |
+ (hhxw << RISCV_APLIC_MSICFGADDRH_HHXW_SHIFT) |
+ (hhxs << RISCV_APLIC_MSICFGADDRH_HHXS_SHIFT);
+ putreg32(tmp, base + RISCV_APLIC_MMSICFGADDRH);
+}
diff --git a/arch/risc-v/src/common/riscv_imsic.c b/arch/risc-v/src/common/riscv_imsic.c
new file mode 100644
index 0000000000..7ea8f52ad8
--- /dev/null
+++ b/arch/risc-v/src/common/riscv_imsic.c
@@ -0,0 +1,63 @@
+/****************************************************************************
+ * arch/risc-v/src/common/riscv_imsic.c
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership. The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include "riscv_internal.h"
+#include "riscv_aia.h"
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+void riscv_imsic_local_eix_update(unsigned long base_id,
+ unsigned long num_id,
+ bool pend, bool val)
+{
+ uintptr_t i, isel, ireg;
+ unsigned long id = base_id;
+ unsigned long last_id = base_id + num_id;
+
+ while (id < last_id)
+ {
+ isel = id / __riscv_xlen;
+ isel *= __riscv_xlen / RISCV_IMSIC_EIP_BITS;
+ isel += (pend) ? ISELECT_EIP0 : ISELECT_EIE0;
+
+ ireg = 0;
+ for (i = id & (__riscv_xlen - 1);
+ (id < last_id) && (i < __riscv_xlen); i++)
+ {
+ ireg |= BIT(i);
+ id++;
+ }
+
+ if (val)
+ {
+ riscv_imsic_csr_set(isel, ireg);
+ }
+ else
+ {
+ riscv_imsic_csr_clear(isel, ireg);
+ }
+ }
+}
diff --git a/arch/risc-v/src/common/riscv_internal.h b/arch/risc-v/src/common/riscv_internal.h
index 0d590ca7a7..be607bef61 100644
--- a/arch/risc-v/src/common/riscv_internal.h
+++ b/arch/risc-v/src/common/riscv_internal.h
@@ -197,6 +197,38 @@ static inline void putreg64(uint64_t v, const volatile uintreg_t a)
__asm__ __volatile__("csrc " __STR(reg) ", %0" :: "rK"(bits)); \
})
+#define SWAP_CSR(reg, val) \
+ ({ \
+ uintptr_t regval; \
+ __asm__ __volatile__("csrrw %0, " __STR(reg) ", %1" : "=r"(regval) \
+ : "rK"(val)); \
+ regval; \
+ })
+
+#define WRITE_INDIRECT_CSR_REG0(reg, val) \
+ ({ \
+ WRITE_CSR(CSR_ISELECT, reg); \
+ WRITE_CSR(CSR_IREG, val); \
+ })
+
+#define READ_INDIRECT_CSR_REG0(reg, val) \
+ ({ \
+ WRITE_CSR(CSR_ISELECT, reg); \
+ READ_CSR(CSR_IREG, val); \
+ })
+
+#define SET_INDIRECT_CSR_REG0(reg, val) \
+ ({ \
+ WRITE_CSR(CSR_ISELECT, reg); \
+ SET_CSR(CSR_IREG, val); \
+ })
+
+#define CLEAR_INDIRECT_CSR_REG0(reg, val) \
+ ({ \
+ WRITE_CSR(CSR_ISELECT, reg); \
+ CLEAR_CSR(CSR_IREG, val); \
+ })
+
#define riscv_append_pmp_region(a, b, s) \
riscv_config_pmp_region(riscv_next_free_pmp_region(), a, b, s)