ioapic: reverted setIRQState change

haskell/src/SEL4/Object/Interrupt.lhs

@@ -79,7 +79,9 @@ There is a single, global interrupt controller object; a capability to it is pro
 
 > invokeIRQControl :: IRQControlInvocation -> KernelP ()
 > invokeIRQControl (IssueIRQHandler irq handlerSlot controlSlot) =
->   withoutPreemption $ cteInsert (IRQHandlerCap irq) controlSlot handlerSlot
+>   withoutPreemption $ do
+>     setIRQState (IRQNotifyAEP) irq
+>     cteInsert (IRQHandlerCap irq) controlSlot handlerSlot
 > invokeIRQControl (InterruptControl invok) =
 >     Arch.invokeInterruptControl invok
 
@@ -111,7 +113,6 @@ An IRQ handler capability allows a thread possessing it to set an endpoint which
 > invokeIRQHandler (AckIRQ irq) =
 >     doMachineOp $ maskInterrupt False irq
 > invokeIRQHandler (SetIRQHandler irq cap slot) = do
->     setIRQState (IRQNotifyAEP) irq
 >     irqSlot <- getIRQSlot irq
 >     cteDeleteOne irqSlot
 >     cteInsert cap slot irqSlot

src/object/interrupt.c

@@ -83,6 +83,7 @@ decodeIRQControlInvocation(word_t label, unsigned int length,
 exception_t
 invokeIRQControl(irq_t irq, cte_t *handlerSlot, cte_t *controlSlot)
 {
+    setIRQState(IRQNotifyAEP, irq);
     cteInsert(cap_irq_handler_cap_new(irq), controlSlot, handlerSlot);
 
     return EXCEPTION_NONE;
@@ -169,7 +170,6 @@ invokeIRQHandler_SetIRQHandler(irq_t irq, cap_t cap, cte_t *slot)
 {
     cte_t *irqSlot;
 
-    setIRQState(IRQNotifyAEP, irq);
     irqSlot = intStateIRQNode + irq;
     cteDeleteOne(irqSlot);
     cteInsert(cap, slot, irqSlot);