move interrupt clearing into set_clock

nickdesaulniers · nickdesaulniers · commit 5b0532e0091a · 2021-04-15T09:21:47.000-07:00
Results in smaller code.

Signed-off-by: Nick Desaulniers &lt;nick.desaulniers@gmail.com&gt;
diff --git a/arm11/source/smp.c b/arm11/source/smp.c
@@ -40,6 +40,7 @@ static void set_clock(short socmode)
 
 	// Write it back to ACK.
 	set_pdn_lgr_socmode(get_pdn_lgr_socmode());
+	gic_clear_interrupt(88);
 }
 
 static void upclock(void) { set_clock(is_lgr2() ? 0x05 : 0x03); }
@@ -51,7 +52,6 @@ static void set_socmode(void)
 	enable_fcram_l2();
 	wait_cycles(403);
 	upclock();
-	gic_clear_interrupt(88);
 }
 
 __attribute__((noreturn))
@@ -94,10 +94,8 @@ static void online_cores23(void)
 {
 	scu_set_cpu_stat(scu_get_cpu_stat() & 0x0F);
 	downclock();
-	gic_clear_interrupt(88);
 	setup_overlays();
 	upclock();
-	gic_clear_interrupt(88);
 	gic_send_swi(2, 2);
 	gic_send_swi(3, 3);
 }

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ static void set_clock(short socmode)`
`40`	`40`
`41`	`41`	`// Write it back to ACK.`
`42`	`42`	`set_pdn_lgr_socmode(get_pdn_lgr_socmode());`
	`43`	`+ gic_clear_interrupt(88);`
`43`	`44`	`}`
`44`	`45`
`45`	`46`	`static void upclock(void) { set_clock(is_lgr2() ? 0x05 : 0x03); }`
`@@ -51,7 +52,6 @@ static void set_socmode(void)`
`51`	`52`	`enable_fcram_l2();`
`52`	`53`	`wait_cycles(403);`
`53`	`54`	`upclock();`
`54`		`- gic_clear_interrupt(88);`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`__attribute__((noreturn))`
`@@ -94,10 +94,8 @@ static void online_cores23(void)`
`94`	`94`	`{`
`95`	`95`	`scu_set_cpu_stat(scu_get_cpu_stat() & 0x0F);`
`96`	`96`	`downclock();`
`97`		`- gic_clear_interrupt(88);`
`98`	`97`	`setup_overlays();`
`99`	`98`	`upclock();`
`100`		`- gic_clear_interrupt(88);`
`101`	`99`	`gic_send_swi(2, 2);`
`102`	`100`	`gic_send_swi(3, 3);`
`103`	`101`	`}`