github-mirrors/neorv32
1
0
Fork 0
mirror of https://github.com/stnolting/neorv32.git synced 2025-04-23 21:57:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

[sw] cleanup clint.mtimecmp calls

Browse source
This commit is contained in:
stnolting 2024-12-30 12:55:32 +01:00
parent 635e6d2626
commit bc4c63864b
3 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sw/bootloader/bootloader.c
View file

@ -483,7 +483,7 @@ void __attribute__((interrupt("machine"))) bootloader_trap_handler(void) {
#endif
// set time for next IRQ
if (neorv32_clint_available()) {
neorv32_clint_mtimecmp_set(0, neorv32_clint_time_get() + (NEORV32_SYSINFO->CLK/4));
neorv32_clint_mtimecmp_set(neorv32_clint_time_get() + (NEORV32_SYSINFO->CLK/4));
}
}

14
sw/example/demo_clint/main.c
View file

@ -70,7 +70,7 @@ int main() {
neorv32_uart0_printf("Unix timestamp: %u\n", (uint32_t)neorv32_clint_unixtime_get);
// configure MTIME timer to not trigger
neorv32_clint_mtimecmp_set(0, -1);
neorv32_clint_mtimecmp_set(-1);
// install CLINT handlers to RTE
neorv32_rte_handler_install(RTE_TRAP_MTI, mti_irq_handler);
@ -80,7 +80,7 @@ int main() {
neorv32_uart0_printf("\nStarting real-time clock demo...\n");
// configure MTIME timer's first interrupt to trigger after 1 second starting from now
neorv32_clint_mtimecmp_set(0, neorv32_clint_time_get() + neorv32_sysinfo_get_clk());
neorv32_clint_mtimecmp_set(neorv32_clint_time_get() + neorv32_sysinfo_get_clk());
// enable machine time and software interrupts
neorv32_cpu_csr_set(CSR_MIE, (1 << CSR_MIE_MTIE) + (1 << CSR_MIE_MSIE));
@ -104,13 +104,13 @@ int main() {
void mti_irq_handler(void) {
// configure MTIME timer's next interrupt to trigger after 1 second starting from now
neorv32_clint_mtimecmp_set(0, neorv32_clint_mtimecmp_get(0) + neorv32_sysinfo_get_clk());
neorv32_clint_mtimecmp_set(neorv32_clint_mtimecmp_get() + neorv32_sysinfo_get_clk());
// toggle output port bit 0
neorv32_gpio_pin_toggle(0);
// trigger software interrupt (just for fun)
neorv32_clint_msi_set(0);
// trigger software interrupt for this core (just for fun)
neorv32_clint_msi_set(neorv32_cpu_csr_read(CSR_MHARTID));
// show date in human-readable format
date_t date;
@ -127,8 +127,8 @@ void mti_irq_handler(void) {
**************************************************************************/
void msi_irq_handler(void) {
// clear machine software interrupt
NEORV32_CLINT->MSWI[0] = 0;
// clear machine software interrupt for this core
neorv32_clint_msi_clr(neorv32_cpu_csr_read(CSR_MHARTID));
neorv32_uart0_printf("\n[Machine Software Interrupt!]\n");
}

16
sw/example/processor_check/main.c
View file

@ -139,7 +139,7 @@ int main() {
}
// set CMP of CLINT MTIMER to max to prevent an IRQ
neorv32_clint_mtimecmp_set(0, -1);
neorv32_clint_mtimecmp_set(-1);
neorv32_clint_time_set(0);
// get number of implemented PMP regions
@ -787,7 +787,7 @@ int main() {
cnt_test++;
// configure MTIMER (and check overflow from low word to high word)
neorv32_clint_mtimecmp_set(0, 0x0000000100000000ULL);
neorv32_clint_mtimecmp_set(0x0000000100000000ULL);
neorv32_clint_time_set(0x00000000FFFFFFFEULL);
// enable interrupt
neorv32_cpu_csr_write(CSR_MIE, 1 << CSR_MIE_MTIE);
@ -808,7 +808,7 @@ int main() {
}
// no more MTIME interrupts
neorv32_clint_mtimecmp_set(0, -1);
neorv32_clint_mtimecmp_set(-1);
}
else {
PRINT_STANDARD("[n.a.]\n");
@ -894,7 +894,7 @@ int main() {
// fire CLINT.MTIMER IRQ
neorv32_cpu_csr_write(CSR_MIE, 1 << CSR_MIE_MTIE);
neorv32_clint_mtimecmp_set(0, 0); // force interrupt
neorv32_clint_mtimecmp_set(0); // force interrupt
volatile int test_cnt = 0;
@ -929,7 +929,7 @@ int main() {
neorv32_cpu_csr_write(CSR_MIE, 0);
// fire CLINT.MTIMER IRQ
neorv32_clint_mtimecmp_set(0, 0); // force interrupt
neorv32_clint_mtimecmp_set(0); // force interrupt
// wait some time for the IRQ to arrive the CPU
asm volatile ("nop");
@ -938,7 +938,7 @@ int main() {
uint32_t was_pending = neorv32_cpu_csr_read(CSR_MIP) & (1 << CSR_MIP_MTIP); // should be pending now
// clear pending MTI
neorv32_clint_mtimecmp_set(0, -1);
neorv32_clint_mtimecmp_set(-1);
uint32_t is_pending = neorv32_cpu_csr_read(CSR_MIP) & (1 << CSR_MIP_MTIP); // should NOT be pending anymore
@ -1770,7 +1770,7 @@ int main() {
cnt_test++;
// program wake-up timer
neorv32_clint_mtimecmp_set(0, neorv32_clint_time_get() + 300);
neorv32_clint_mtimecmp_set(neorv32_clint_time_get() + 300);
// enable CLINT.MTIMER interrupt
neorv32_cpu_csr_write(CSR_MIE, 1 << CSR_MIE_MTIE);
@ -1812,7 +1812,7 @@ int main() {
neorv32_cpu_csr_clr(CSR_MSTATUS, 1 << CSR_MSTATUS_MIE);
// program wake-up timer
neorv32_clint_mtimecmp_set(0, neorv32_clint_time_get() + 300);
neorv32_clint_mtimecmp_set(neorv32_clint_time_get() + 300);
// enable machine timer interrupt
neorv32_cpu_csr_write(CSR_MIE, 1 << CSR_MIE_MTIE);