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

lib: Remove hartid parameter from IRQCHIP callbacks

Browse Source 
The hartid parameter in IRQCHIP callbacks of sbi_platform
is not required because current hartid can be determined
using sbi_current_hartid() API.

Signed-off-by: Anup Patel <anup.patel@wdc.com>
This commit is contained in:
Anup Patel
2019-01-22 14:33:41 +05:30
committed by Anup Patel
parent 18ec89e46e
commit 74fd2e5bb2
6 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/sbi/sbi_platform.h
View File

@@ -82,7 +82,7 @@ struct sbi_platform {
int (*console_init)(void); int (*console_init)(void);
/** Initialize the platform interrupt controller */ /** Initialize the platform interrupt controller */
int (*irqchip_init)(u32 hartid, bool cold_boot); int (*irqchip_init)(bool cold_boot);
/** Inject IPI to a target HART */ /** Inject IPI to a target HART */
void (*ipi_inject)(u32 target_hart); void (*ipi_inject)(u32 target_hart);
@@ -308,16 +308,15 @@ static inline int sbi_platform_console_init(struct sbi_platform *plat)
* Initialize the platform interrupt controller for given HART * Initialize the platform interrupt controller for given HART
* *
* @param plat pointer to struct sbi_platform * @param plat pointer to struct sbi_platform
* @param hartid HART ID
* @param cold_boot whether cold boot (TRUE) or warm_boot (FALSE) * @param cold_boot whether cold boot (TRUE) or warm_boot (FALSE)
* *
* @return 0 on success and negative error code on failure * @return 0 on success and negative error code on failure
*/ */
static inline int sbi_platform_irqchip_init(struct sbi_platform *plat, static inline int sbi_platform_irqchip_init(struct sbi_platform *plat,
u32 hartid, bool cold_boot) bool cold_boot)
{ {
if (plat && plat->irqchip_init) if (plat && plat->irqchip_init)
return plat->irqchip_init(hartid, cold_boot); return plat->irqchip_init(cold_boot);
return 0; return 0;
} }

4
lib/sbi_init.c
View File

@@ -45,7 +45,7 @@ static void __noreturn init_coldboot(struct sbi_scratch *scratch, u32 hartid)
if (rc) if (rc)
sbi_hart_hang(); sbi_hart_hang();
rc = sbi_platform_irqchip_init(plat, hartid, TRUE); rc = sbi_platform_irqchip_init(plat, TRUE);
if (rc) if (rc)
sbi_hart_hang(); sbi_hart_hang();
@@ -111,7 +111,7 @@ static void __noreturn init_warmboot(struct sbi_scratch *scratch, u32 hartid)
if (rc) if (rc)
sbi_hart_hang(); sbi_hart_hang();
rc = sbi_platform_irqchip_init(plat, hartid, FALSE); rc = sbi_platform_irqchip_init(plat, FALSE);
if (rc) if (rc)
sbi_hart_hang(); sbi_hart_hang();

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

@@ -9,6 +9,7 @@
#include <sbi/riscv_encoding.h> #include <sbi/riscv_encoding.h>
#include <sbi/sbi_const.h> #include <sbi/sbi_const.h>
#include <sbi/sbi_hart.h>
#include <sbi/sbi_platform.h> #include <sbi/sbi_platform.h>
#include <sbi/sbi_console.h> #include <sbi/sbi_console.h>
#include <plat/irqchip/plic.h> #include <plat/irqchip/plic.h>
@@ -35,9 +36,10 @@ static char k210_console_getc(void)
return uarths_getc(); return uarths_getc();
} }
static int k210_irqchip_init(u32 hartid, bool cold_boot) static int k210_irqchip_init(bool cold_boot)
{ {
int rc; int rc;
u32 hartid = sbi_current_hartid();
if (cold_boot) { if (cold_boot) {
rc = plic_cold_irqchip_init(PLIC_BASE_ADDR, rc = plic_cold_irqchip_init(PLIC_BASE_ADDR,

4
platform/qemu/sifive_u/platform.c
View File

@@ -9,6 +9,7 @@
#include <sbi/riscv_encoding.h> #include <sbi/riscv_encoding.h>
#include <sbi/sbi_const.h> #include <sbi/sbi_const.h>
#include <sbi/sbi_hart.h>
#include <sbi/sbi_platform.h> #include <sbi/sbi_platform.h>
#include <plat/irqchip/plic.h> #include <plat/irqchip/plic.h>
#include <plat/serial/sifive-uart.h> #include <plat/serial/sifive-uart.h>
@@ -72,9 +73,10 @@ static int sifive_u_console_init(void)
SIFIVE_U_PERIPH_CLK, 115200); SIFIVE_U_PERIPH_CLK, 115200);
} }
static int sifive_u_irqchip_init(u32 hartid, bool cold_boot) static int sifive_u_irqchip_init(bool cold_boot)
{ {
int rc; int rc;
u32 hartid = sbi_current_hartid();
if (cold_boot) { if (cold_boot) {
rc = plic_cold_irqchip_init(SIFIVE_U_PLIC_ADDR, rc = plic_cold_irqchip_init(SIFIVE_U_PLIC_ADDR,

4
platform/qemu/virt/platform.c
View File

@@ -9,6 +9,7 @@
#include <sbi/riscv_encoding.h> #include <sbi/riscv_encoding.h>
#include <sbi/sbi_const.h> #include <sbi/sbi_const.h>
#include <sbi/sbi_hart.h>
#include <sbi/sbi_platform.h> #include <sbi/sbi_platform.h>
#include <plat/irqchip/plic.h> #include <plat/irqchip/plic.h>
#include <plat/serial/uart8250.h> #include <plat/serial/uart8250.h>
@@ -73,9 +74,10 @@ static int virt_console_init(void)
VIRT_UART_BAUDRATE, 0, 1); VIRT_UART_BAUDRATE, 0, 1);
} }
static int virt_irqchip_init(u32 hartid, bool cold_boot) static int virt_irqchip_init(bool cold_boot)
{ {
int rc; int rc;
u32 hartid = sbi_current_hartid();
if (cold_boot) { if (cold_boot) {
rc = plic_cold_irqchip_init(VIRT_PLIC_ADDR, rc = plic_cold_irqchip_init(VIRT_PLIC_ADDR,

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

@@ -11,6 +11,7 @@
#include <fdt.h> #include <fdt.h>
#include <sbi/riscv_encoding.h> #include <sbi/riscv_encoding.h>
#include <sbi/sbi_const.h> #include <sbi/sbi_const.h>
#include <sbi/sbi_hart.h>
#include <sbi/sbi_console.h> #include <sbi/sbi_console.h>
#include <sbi/sbi_platform.h> #include <sbi/sbi_platform.h>
#include <sbi/riscv_io.h> #include <sbi/riscv_io.h>
@@ -124,9 +125,10 @@ static int fu540_console_init(void)
peri_in_freq, FU540_UART_BAUDRATE); peri_in_freq, FU540_UART_BAUDRATE);
} }
static int fu540_irqchip_init(u32 hartid, bool cold_boot) static int fu540_irqchip_init(bool cold_boot)
{ {
int rc; int rc;
u32 hartid = sbi_current_hartid();
if (cold_boot) { if (cold_boot) {
rc = plic_cold_irqchip_init(FU540_PLIC_ADDR, rc = plic_cold_irqchip_init(FU540_PLIC_ADDR,