Skip to content

arch/riscv: add cluster local hartid #12881

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xiaoxiang781216 merged 1 commit into from
Aug 11, 2024
Merged

arch/riscv: add cluster local hartid #12881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions arch/risc-v/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,6 +451,20 @@ config ARCH_RV_MMIO_BITS
default 32 if ARCH_RV32
default 64 if ARCH_RV64

config ARCH_RV_HARTID_BASE
int "Base hartid of this cluster"
default 0
---help---
Some RV chips have multiple cluster of harts with
globally numbered mhartids, like qemu-rv, mpfs and
jh7110 etc. Clusters with SMP ability can be managed
by NuttX. As NuttX expects cluster-local hart ids,
we can shift mhartid by this value to derive such
local ids. The SMP_NCPUS still defines number of
harts in the cluster. Note that we assume that global
ids for each cluster are continuous. Note that there
are chips like k230 which don't have global mhartid.

config ARCH_FAMILY
string
default "rv32" if ARCH_RV32
Expand Down
3 changes: 3 additions & 0 deletions arch/risc-v/src/common/riscv_macros.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,9 @@
REGLOAD \out, RISCV_PERCPU_HARTID(\out)
#else
csrr \out, CSR_MHARTID
# if CONFIG_ARCH_RV_HARTID_BASE > 0
add \out, \out, - CONFIG_ARCH_RV_HARTID_BASE
# endif
#endif
.endm

Expand Down