|
12 | 12 | #include <zephyr/arch/cpu.h>
|
13 | 13 | #include <zephyr/sys/util.h>
|
14 | 14 | #include <zephyr/device.h>
|
15 |
| -#include <zephyr/irq_multilevel.h> |
16 | 15 |
|
17 | 16 | #include <zephyr/sw_isr_table.h>
|
18 | 17 | #include <zephyr/drivers/interrupt_controller/riscv_clic.h>
|
@@ -96,14 +95,6 @@ struct CLICCTRL {
|
96 | 95 | #define ECLIC_CTRL ((volatile struct CLICCTRL *)(DT_REG_ADDR_BY_IDX(DT_NODELABEL(eclic), 3)))
|
97 | 96 | #define ECLIC_CTRL_SIZE (DT_REG_SIZE_BY_IDX(DT_NODELABEL(eclic), 3))
|
98 | 97 |
|
99 |
| -#if CONFIG_3RD_LEVEL_INTERRUPTS |
100 |
| -#define INTERRUPT_LEVEL 2 |
101 |
| -#elif CONFIG_2ND_LEVEL_INTERRUPTS |
102 |
| -#define INTERRUPT_LEVEL 1 |
103 |
| -#else |
104 |
| -#define INTERRUPT_LEVEL 0 |
105 |
| -#endif |
106 |
| - |
107 | 98 | static uint8_t nlbits;
|
108 | 99 | static uint8_t intctlbits;
|
109 | 100 | static uint8_t max_prio;
|
@@ -150,7 +141,7 @@ int riscv_clic_irq_is_enabled(uint32_t irq)
|
150 | 141 | void riscv_clic_irq_priority_set(uint32_t irq, uint32_t pri, uint32_t flags)
|
151 | 142 | {
|
152 | 143 | const uint8_t prio = leftalign8(MIN(pri, max_prio), intctlbits);
|
153 |
| - const uint8_t level = leftalign8(MIN((irq_get_level(irq) - 1), max_level), nlbits); |
| 144 | + const uint8_t level = leftalign8(max_level, nlbits); |
154 | 145 | const uint8_t intctrl = (prio | level) | (~intctrl_mask);
|
155 | 146 |
|
156 | 147 | ECLIC_CTRL[irq].INTCTRL = intctrl;
|
@@ -180,12 +171,9 @@ void riscv_clic_irq_set_pending(uint32_t irq)
|
180 | 171 |
|
181 | 172 | static int nuclei_eclic_init(const struct device *dev)
|
182 | 173 | {
|
183 |
| - /* check hardware support required interrupt levels */ |
184 |
| - __ASSERT_NO_MSG(ECLIC_INFO.b.intctlbits >= INTERRUPT_LEVEL); |
185 |
| - |
186 | 174 | ECLIC_MTH.w = 0;
|
187 | 175 | ECLIC_CFG.w = 0;
|
188 |
| - ECLIC_CFG.b.nlbits = INTERRUPT_LEVEL; |
| 176 | + ECLIC_CFG.b.nlbits = 0; |
189 | 177 | for (int i = 0; i < ECLIC_CTRL_SIZE; i++) {
|
190 | 178 | ECLIC_CTRL[i] = (struct CLICCTRL) { 0 };
|
191 | 179 | }
|
|
0 commit comments