RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

bsps/riscv: Simplify riscv_clint_init()

Browse Source
This commit is contained in:
Sebastian Huber
2022-11-10 08:21:47 +01:00
parent ccf09a6e16
commit d2bac3d730
1 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
bsps/riscv/riscv/irq/irq.c
View File

@@ -115,6 +115,16 @@ void _RISCV_Interrupt_dispatch(uintptr_t mcause, Per_CPU_Control *cpu_self)
} }
} }
static void riscv_clint_per_cpu_init(
volatile RISCV_CLINT_regs *clint,
Per_CPU_Control *cpu,
uint32_t index
)
{
cpu->cpu_per_cpu.clint_msip = &clint->msip[index];
cpu->cpu_per_cpu.clint_mtimecmp = &clint->mtimecmp[index];
}
static void riscv_clint_init(const void *fdt) static void riscv_clint_init(const void *fdt)
{ {
volatile RISCV_CLINT_regs *clint; volatile RISCV_CLINT_regs *clint;
@@ -136,30 +146,31 @@ static void riscv_clint_init(const void *fdt)
for (i = 0; i < len; i += 16) { for (i = 0; i < len; i += 16) {
uint32_t hart_index; uint32_t hart_index;
Per_CPU_Control *cpu; uint32_t cpu_index;
hart_index = riscv_get_hart_index_by_phandle(fdt32_to_cpu(val[i / 4])); hart_index = riscv_get_hart_index_by_phandle(fdt32_to_cpu(val[i / 4]));
#ifdef RTEMS_SMP #ifdef RTEMS_SMP
if (hart_index < RISCV_BOOT_HARTID) { cpu_index = _RISCV_Map_hardid_to_cpu_index(hart_index);
if (cpu_index >= rtems_configuration_get_maximum_processors()) {
continue; continue;
} }
hart_index = _RISCV_Map_hardid_to_cpu_index(hart_index);
if (hart_index >= rtems_configuration_get_maximum_processors()) {
continue;
}
cpu = _Per_CPU_Get_by_index(hart_index);
cpu->cpu_per_cpu.clint_msip = &clint->msip[i / 16];
cpu->cpu_per_cpu.clint_mtimecmp = &clint->mtimecmp[i / 16];
#else #else
if (hart_index != RISCV_BOOT_HARTID) { if (hart_index != RISCV_BOOT_HARTID) {
continue; continue;
} }
cpu = _Per_CPU_Get_by_index(0); cpu_index = 0;
cpu->cpu_per_cpu.clint_msip = &clint->msip[i / 16]; #endif
cpu->cpu_per_cpu.clint_mtimecmp = &clint->mtimecmp[i / 16];
riscv_clint_per_cpu_init(
clint,
_Per_CPU_Get_by_index(cpu_index),
(uint32_t) (i / 16)
);
#ifndef RTEMS_SMP
break;
#endif #endif
} }
} }