lib: irqchip/plic: Factor out a context init function

This simplifies both the callers and the callees by removing duplicated
code and consolidating the error handling. It also fixes two bugs in the
process:
  1) ie_words was one too large when plic->num_src was a multiple of 32.
  2) plic_set_ie takes a 32-bit mask, not a Boolean value, so the FPGA
     platforms previously only enabled one out of every 32 interrupts.

Reviewed-by: Anup Patel <anup@brainfault.org>
Signed-off-by: Samuel Holland <samuel@sholland.org>
This commit is contained in:
Samuel Holland
2022-06-12 20:03:50 -05:00
committed by Anup Patel
parent 2ea7799d56
commit 8c362e7d06
4 changed files with 49 additions and 54 deletions

View File

@@ -134,24 +134,21 @@ static int openpiton_console_init(void)
static int plic_openpiton_warm_irqchip_init(int m_cntx_id, int s_cntx_id)
{
size_t i, ie_words = plic.num_src / 32 + 1;
int ret;
/* By default, enable all IRQs for M-mode of target HART */
if (m_cntx_id > -1) {
for (i = 0; i < ie_words; i++)
plic_set_ie(&plic, m_cntx_id, i, 1);
ret = plic_context_init(&plic, m_cntx_id, true, 0x1);
if (ret)
return ret;
}
/* Enable all IRQs for S-mode of target HART */
if (s_cntx_id > -1) {
for (i = 0; i < ie_words; i++)
plic_set_ie(&plic, s_cntx_id, i, 1);
ret = plic_context_init(&plic, s_cntx_id, true, 0x0);
if (ret)
return ret;
}
/* By default, enable M-mode threshold */
if (m_cntx_id > -1)
plic_set_thresh(&plic, m_cntx_id, 1);
/* By default, disable S-mode threshold */
if (s_cntx_id > -1)
plic_set_thresh(&plic, s_cntx_id, 0);
return 0;
}