lib: Simplify sbi_platform ipi_init() hooks

Instead of having separate ipi_init() hooks for cold and warm boot,
this patch updates struct sbi_platform to have just one ipi_init()
hook. The type of boot (cold or warm) is now a boolean flag parameter
for the updated ipi_init() hook.

Signed-off-by: Anup Patel <[email protected]>

4 files changed, 49 insertions, 19 deletions

diff --git a/platform/kendryte/k210/platform.c b/platform/kendryte/k210/platform.c
index 43c32440..d11dd66e 100644
--- a/platform/kendryte/k210/platform.c
+++ b/platform/kendryte/k210/platform.c
@@ -52,9 +52,18 @@ static int k210_irqchip_init(u32 hartid, bool cold_boot)
 				      (2 * hartid + 1));
 }
 
-static int k210_cold_ipi_init(void)
+static int k210_ipi_init(u32 hartid, bool cold_boot)
 {
-	return clint_cold_ipi_init(CLINT_BASE_ADDR, K210_HART_COUNT);
+	int rc;
+
+	if (cold_boot) {
+		rc = clint_cold_ipi_init(CLINT_BASE_ADDR,
+					 K210_HART_COUNT);
+		if (rc)
+			return rc;
+	}
+
+	return clint_warm_ipi_init(hartid);
 }
 
 static int k210_cold_timer_init(void)
@@ -93,8 +102,7 @@ struct sbi_platform platform = {
 
 	.irqchip_init = k210_irqchip_init,
 
-	.cold_ipi_init = k210_cold_ipi_init,
-	.warm_ipi_init = clint_warm_ipi_init,
+	.ipi_init = k210_ipi_init,
 	.ipi_inject = clint_ipi_inject,
 	.ipi_sync = clint_ipi_sync,
 	.ipi_clear = clint_ipi_clear,
diff --git a/platform/qemu/sifive_u/platform.c b/platform/qemu/sifive_u/platform.c
index db6dccd5..4e6ac483 100644
--- a/platform/qemu/sifive_u/platform.c
+++ b/platform/qemu/sifive_u/platform.c
@@ -91,10 +91,18 @@ static int sifive_u_irqchip_init(u32 hartid, bool cold_boot)
 				      (2 * hartid + 1));
 }
 
-static int sifive_u_cold_ipi_init(void)
+static int sifive_u_ipi_init(u32 hartid, bool cold_boot)
 {
-	return clint_cold_ipi_init(SIFIVE_U_CLINT_ADDR,
-				   SIFIVE_U_HART_COUNT);
+	int rc;
+
+	if (cold_boot) {
+		rc = clint_cold_ipi_init(SIFIVE_U_CLINT_ADDR,
+					 SIFIVE_U_HART_COUNT);
+		if (rc)
+			return rc;
+	}
+
+	return clint_warm_ipi_init(hartid);
 }
 
 static int sifive_u_cold_timer_init(void)
@@ -125,8 +133,7 @@ struct sbi_platform platform = {
 	.ipi_inject = clint_ipi_inject,
 	.ipi_sync = clint_ipi_sync,
 	.ipi_clear = clint_ipi_clear,
-	.warm_ipi_init = clint_warm_ipi_init,
-	.cold_ipi_init = sifive_u_cold_ipi_init,
+	.ipi_init = sifive_u_ipi_init,
 	.timer_value = clint_timer_value,
 	.timer_event_stop = clint_timer_event_stop,
 	.timer_event_start = clint_timer_event_start,
diff --git a/platform/qemu/virt/platform.c b/platform/qemu/virt/platform.c
index 986dfc57..f9dce4a7 100644
--- a/platform/qemu/virt/platform.c
+++ b/platform/qemu/virt/platform.c
@@ -92,10 +92,18 @@ static int virt_irqchip_init(u32 hartid, bool cold_boot)
 				      (2 * hartid + 1));
 }
 
-static int virt_cold_ipi_init(void)
+static int virt_ipi_init(u32 hartid, bool cold_boot)
 {
-	return clint_cold_ipi_init(VIRT_CLINT_ADDR,
-				   VIRT_HART_COUNT);
+	int rc;
+
+	if (cold_boot) {
+		rc = clint_cold_ipi_init(VIRT_CLINT_ADDR,
+					 VIRT_HART_COUNT);
+		if (rc)
+			return rc;
+	}
+
+	return clint_warm_ipi_init(hartid);
 }
 
 static int virt_cold_timer_init(void)
@@ -126,8 +134,7 @@ struct sbi_platform platform = {
 	.ipi_inject = clint_ipi_inject,
 	.ipi_sync = clint_ipi_sync,
 	.ipi_clear = clint_ipi_clear,
-	.warm_ipi_init = clint_warm_ipi_init,
-	.cold_ipi_init = virt_cold_ipi_init,
+	.ipi_init = virt_ipi_init,
 	.timer_value = clint_timer_value,
 	.timer_event_stop = clint_timer_event_stop,
 	.timer_event_start = clint_timer_event_start,
diff --git a/platform/sifive/hifive_u540/platform.c b/platform/sifive/hifive_u540/platform.c
index 6d6ac182..fabb73e8 100644
--- a/platform/sifive/hifive_u540/platform.c
+++ b/platform/sifive/hifive_u540/platform.c
@@ -111,10 +111,19 @@ static int sifive_u_irqchip_init(u32 hartid, bool cold_boot)
 			(hartid) ? (2 * hartid) : -1);
 }
 
-static int sifive_u_cold_ipi_init(void)
+static int sifive_u_ipi_init(u32 hartid, bool cold_boot)
 {
-	return clint_cold_ipi_init(SIFIVE_U_CLINT_ADDR,
-				   SIFIVE_U_HART_COUNT);
+	int rc;
+
+	if (cold_boot) {
+		rc = clint_cold_ipi_init(SIFIVE_U_CLINT_ADDR,
+					 SIFIVE_U_HART_COUNT);
+		if (rc)
+			return rc;
+
+	}
+
+	return clint_warm_ipi_init(hartid);
 }
 
 static int sifive_u_cold_timer_init(void)
@@ -145,8 +154,7 @@ struct sbi_platform platform = {
 	.ipi_inject = clint_ipi_inject,
 	.ipi_sync = clint_ipi_sync,
 	.ipi_clear = clint_ipi_clear,
-	.warm_ipi_init = clint_warm_ipi_init,
-	.cold_ipi_init = sifive_u_cold_ipi_init,
+	.ipi_init = sifive_u_ipi_init,
 	.timer_value = clint_timer_value,
 	.timer_event_stop = clint_timer_event_stop,
 	.timer_event_start = clint_timer_event_start,