diff options
| author | Anup Patel <apatel@ventanamicro.com> | 2023-07-05 12:15:15 +0530 |
|---|---|---|
| committer | Anup Patel <anup@brainfault.org> | 2023-07-09 11:04:57 +0530 |
| commit | c6a35733b74aeff612398f274ed19a74f81d1f37 (patch) | |
| tree | 36e2aacd2f501cc9c826f19a964198c91e14a47b | |
| parent | 7828eebaaa773fd83e63471ca27be3f30a0694f6 (diff) | |
| download | opensbi-c6a35733b74aeff612398f274ed19a74f81d1f37.tar.gz opensbi-c6a35733b74aeff612398f274ed19a74f81d1f37.zip | |
lib: utils: Fix sbi_hartid_to_scratch() usage in ACLINT drivers
The cold_init() functions of ACLINT drivers should skip the HART
if sbi_hartid_to_scratch() returns NULL because we might be dealing
with a HART that is disabled in the device tree.
Signed-off-by: Anup Patel <apatel@ventanamicro.com>
Reviewed-by: Xiang W <wxjstz@126.com>
| -rw-r--r-- | lib/utils/ipi/aclint_mswi.c | 7 | ||||
| -rw-r--r-- | lib/utils/timer/aclint_mtimer.c | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/lib/utils/ipi/aclint_mswi.c b/lib/utils/ipi/aclint_mswi.c index f47b3bcb..140a49b5 100644 --- a/lib/utils/ipi/aclint_mswi.c +++ b/lib/utils/ipi/aclint_mswi.c @@ -101,8 +101,13 @@ int aclint_mswi_cold_init(struct aclint_mswi_data *mswi) /* Update MSWI pointer in scratch space */ for (i = 0; i < mswi->hart_count; i++) { scratch = sbi_hartid_to_scratch(mswi->first_hartid + i); + /* + * We don't need to fail if scratch pointer is not available + * because we might be dealing with hartid of a HART disabled + * in the device tree. + */ if (!scratch) - return SBI_ENOENT; + continue; mswi_set_hart_data_ptr(scratch, mswi); } diff --git a/lib/utils/timer/aclint_mtimer.c b/lib/utils/timer/aclint_mtimer.c index 13af5d82..271e6252 100644 --- a/lib/utils/timer/aclint_mtimer.c +++ b/lib/utils/timer/aclint_mtimer.c @@ -219,8 +219,13 @@ int aclint_mtimer_cold_init(struct aclint_mtimer_data *mt, /* Update MTIMER pointer in scratch space */ for (i = 0; i < mt->hart_count; i++) { scratch = sbi_hartid_to_scratch(mt->first_hartid + i); + /* + * We don't need to fail if scratch pointer is not available + * because we might be dealing with hartid of a HART disabled + * in the device tree. + */ if (!scratch) - return SBI_ENOENT; + continue; mtimer_set_hart_data_ptr(scratch, mt); } |