diff options
| author | Anup Patel <anup.patel@wdc.com> | 2020-03-04 12:00:49 +0300 |
|---|---|---|
| committer | Anup Patel <anup@brainfault.org> | 2020-03-11 12:59:51 +0300 |
| commit | d6d7e18d1d12c8eda2591f21a70d31dd95c2d32e (patch) | |
| tree | 1d0045a5d857e8db0f0fde4667d3d963746ba9f1 | |
| parent | c741abcd40a843007007741984fb87ed561dfa90 (diff) | |
| download | opensbi-d6d7e18d1d12c8eda2591f21a70d31dd95c2d32e.tar.xz | |
lib: sbi_init: Don't allow HARTID greater than SBI_HARTMASK_MAX_BITS
We only allow HARTs with HARTID less than SBI_HARTMASK_MAX_BITS in
sbi_init() function so that sbi_hartmask can safely used across
OpenSBI sources.
Signed-off-by: Anup Patel <anup.patel@wdc.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Atish Patra <atish.patra@wdc.com>
| -rw-r--r-- | lib/sbi/sbi_init.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/sbi/sbi_init.c b/lib/sbi/sbi_init.c index 1f113b9..9a9e433 100644 --- a/lib/sbi/sbi_init.c +++ b/lib/sbi/sbi_init.c @@ -12,6 +12,7 @@ #include <sbi/sbi_console.h> #include <sbi/sbi_ecall.h> #include <sbi/sbi_hart.h> +#include <sbi/sbi_hartmask.h> #include <sbi/sbi_hsm.h> #include <sbi/sbi_ipi.h> #include <sbi/sbi_platform.h> @@ -215,7 +216,8 @@ void __noreturn sbi_init(struct sbi_scratch *scratch) u32 hartid = sbi_current_hartid(); const struct sbi_platform *plat = sbi_platform_ptr(scratch); - if (sbi_platform_hart_disabled(plat, hartid)) + if ((SBI_HARTMASK_MAX_BITS <= hartid) || + sbi_platform_hart_disabled(plat, hartid)) sbi_hart_hang(); if (atomic_add_return(&coldboot_lottery, 1) == 1) |