diff --git a/include/sbi/riscv_asm.h b/include/sbi/riscv_asm.h index 4445fa1..0d675f6 100644 --- a/include/sbi/riscv_asm.h +++ b/include/sbi/riscv_asm.h @@ -157,6 +157,8 @@ void csr_write_num(int csr_num, unsigned long val); __asm__ __volatile__("wfi" ::: "memory"); \ } while (0) +/* Get current HART id */ +#define current_hartid() ((unsigned int)csr_read(CSR_MHARTID)) /* determine CPU extension, return non-zero support */ int misa_extension_imp(char ext); diff --git a/include/sbi/sbi_hart.h b/include/sbi/sbi_hart.h index d91e58f..fb4a955 100644 --- a/include/sbi/sbi_hart.h +++ b/include/sbi/sbi_hart.h @@ -32,6 +32,4 @@ sbi_hart_switch_mode(unsigned long arg0, unsigned long arg1, unsigned long next_addr, unsigned long next_mode, bool next_virt); -u32 sbi_current_hartid(void); - #endif diff --git a/lib/sbi/sbi_ecall_legacy.c b/lib/sbi/sbi_ecall_legacy.c index 9099ee3..cffef23 100644 --- a/lib/sbi/sbi_ecall_legacy.c +++ b/lib/sbi/sbi_ecall_legacy.c @@ -8,6 +8,7 @@ * Atish Patra */ +#include #include #include #include @@ -46,7 +47,7 @@ static int sbi_ecall_legacy_handler(struct sbi_scratch *scratch, { int ret = 0; struct sbi_tlb_info tlb_info; - u32 source_hart = sbi_current_hartid(); + u32 source_hart = current_hartid(); ulong hmask = 0; switch (extid) { diff --git a/lib/sbi/sbi_ecall_replace.c b/lib/sbi/sbi_ecall_replace.c index 57760f8..21f3809 100644 --- a/lib/sbi/sbi_ecall_replace.c +++ b/lib/sbi/sbi_ecall_replace.c @@ -8,6 +8,7 @@ * Atish Patra */ +#include #include #include #include @@ -15,7 +16,6 @@ #include #include #include -#include static int sbi_ecall_time_handler(struct sbi_scratch *scratch, unsigned long extid, unsigned long funcid, @@ -50,7 +50,7 @@ static int sbi_ecall_rfence_handler(struct sbi_scratch *scratch, { int ret = 0; struct sbi_tlb_info tlb_info; - u32 source_hart = sbi_current_hartid(); + u32 source_hart = current_hartid(); if (funcid >= SBI_EXT_RFENCE_REMOTE_HFENCE_GVMA && funcid <= SBI_EXT_RFENCE_REMOTE_HFENCE_VVMA_ASID) diff --git a/lib/sbi/sbi_hart.c b/lib/sbi/sbi_hart.c index f61a82f..aa32615 100644 --- a/lib/sbi/sbi_hart.c +++ b/lib/sbi/sbi_hart.c @@ -17,14 +17,6 @@ #include #include -/** - * Return HART ID of the caller. - */ -unsigned int sbi_current_hartid() -{ - return (u32)csr_read(CSR_MHARTID); -} - static void mstatus_init(struct sbi_scratch *scratch, u32 hartid) { const struct sbi_platform *plat = sbi_platform_ptr(scratch); diff --git a/lib/sbi/sbi_hsm.c b/lib/sbi/sbi_hsm.c index 5fd7855..bd58782 100644 --- a/lib/sbi/sbi_hsm.c +++ b/lib/sbi/sbi_hsm.c @@ -204,7 +204,7 @@ void __noreturn sbi_hsm_exit(struct sbi_scratch *scratch) fail_exit: /* It should never reach here */ - sbi_printf("ERR: Failed stop hart [%u]\n", sbi_current_hartid()); + sbi_printf("ERR: Failed stop hart [%u]\n", current_hartid()); sbi_hart_hang(); } @@ -256,7 +256,7 @@ int sbi_hsm_hart_start(struct sbi_scratch *scratch, u32 hartid, int sbi_hsm_hart_stop(struct sbi_scratch *scratch, bool exitnow) { int oldstate; - u32 hartid = sbi_current_hartid(); + u32 hartid = current_hartid(); const struct sbi_platform *plat = sbi_platform_ptr(scratch); struct sbi_hsm_data *hdata = sbi_scratch_offset_ptr(scratch, hart_data_offset); diff --git a/lib/sbi/sbi_init.c b/lib/sbi/sbi_init.c index e7afa1e..11882d6 100644 --- a/lib/sbi/sbi_init.c +++ b/lib/sbi/sbi_init.c @@ -273,7 +273,7 @@ static atomic_t coldboot_lottery = ATOMIC_INITIALIZER(0); void __noreturn sbi_init(struct sbi_scratch *scratch) { bool coldboot = FALSE; - u32 hartid = sbi_current_hartid(); + u32 hartid = current_hartid(); const struct sbi_platform *plat = sbi_platform_ptr(scratch); if ((SBI_HARTMASK_MAX_BITS <= hartid) || @@ -316,7 +316,7 @@ unsigned long sbi_init_count(u32 hartid) */ void __noreturn sbi_exit(struct sbi_scratch *scratch) { - u32 hartid = sbi_current_hartid(); + u32 hartid = current_hartid(); const struct sbi_platform *plat = sbi_platform_ptr(scratch); if (sbi_platform_hart_disabled(plat, hartid)) diff --git a/lib/sbi/sbi_ipi.c b/lib/sbi/sbi_ipi.c index 144b04a..0781b74 100644 --- a/lib/sbi/sbi_ipi.c +++ b/lib/sbi/sbi_ipi.c @@ -176,7 +176,7 @@ void sbi_ipi_process(struct sbi_scratch *scratch) struct sbi_ipi_data *ipi_data = sbi_scratch_offset_ptr(scratch, ipi_data_off); - u32 hartid = sbi_current_hartid(); + u32 hartid = current_hartid(); sbi_platform_ipi_clear(plat, hartid); ipi_type = atomic_raw_xchg_ulong(&ipi_data->ipi_type, 0); diff --git a/lib/sbi/sbi_system.c b/lib/sbi/sbi_system.c index 461e470..061cbf6 100644 --- a/lib/sbi/sbi_system.c +++ b/lib/sbi/sbi_system.c @@ -8,6 +8,7 @@ * Nick Kossifidis */ +#include #include #include #include @@ -39,12 +40,12 @@ void sbi_system_final_exit(struct sbi_scratch *scratch) void __noreturn sbi_system_reboot(struct sbi_scratch *scratch, u32 type) { ulong hbase = 0, hmask; - u32 current_hartid = sbi_current_hartid(); + u32 cur_hartid = current_hartid(); /* Send HALT IPI to every hart other than the current hart */ while (!sbi_hsm_hart_started_mask(scratch, hbase, &hmask)) { - if (hbase <= current_hartid) - hmask &= ~(1UL << (current_hartid - hbase)); + if (hbase <= cur_hartid) + hmask &= ~(1UL << (cur_hartid - hbase)); if (hmask) sbi_ipi_send_halt(scratch, hmask, hbase); hbase += BITS_PER_LONG; @@ -63,12 +64,12 @@ void __noreturn sbi_system_reboot(struct sbi_scratch *scratch, u32 type) void __noreturn sbi_system_shutdown(struct sbi_scratch *scratch, u32 type) { ulong hbase = 0, hmask; - u32 current_hartid = sbi_current_hartid(); + u32 cur_hartid = current_hartid(); /* Send HALT IPI to every hart other than the current hart */ while (!sbi_hsm_hart_started_mask(scratch, hbase, &hmask)) { - if (hbase <= current_hartid) - hmask &= ~(1UL << (current_hartid - hbase)); + if (hbase <= cur_hartid) + hmask &= ~(1UL << (cur_hartid - hbase)); if (hmask) sbi_ipi_send_halt(scratch, hmask, hbase); hbase += BITS_PER_LONG; diff --git a/lib/sbi/sbi_tlb.c b/lib/sbi/sbi_tlb.c index 3cae7ee..a46ddfe 100644 --- a/lib/sbi/sbi_tlb.c +++ b/lib/sbi/sbi_tlb.c @@ -319,7 +319,7 @@ static int sbi_tlb_update(struct sbi_scratch *scratch, int ret; struct sbi_fifo *tlb_fifo_r; struct sbi_tlb_info *tinfo = data; - u32 curr_hartid = sbi_current_hartid(); + u32 curr_hartid = current_hartid(); /* * If address range to flush is too big then simply diff --git a/lib/sbi/sbi_trap.c b/lib/sbi/sbi_trap.c index b5fbc5e..b4ba2ac 100644 --- a/lib/sbi/sbi_trap.c +++ b/lib/sbi/sbi_trap.c @@ -217,7 +217,7 @@ void sbi_trap_handler(struct sbi_trap_regs *regs, { int rc = SBI_ENOTSUPP; const char *msg = "trap handler failed"; - u32 hartid = sbi_current_hartid(); + u32 hartid = current_hartid(); ulong mcause = csr_read(CSR_MCAUSE); ulong mtval = csr_read(CSR_MTVAL), mtval2 = 0, mtinst = 0; struct sbi_trap_info trap, *uptrap; diff --git a/lib/utils/sys/clint.c b/lib/utils/sys/clint.c index ec85507..22ba088 100644 --- a/lib/utils/sys/clint.c +++ b/lib/utils/sys/clint.c @@ -7,9 +7,9 @@ * Anup Patel */ -#include +#include #include -#include +#include #include static u32 clint_ipi_hart_count; @@ -36,7 +36,7 @@ void clint_ipi_clear(u32 target_hart) int clint_warm_ipi_init(void) { - u32 hartid = sbi_current_hartid(); + u32 hartid = current_hartid(); if (!clint_ipi_base) return -1; @@ -105,7 +105,7 @@ u64 clint_timer_value(void) void clint_timer_event_stop(void) { - u32 target_hart = sbi_current_hartid(); + u32 target_hart = current_hartid(); if (clint_time_hart_count <= target_hart) return; @@ -116,7 +116,7 @@ void clint_timer_event_stop(void) void clint_timer_event_start(u64 next_event) { - u32 target_hart = sbi_current_hartid(); + u32 target_hart = current_hartid(); if (clint_time_hart_count <= target_hart) return; @@ -127,7 +127,7 @@ void clint_timer_event_start(u64 next_event) int clint_warm_timer_init(void) { - u32 target_hart = sbi_current_hartid(); + u32 target_hart = current_hartid(); if (clint_time_hart_count <= target_hart || !clint_time_base) return -1; diff --git a/platform/andes/ae350/platform.c b/platform/andes/ae350/platform.c index 08db3eb..b85cec4 100644 --- a/platform/andes/ae350/platform.c +++ b/platform/andes/ae350/platform.c @@ -8,9 +8,9 @@ * Nylon Chen */ +#include #include #include -#include #include #include #include @@ -94,7 +94,7 @@ static int ae350_console_init(void) /* Initialize the platform interrupt controller for current HART. */ static int ae350_irqchip_init(bool cold_boot) { - u32 hartid = sbi_current_hartid(); + u32 hartid = current_hartid(); int ret; if (cold_boot) { diff --git a/platform/andes/ae350/plicsw.c b/platform/andes/ae350/plicsw.c index 17fe947..d07df28 100644 --- a/platform/andes/ae350/plicsw.c +++ b/platform/andes/ae350/plicsw.c @@ -8,9 +8,9 @@ * Nylon Chen */ -#include -#include +#include #include +#include #include "plicsw.h" #include "platform.h" @@ -19,7 +19,7 @@ static struct plicsw plicsw_dev[AE350_HART_COUNT]; static inline void plicsw_claim(void) { - u32 source_hart = sbi_current_hartid(); + u32 source_hart = current_hartid(); plicsw_dev[source_hart].source_id = readl(plicsw_dev[source_hart].plicsw_claim); @@ -27,7 +27,7 @@ static inline void plicsw_claim(void) static inline void plicsw_complete(void) { - u32 source_hart = sbi_current_hartid(); + u32 source_hart = current_hartid(); u32 source = plicsw_dev[source_hart].source_id; writel(source, plicsw_dev[source_hart].plicsw_claim); @@ -61,7 +61,7 @@ static inline void plic_sw_pending(u32 target_hart) * The bit 5 is used to send IPI to hart 2 * The bit 4 is used to send IPI to hart 3 */ - u32 source_hart = sbi_current_hartid(); + u32 source_hart = current_hartid(); u32 target_offset = (PLICSW_PENDING_PER_HART - 1) - target_hart; u32 per_hart_offset = PLICSW_PENDING_PER_HART * source_hart; u32 val = 1 << target_offset << per_hart_offset; @@ -90,7 +90,7 @@ void plicsw_ipi_clear(u32 target_hart) int plicsw_warm_ipi_init(void) { - u32 hartid = sbi_current_hartid(); + u32 hartid = current_hartid(); if (!plicsw_dev[hartid].plicsw_pending && !plicsw_dev[hartid].plicsw_enable diff --git a/platform/andes/ae350/plmt.c b/platform/andes/ae350/plmt.c index db80813..3848e15 100644 --- a/platform/andes/ae350/plmt.c +++ b/platform/andes/ae350/plmt.c @@ -8,8 +8,8 @@ * Nylon Chen */ +#include #include -#include static u32 plmt_time_hart_count; static volatile void *plmt_time_base; @@ -34,7 +34,7 @@ u64 plmt_timer_value(void) void plmt_timer_event_stop(void) { - u32 target_hart = sbi_current_hartid(); + u32 target_hart = current_hartid(); if (plmt_time_hart_count <= target_hart) return; @@ -50,7 +50,7 @@ void plmt_timer_event_stop(void) void plmt_timer_event_start(u64 next_event) { - u32 target_hart = sbi_current_hartid(); + u32 target_hart = current_hartid(); if (plmt_time_hart_count <= target_hart) return; @@ -70,7 +70,7 @@ void plmt_timer_event_start(u64 next_event) int plmt_warm_timer_init(void) { - u32 target_hart = sbi_current_hartid(); + u32 target_hart = current_hartid(); if (plmt_time_hart_count <= target_hart || !plmt_time_base) return -1; diff --git a/platform/ariane-fpga/platform.c b/platform/ariane-fpga/platform.c index d5d0fbc..cc8429b 100644 --- a/platform/ariane-fpga/platform.c +++ b/platform/ariane-fpga/platform.c @@ -4,6 +4,7 @@ * Panagiotis Peristerakis */ +#include #include #include #include @@ -105,7 +106,7 @@ static int plic_ariane_warm_irqchip_init(u32 target_hart, */ static int ariane_irqchip_init(bool cold_boot) { - u32 hartid = sbi_current_hartid(); + u32 hartid = current_hartid(); int ret; if (cold_boot) { diff --git a/platform/kendryte/k210/platform.c b/platform/kendryte/k210/platform.c index 1b49b39..00b38f7 100644 --- a/platform/kendryte/k210/platform.c +++ b/platform/kendryte/k210/platform.c @@ -7,9 +7,9 @@ * Damien Le Moal */ +#include #include #include -#include #include #include #include @@ -55,7 +55,7 @@ static int k210_console_init(void) static int k210_irqchip_init(bool cold_boot) { int rc; - u32 hartid = sbi_current_hartid(); + u32 hartid = current_hartid(); if (cold_boot) { rc = plic_cold_irqchip_init(K210_PLIC_BASE_ADDR, diff --git a/platform/qemu/virt/platform.c b/platform/qemu/virt/platform.c index d2c841c..fdc5a2c 100644 --- a/platform/qemu/virt/platform.c +++ b/platform/qemu/virt/platform.c @@ -8,6 +8,7 @@ * Nick Kossifidis */ +#include #include #include #include @@ -84,7 +85,7 @@ static int virt_console_init(void) static int virt_irqchip_init(bool cold_boot) { int rc; - u32 hartid = sbi_current_hartid(); + u32 hartid = current_hartid(); if (cold_boot) { rc = plic_cold_irqchip_init( diff --git a/platform/sifive/fu540/platform.c b/platform/sifive/fu540/platform.c index 4a8c016..848261c 100644 --- a/platform/sifive/fu540/platform.c +++ b/platform/sifive/fu540/platform.c @@ -9,12 +9,12 @@ #include #include +#include +#include #include #include -#include #include #include -#include #include #include #include @@ -148,7 +148,7 @@ static int fu540_console_init(void) static int fu540_irqchip_init(bool cold_boot) { int rc; - u32 hartid = sbi_current_hartid(); + u32 hartid = current_hartid(); if (cold_boot) { rc = plic_cold_irqchip_init(FU540_PLIC_ADDR, diff --git a/platform/template/platform.c b/platform/template/platform.c index c98bbff..60b65ea 100644 --- a/platform/template/platform.c +++ b/platform/template/platform.c @@ -4,6 +4,7 @@ * Copyright (c) 2019 Western Digital Corporation or its affiliates. */ +#include #include #include #include @@ -82,7 +83,7 @@ static int platform_console_getc(void) */ static int platform_irqchip_init(bool cold_boot) { - u32 hartid = sbi_current_hartid(); + u32 hartid = current_hartid(); int ret; /* Example if the generic PLIC driver is used */