forked from Mirrors/opensbi
		
	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 <anup.patel@wdc.com>
This commit is contained in:
		@@ -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,
 | 
			
		||||
 
 | 
			
		||||
@@ -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,
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user