Firmware/opensbi
8
0
Fork 0
forked from Mirrors/opensbi
Code Pull Requests Activity

lib: sbi_hsm: Don't use sbi_platform_hart_count() API

Browse Source 
We remove usage of sbi_platform_hart_count() API from sbi_hsm
so that discontinuous and sparse HART ids can be supported.

Signed-off-by: Anup Patel <anup.patel@wdc.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Anup Patel
2020-03-18 15:13:06 +05:30
committed by Anup Patel
parent c9f60fc6b7
commit 680b09872d
1 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/sbi/sbi_hsm.c
View File

@@ -16,6 +16,7 @@
#include <sbi/sbi_error.h>
#include <sbi/sbi_ecall_interface.h>
#include <sbi/sbi_hart.h>
#include <sbi/sbi_hartmask.h>
#include <sbi/sbi_hsm.h>
#include <sbi/sbi_init.h>
#include <sbi/sbi_ipi.h>
@@ -89,17 +90,7 @@ int sbi_hsm_hart_started_mask(struct sbi_scratch *scratch,
ulong hbase, ulong *out_hmask)
{
ulong i;
ulong hcount = sbi_platform_hart_count(sbi_platform_ptr(scratch));
/*
* The SBI_HARTMASK_MAX_BITS represents the maximum HART ids generic
* OpenSBI can handle whereas sbi_platform_hart_count() represents
* the maximum HART ids (or HARTs) on underlying platform.
*
* Currently, we only support continuous HART ids so this function
* is written with same assumption. In future, this function will
* change when we support discontinuous and sparse HART ids.
*/
ulong hcount = SBI_HARTMASK_MAX_BITS;
*out_hmask = 0;
if (hcount <= hbase)
@@ -153,20 +144,18 @@ static void sbi_hsm_hart_wait(struct sbi_scratch *scratch, u32 hartid)
int sbi_hsm_init(struct sbi_scratch *scratch, u32 hartid, bool cold_boot)
{
u32 i;
struct sbi_scratch *rscratch;
struct sbi_hsm_data *hdata;
u32 hart_count, i;
const struct sbi_platform *plat = sbi_platform_ptr(scratch);
if (cold_boot) {
hart_data_offset = sbi_scratch_alloc_offset(sizeof(*hdata),
"HART_DATA");
if (!hart_data_offset)
return SBI_ENOMEM;
hart_count = sbi_platform_hart_count(plat);
/* Initialize hart state data for every hart */
for (i = 0; i < hart_count; i++) {
for (i = 0; i < SBI_HARTMASK_MAX_BITS; i++) {
rscratch = sbi_hartid_to_scratch(i);
if (!rscratch)
continue;