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

lib: sbi: Use sbi_hartmask in sbi_hsm_hart_interruptible_mask()

Browse Source 
This removes several hartid/hartindex conversions, as well as two loops
through the mask for broadcast IPIs.

Signed-off-by: Samuel Holland <samuel.holland@sifive.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
This commit is contained in:
Samuel Holland
2024-08-30 08:49:13 -07:00
committed by Anup Patel
parent ebe0f31446
commit fe153c5516
6 changed files with 52 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/sbi/sbi_domain.c
View File

@@ -75,20 +75,19 @@ bool sbi_domain_is_assigned_hart(const struct sbi_domain *dom, u32 hartid)
return ret;
}
ulong sbi_domain_get_assigned_hartmask(const struct sbi_domain *dom,
ulong hbase)
int sbi_domain_get_assigned_hartmask(const struct sbi_domain *dom,
struct sbi_hartmask *mask)
{
ulong ret = 0;
struct sbi_domain *tdom = (struct sbi_domain *)dom;
if (!dom)
if (!dom) {
sbi_hartmask_clear_all(mask);
return 0;
}
spin_lock(&tdom->assigned_harts_lock);
for (int i = 0; i < 8 * sizeof(ret); i++) {
if (sbi_hartmask_test_hartid(hbase + i, &tdom->assigned_harts))
ret |= 1UL << i;
}
sbi_hartmask_copy(mask, &tdom->assigned_harts);
spin_unlock(&tdom->assigned_harts_lock);
return ret;

37
lib/sbi/sbi_hsm.c
View File

@@ -110,36 +110,27 @@ static void hsm_start_ticket_release(struct sbi_hsm_data *hdata)
}
/**
* Get ulong HART mask for given HART base ID
* Get the mask of harts which are valid IPI targets
* @param dom the domain to be used for output HART mask
* @param hbase the HART base ID
* @param out_hmask the output ulong HART mask
* @param mask the output hartmask to fill
* @return 0 on success and SBI_Exxx (< 0) on failure
* Note: the output HART mask will be set to zero on failure as well.
*/
int sbi_hsm_hart_interruptible_mask(const struct sbi_domain *dom,
ulong hbase, ulong *out_hmask)
struct sbi_hartmask *mask)
{
int hstate;
ulong i, hmask, dmask;
u32 hartindex;
int hstate, ret;
u32 i;
*out_hmask = 0;
if (!sbi_hartid_valid(hbase))
return SBI_EINVAL;
ret = sbi_domain_get_assigned_hartmask(dom, mask);
if (ret)
return ret;
dmask = sbi_domain_get_assigned_hartmask(dom, hbase);
for (i = 0; i < BITS_PER_LONG; i++) {
hmask = 1UL << i;
if (!(dmask & hmask))
continue;
hartindex = sbi_hartid_to_hartindex(hbase + i);
hstate = __sbi_hsm_hart_get_state(hartindex);
if (hstate == SBI_HSM_STATE_STARTED ||
hstate == SBI_HSM_STATE_SUSPENDED ||
hstate == SBI_HSM_STATE_RESUME_PENDING)
*out_hmask |= hmask;
sbi_hartmask_for_each_hartindex(i, mask) {
hstate = __sbi_hsm_hart_get_state(i);
if (hstate != SBI_HSM_STATE_STARTED &&
hstate != SBI_HSM_STATE_SUSPENDED &&
hstate != SBI_HSM_STATE_RESUME_PENDING)
sbi_hartmask_clear_hartindex(i, mask);
}
return 0;

32
lib/sbi/sbi_ipi.c
View File

@@ -111,31 +111,25 @@ int sbi_ipi_send_many(ulong hmask, ulong hbase, u32 event, void *data)
{
int rc = 0;
bool retry_needed;
ulong i, m;
struct sbi_hartmask target_mask = {0};
ulong i;
struct sbi_hartmask target_mask;
struct sbi_domain *dom = sbi_domain_thishart_ptr();
struct sbi_scratch *scratch = sbi_scratch_thishart_ptr();
/* Find the target harts */
if (hbase != -1UL) {
rc = sbi_hsm_hart_interruptible_mask(dom, hbase, &m);
if (rc)
return rc;
m &= hmask;
rc = sbi_hsm_hart_interruptible_mask(dom, &target_mask);
if (rc)
return rc;
for (i = hbase; m; i++, m >>= 1) {
if (m & 1UL)
sbi_hartmask_set_hartid(i, &target_mask);
}
} else {
hbase = 0;
while (!sbi_hsm_hart_interruptible_mask(dom, hbase, &m)) {
for (i = hbase; m; i++, m >>= 1) {
if (m & 1UL)
sbi_hartmask_set_hartid(i, &target_mask);
}
hbase += BITS_PER_LONG;
if (hbase != -1UL) {
struct sbi_hartmask tmp_mask = { 0 };
for (i = hbase; hmask; i++, hmask >>= 1) {
if (hmask & 1UL)
sbi_hartmask_set_hartid(i, &tmp_mask);
}
sbi_hartmask_and(&target_mask, &target_mask, &tmp_mask);
}
/* Send IPIs */