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

lib: utils: Remove redundant parameters from PLIC init functions

Browse Source 
The "target_hart" and "hart_count" parameters of PLIC cold and
warm init functions are only used for sanity checks and not
required in PLIC initialization.

Signed-off-by: Anup Patel <anup.patel@wdc.com>
Reviewed-by: Atish Patra <atish.patra@wdc.com>
This commit is contained in:
Anup Patel
2020-05-12 10:14:43 +05:30
committed by Anup Patel
parent 89ba63493c
commit 73d6ef3b29
10 changed files with 22 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
platform/andes/ae350/platform.c
View File

@@ -71,13 +71,12 @@ static int ae350_irqchip_init(bool cold_boot)
if (cold_boot) {
ret = plic_cold_irqchip_init(AE350_PLIC_ADDR,
AE350_PLIC_NUM_SOURCES,
AE350_HART_COUNT);
AE350_PLIC_NUM_SOURCES);
if (ret)
return ret;
}
return plic_warm_irqchip_init(hartid, 2 * hartid, 2 * hartid + 1);
return plic_warm_irqchip_init(2 * hartid, 2 * hartid + 1);
}
/* Initialize IPI for current HART. */

11
platform/fpga/ariane/platform.c
View File

@@ -63,13 +63,10 @@ static int ariane_console_init(void)
ARIANE_UART_REG_WIDTH);
}
static int plic_ariane_warm_irqchip_init(u32 target_hart,
int m_cntx_id, int s_cntx_id)
static int plic_ariane_warm_irqchip_init(int m_cntx_id, int s_cntx_id)
{
size_t i, ie_words = ARIANE_PLIC_NUM_SOURCES / 32 + 1;
if (ARIANE_HART_COUNT <= target_hart)
return -1;
/* By default, enable all IRQs for M-mode of target HART */
if (m_cntx_id > -1) {
for (i = 0; i < ie_words; i++)
@@ -99,14 +96,12 @@ static int ariane_irqchip_init(bool cold_boot)
int ret;
if (cold_boot) {
ret = plic_cold_irqchip_init(ARIANE_PLIC_ADDR,
ARIANE_PLIC_NUM_SOURCES,
ret = plic_cold_irqchip_init(ARIANE_PLIC_NUM_SOURCES,
ARIANE_HART_COUNT);
if (ret)
return ret;
}
return plic_ariane_warm_irqchip_init(hartid,
2 * hartid, 2 * hartid + 1);
return plic_ariane_warm_irqchip_init(2 * hartid, 2 * hartid + 1);
}
/*

11
platform/fpga/openpiton/platform.c
View File

@@ -95,13 +95,10 @@ static int openpiton_console_init(void)
OPENPITON_DEFAULT_UART_REG_WIDTH);
}
static int plic_openpiton_warm_irqchip_init(u32 target_hart,
int m_cntx_id, int s_cntx_id)
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;
if (target_hart >= OPENPITON_DEFAULT_HART_COUNT)
return -1;
/* By default, enable all IRQs for M-mode of target HART */
if (m_cntx_id > -1) {
for (i = 0; i < ie_words; i++)
@@ -132,13 +129,11 @@ static int openpiton_irqchip_init(bool cold_boot)
if (cold_boot) {
ret = plic_cold_irqchip_init(plic.addr,
plic.num_src,
OPENPITON_DEFAULT_HART_COUNT);
plic.num_src);
if (ret)
return ret;
}
return plic_openpiton_warm_irqchip_init(hartid,
2 * hartid, 2 * hartid + 1);
return plic_openpiton_warm_irqchip_init(2 * hartid, 2 * hartid + 1);
}
/*

5
platform/kendryte/k210/platform.c
View File

@@ -59,13 +59,12 @@ static int k210_irqchip_init(bool cold_boot)
if (cold_boot) {
rc = plic_cold_irqchip_init(K210_PLIC_BASE_ADDR,
K210_PLIC_NUM_SOURCES,
K210_HART_COUNT);
K210_PLIC_NUM_SOURCES);
if (rc)
return rc;
}
return plic_warm_irqchip_init(hartid, hartid * 2, hartid * 2 + 1);
return plic_warm_irqchip_init(hartid * 2, hartid * 2 + 1);
}
static int k210_ipi_init(bool cold_boot)

5
platform/nuclei/ux600/platform.c
View File

@@ -74,13 +74,12 @@ static int ux600_irqchip_init(bool cold_boot)
if (cold_boot) {
rc = plic_cold_irqchip_init(UX600_PLIC_ADDR,
UX600_PLIC_NUM_SOURCES,
UX600_HART_COUNT);
UX600_PLIC_NUM_SOURCES);
if (rc)
return rc;
}
return plic_warm_irqchip_init(hartid, (hartid) ? (2 * hartid - 1) : 0,
return plic_warm_irqchip_init((hartid) ? (2 * hartid - 1) : 0,
(hartid) ? (2 * hartid) : -1);
}

5
platform/sifive/fu540/platform.c
View File

@@ -89,13 +89,12 @@ static int fu540_irqchip_init(bool cold_boot)
if (cold_boot) {
rc = plic_cold_irqchip_init(FU540_PLIC_ADDR,
FU540_PLIC_NUM_SOURCES,
FU540_HART_COUNT);
FU540_PLIC_NUM_SOURCES);
if (rc)
return rc;
}
return plic_warm_irqchip_init(hartid, (hartid) ? (2 * hartid - 1) : 0,
return plic_warm_irqchip_init((hartid) ? (2 * hartid - 1) : 0,
(hartid) ? (2 * hartid) : -1);
}

5
platform/template/platform.c
View File

@@ -71,13 +71,12 @@ static int platform_irqchip_init(bool cold_boot)
/* Example if the generic PLIC driver is used */
if (cold_boot) {
ret = plic_cold_irqchip_init(PLATFORM_PLIC_ADDR,
PLATFORM_PLIC_NUM_SOURCES,
PLATFORM_HART_COUNT);
PLATFORM_PLIC_NUM_SOURCES);
if (ret)
return ret;
}
return plic_warm_irqchip_init(hartid, 2 * hartid, 2 * hartid + 1);
return plic_warm_irqchip_init(2 * hartid, 2 * hartid + 1);
}
/*