@@ -212,24 +212,11 @@ static void lpi_exec(void)
static bool timer_prep(void)
{
- void *gic_isenabler;
-
gic_enable_defaults();
install_irq_handler(EL1H_IRQ, gic_irq_handler);
local_irq_enable();
- switch (gic_version()) {
- case 2:
- gic_isenabler = gicv2_dist_base() + GICD_ISENABLER;
- break;
- case 3:
- gic_isenabler = gicv3_sgi_base() + GICR_ISENABLER0;
- break;
- default:
- assert_msg(0, "Unreachable");
- }
-
- writel(1 << PPI(TIMER_VTIMER_IRQ), gic_isenabler);
+ gic_enable_irq(PPI(TIMER_VTIMER_IRQ));
write_sysreg(ARCH_TIMER_CTL_IMASK | ARCH_TIMER_CTL_ENABLE, cntv_ctl_el0);
isb();