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

lib: sbi_ipi: Make .ipi_clear always target the current hart

Browse Source 
All existing users of this operation target the current hart, and it
seems unlikely that a future user will need to clear the pending IPI
status of a remote hart. Simplify the logic by changing .ipi_clear (and
its wrapper sbi_ipi_raw_clear()) to always operate on the current hart.

This incidentally fixes a bug introduced in commit 78c667b6fc ("lib:
sbi: Prefer hartindex over hartid in IPI framework"), which changed the
.ipi_clear parameter from a hartid to a hart index, but failed to update
the warm_init functions to match.

Fixes: 78c667b6fc ("lib: sbi: Prefer hartindex over hartid in IPI framework")
Signed-off-by: Samuel Holland <samuel.holland@sifive.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
This commit is contained in:
Samuel Holland
2024-10-25 11:59:46 -07:00
committed by Anup Patel
parent db8f03e512
commit be9752a071
5 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/sbi/sbi_init.c
View File

@@ -479,7 +479,7 @@ static void __noreturn init_warmboot(struct sbi_scratch *scratch, u32 hartid)
if (hstate == SBI_HSM_STATE_SUSPENDED) {
init_warm_resume(scratch, hartid);
} else {
sbi_ipi_raw_clear(sbi_hartid_to_hartindex(hartid));
sbi_ipi_raw_clear();
init_warm_startup(scratch, hartid);
}
}

7
lib/sbi/sbi_ipi.c
View File

@@ -237,10 +237,9 @@ void sbi_ipi_process(void)
struct sbi_scratch *scratch = sbi_scratch_thishart_ptr();
struct sbi_ipi_data *ipi_data =
sbi_scratch_offset_ptr(scratch, ipi_data_off);
u32 hartindex = current_hartindex();
sbi_pmu_ctr_incr_fw(SBI_PMU_FW_IPI_RECVD);
sbi_ipi_raw_clear(hartindex);
sbi_ipi_raw_clear();
ipi_type = atomic_raw_xchg_ulong(&ipi_data->ipi_type, 0);
ipi_event = 0;
@@ -275,10 +274,10 @@ int sbi_ipi_raw_send(u32 hartindex)
return 0;
}
void sbi_ipi_raw_clear(u32 hartindex)
void sbi_ipi_raw_clear(void)
{
if (ipi_dev && ipi_dev->ipi_clear)
ipi_dev->ipi_clear(hartindex);
ipi_dev->ipi_clear();
/*
* Ensure that memory or MMIO writes after this

13
lib/utils/ipi/aclint_mswi.c
View File

@@ -45,24 +45,19 @@ static void mswi_ipi_send(u32 hart_index)
mswi->first_hartid]);
}
static void mswi_ipi_clear(u32 hart_index)
static void mswi_ipi_clear(void)
{
u32 *msip;
struct sbi_scratch *scratch;
struct sbi_scratch *scratch = sbi_scratch_thishart_ptr();
struct aclint_mswi_data *mswi;
scratch = sbi_hartindex_to_scratch(hart_index);
if (!scratch)
return;
mswi = mswi_get_hart_data_ptr(scratch);
if (!mswi)
return;
/* Clear ACLINT IPI */
msip = (void *)mswi->addr;
writel_relaxed(0, &msip[sbi_hartindex_to_hartid(hart_index) -
mswi->first_hartid]);
writel_relaxed(0, &msip[current_hartid() - mswi->first_hartid]);
}
static struct sbi_ipi_device aclint_mswi = {
@@ -74,7 +69,7 @@ static struct sbi_ipi_device aclint_mswi = {
int aclint_mswi_warm_init(void)
{
/* Clear IPI for current HART */
mswi_ipi_clear(current_hartindex());
mswi_ipi_clear();
return 0;
}

6
lib/utils/ipi/andes_plicsw.c
View File

@@ -41,9 +41,9 @@ static void plicsw_ipi_send(u32 hart_index)
writel_relaxed(BIT(pending_bit), (void *)pending_reg);
}
static void plicsw_ipi_clear(u32 hart_index)
static void plicsw_ipi_clear(void)
{
u32 target_hart = sbi_hartindex_to_hartid(hart_index);
u32 target_hart = current_hartid();
ulong reg = plicsw.addr + PLICSW_CONTEXT_BASE + PLICSW_CONTEXT_CLAIM +
PLICSW_CONTEXT_STRIDE * target_hart;
@@ -68,7 +68,7 @@ static struct sbi_ipi_device plicsw_ipi = {
int plicsw_warm_ipi_init(void)
{
/* Clear PLICSW IPI */
plicsw_ipi_clear(current_hartindex());
plicsw_ipi_clear();
return 0;
}