commit debee5a462ecd1ef8fc0a319252684401d00216f
author Mike Voydanoff <voydanoff@google.com> Thu Jun 14 18:25:43 2018 -0700
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Mon Jun 18 22:05:43 2018 +0000
tree 8c05d6d3edc986b415aa9159f464c058d6e72112
parent 2a6d4429a2817f50435e200f1eb92577d79b6b25

[syscalls][interrupts] Mask level triggered interrupts when returning from zx_interrupt_wait

This was the previous behavior, but it got lost somewhere along the way

TEST: manual testing on vim2 and nuc

Change-Id: Ieb1c98963a2f4da4d9e310444e9880830eb4d0a0

kernel/object/interrupt_dispatcher.cpp

diff --git a/kernel/object/interrupt_dispatcher.cpp b/kernel/object/interrupt_dispatcher.cpp
index 69ee0f0..a826c01 100644
--- a/kernel/object/interrupt_dispatcher.cpp
+++ b/kernel/object/interrupt_dispatcher.cpp
@@ -112,6 +112,9 @@
         SendPacketLocked(timestamp_);
         state_ = InterruptState::NEEDACK;
     } else {
+        if (flags_ & INTERRUPT_MASK_POSTWAIT) {
+            MaskInterrupt();
+        }
         Signal();
         state_ = InterruptState::TRIGGERED;
     }