forked from Mirrors/opensbi
		
	lib: Simplify sbi_platform timer_init() hooks
Instead of having separate timer_init() hooks for cold and warm boot, this patch updates struct sbi_platform to have just one timer_init() hook. The type of boot (cold or warm) is now a boolean flag parameter for the updated timer_init() hook. Signed-off-by: Anup Patel <anup.patel@wdc.com>
This commit is contained in:
		@@ -54,11 +54,7 @@ static void __attribute__((noreturn)) init_coldboot(struct sbi_scratch *scratch,
 | 
			
		||||
	if (rc)
 | 
			
		||||
		sbi_hart_hang();
 | 
			
		||||
 | 
			
		||||
	rc = sbi_timer_cold_init(scratch);
 | 
			
		||||
	if (rc)
 | 
			
		||||
		sbi_hart_hang();
 | 
			
		||||
 | 
			
		||||
	rc = sbi_timer_warm_init(scratch, hartid);
 | 
			
		||||
	rc = sbi_timer_init(scratch, hartid, TRUE);
 | 
			
		||||
	if (rc)
 | 
			
		||||
		sbi_hart_hang();
 | 
			
		||||
 | 
			
		||||
@@ -125,7 +121,7 @@ static void __attribute__((noreturn)) init_warmboot(struct sbi_scratch *scratch,
 | 
			
		||||
	if (rc)
 | 
			
		||||
		sbi_hart_hang();
 | 
			
		||||
 | 
			
		||||
	rc = sbi_timer_warm_init(scratch, hartid);
 | 
			
		||||
	rc = sbi_timer_init(scratch, hartid, FALSE);
 | 
			
		||||
	if (rc)
 | 
			
		||||
		sbi_hart_hang();
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -67,12 +67,9 @@ void sbi_timer_process(struct sbi_scratch *scratch, u32 hartid)
 | 
			
		||||
	csr_set(mip, MIP_STIP);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
int sbi_timer_warm_init(struct sbi_scratch *scratch, u32 hartid)
 | 
			
		||||
int sbi_timer_init(struct sbi_scratch *scratch, u32 hartid,
 | 
			
		||||
		   bool cold_boot)
 | 
			
		||||
{
 | 
			
		||||
	return sbi_platform_warm_timer_init(sbi_platform_ptr(scratch), hartid);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
int sbi_timer_cold_init(struct sbi_scratch *scratch)
 | 
			
		||||
{
 | 
			
		||||
	return sbi_platform_cold_timer_init(sbi_platform_ptr(scratch));
 | 
			
		||||
	return sbi_platform_timer_init(sbi_platform_ptr(scratch),
 | 
			
		||||
					hartid, cold_boot);
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user