Virtualization
/
opensbi
mirror of https://gitlab.com/qemu-project/opensbi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lib: sbi: Remove sbi_scratch_last_hartid() macro 

The sbi_scratch_last_hartid() macro is not of much use on platforms
with really sparse hartids so let us replace use of this macro with
other approaches.

Signed-off-by: Anup Patel <apatel@ventanamicro.com>
This commit is contained in:
Anup Patel 2023-09-01 21:41:48 +05:30 committed by Anup Patel
parent 78c667b6fc
commit 22d6ff8675
4 changed files with 19 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/sbi/sbi_scratch.h
View File

@ -244,12 +244,6 @@ u32 sbi_hartid_to_hartindex(u32 hartid);
#define sbi_hartid_to_scratch(__hartid) \ #define sbi_hartid_to_scratch(__hartid) \
sbi_hartindex_to_scratch(sbi_hartid_to_hartindex(__hartid)) sbi_hartindex_to_scratch(sbi_hartid_to_hartindex(__hartid))
/** Last HART id having a sbi_scratch pointer */
extern u32 last_hartid_having_scratch;
/** Get last HART id having a sbi_scratch pointer */
#define sbi_scratch_last_hartid() last_hartid_having_scratch
/** Check whether particular HART id is valid or not */ /** Check whether particular HART id is valid or not */
#define sbi_hartid_valid(__hartid) \ #define sbi_hartid_valid(__hartid) \
sbi_hartindex_valid(sbi_hartid_to_hartindex(__hartid)) sbi_hartindex_valid(sbi_hartid_to_hartindex(__hartid))

22
lib/sbi/sbi_hsm.c
View File

@ -115,24 +115,22 @@ int sbi_hsm_hart_interruptible_mask(const struct sbi_domain *dom,
{ {
int hstate; int hstate;
ulong i, hmask, dmask; ulong i, hmask, dmask;
ulong hend = sbi_scratch_last_hartid() + 1;
*out_hmask = 0; *out_hmask = 0;
if (hend <= hbase) if (!sbi_hartid_valid(hbase))
return SBI_EINVAL; return SBI_EINVAL;
if (BITS_PER_LONG < (hend - hbase))
hend = hbase + BITS_PER_LONG;
dmask = sbi_domain_get_assigned_hartmask(dom, hbase); dmask = sbi_domain_get_assigned_hartmask(dom, hbase);
for (i = hbase; i < hend; i++) { for (i = 0; i < BITS_PER_LONG; i++) {
hmask = 1UL << (i - hbase); hmask = 1UL << i;
if (dmask & hmask) { if (!(dmask & hmask))
hstate = __sbi_hsm_hart_get_state(i); continue;
hstate = __sbi_hsm_hart_get_state(hbase + i);
if (hstate == SBI_HSM_STATE_STARTED || if (hstate == SBI_HSM_STATE_STARTED ||
hstate == SBI_HSM_STATE_SUSPENDED) hstate == SBI_HSM_STATE_SUSPENDED)
*out_hmask |= hmask; *out_hmask |= hmask;
} }
}
return 0; return 0;
} }
@ -249,15 +247,15 @@ int sbi_hsm_init(struct sbi_scratch *scratch, u32 hartid, bool cold_boot)
return SBI_ENOMEM; return SBI_ENOMEM;
/* Initialize hart state data for every hart */ /* Initialize hart state data for every hart */
for (i = 0; i <= sbi_scratch_last_hartid(); i++) { for (i = 0; i <= sbi_scratch_last_hartindex(); i++) {
rscratch = sbi_hartid_to_scratch(i); rscratch = sbi_hartindex_to_scratch(i);
if (!rscratch) if (!rscratch)
continue; continue;
hdata = sbi_scratch_offset_ptr(rscratch, hdata = sbi_scratch_offset_ptr(rscratch,
hart_data_offset); hart_data_offset);
ATOMIC_INIT(&hdata->state, ATOMIC_INIT(&hdata->state,
(i == hartid) ? (sbi_hartindex_to_hartid(i) == hartid) ?
SBI_HSM_STATE_START_PENDING : SBI_HSM_STATE_START_PENDING :
SBI_HSM_STATE_STOPPED); SBI_HSM_STATE_STOPPED);
ATOMIC_INIT(&hdata->start_ticket, 0); ATOMIC_INIT(&hdata->start_ticket, 0);

10
lib/sbi/sbi_init.c
View File

@ -242,6 +242,8 @@ static void wait_for_coldboot(struct sbi_scratch *scratch, u32 hartid)
static void wake_coldboot_harts(struct sbi_scratch *scratch, u32 hartid) static void wake_coldboot_harts(struct sbi_scratch *scratch, u32 hartid)
{ {
u32 i, hartindex = sbi_hartid_to_hartindex(hartid);
/* Mark coldboot done */ /* Mark coldboot done */
__smp_store_release(&coldboot_done, 1); __smp_store_release(&coldboot_done, 1);
@ -249,10 +251,10 @@ static void wake_coldboot_harts(struct sbi_scratch *scratch, u32 hartid)
spin_lock(&coldboot_lock); spin_lock(&coldboot_lock);
/* Send an IPI to all HARTs waiting for coldboot */ /* Send an IPI to all HARTs waiting for coldboot */
for (u32 i = 0; i <= sbi_scratch_last_hartid(); i++) { sbi_hartmask_for_each_hartindex(i, &coldboot_wait_hmask) {
if ((i != hartid) && if (i == hartindex)
sbi_hartmask_test_hartid(i, &coldboot_wait_hmask)) continue;
sbi_ipi_raw_send(sbi_hartid_to_hartindex(i)); sbi_ipi_raw_send(i);
} }
/* Release coldboot lock */ /* Release coldboot lock */

2
lib/sbi/sbi_scratch.c
View File

@ -14,7 +14,6 @@
#include <sbi/sbi_scratch.h> #include <sbi/sbi_scratch.h>
#include <sbi/sbi_string.h> #include <sbi/sbi_string.h>
u32 last_hartid_having_scratch = SBI_HARTMASK_MAX_BITS - 1;
u32 last_hartindex_having_scratch = 0; u32 last_hartindex_having_scratch = 0;
u32 hartindex_to_hartid_table[SBI_HARTMASK_MAX_BITS + 1] = { -1U }; u32 hartindex_to_hartid_table[SBI_HARTMASK_MAX_BITS + 1] = { -1U };
struct sbi_scratch *hartindex_to_scratch_table[SBI_HARTMASK_MAX_BITS + 1] = { 0 }; struct sbi_scratch *hartindex_to_scratch_table[SBI_HARTMASK_MAX_BITS + 1] = { 0 };
@ -45,7 +44,6 @@ int sbi_scratch_init(struct sbi_scratch *scratch)
hartindex_to_hartid_table[i] = h; hartindex_to_hartid_table[i] = h;
hartindex_to_scratch_table[i] = hartindex_to_scratch_table[i] =
((hartid2scratch)scratch->hartid_to_scratch)(h, i); ((hartid2scratch)scratch->hartid_to_scratch)(h, i);
last_hartid_having_scratch = h;
} }
last_hartindex_having_scratch = plat->hart_count - 1; last_hartindex_having_scratch = plat->hart_count - 1;