media: aspeed-video: ignore interrupts that aren't enabled

As partially addressed in commit 65d270acb2d6 ("media: aspeed: clear
garbage interrupts"), the ASpeed video engine sometimes asserts
interrupts that the driver hasn't enabled.  In addition to the
CAPTURE_COMPLETE and FRAME_COMPLETE interrupts dealt with in that
patch, COMP_READY has also been observed.  Instead of playing
whack-a-mole with each one individually, we can instead just blanket
ignore everything we haven't explicitly enabled.

Signed-off-by: Zev Weiss <zev@bewilderbeest.net>
Tested-by: Lei YU <yulei.sh@bytedance.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c
index 7bb6babdcade049bf7e6a806d19026a687f15a31..77611c296a254d8a5e24185f212305a9b225d8e1 100644 (file)
--- a/drivers/media/platform/aspeed-video.c
+++ b/drivers/media/platform/aspeed-video.c
@@ -563,6 +563,12 @@ static irqreturn_t aspeed_video_irq(int irq, void *arg)
        struct aspeed_video *video = arg;
        u32 sts = aspeed_video_read(video, VE_INTERRUPT_STATUS);
 
+       /*
+        * Hardware sometimes asserts interrupts that we haven't actually
+        * enabled; ignore them if so.
+        */
+       sts &= aspeed_video_read(video, VE_INTERRUPT_CTRL);
+
        /*
         * Resolution changed or signal was lost; reset the engine and
         * re-initialize
@@ -629,16 +635,6 @@ static irqreturn_t aspeed_video_irq(int irq, void *arg)
                        aspeed_video_start_frame(video);
        }
 
-       /*
-        * CAPTURE_COMPLETE and FRAME_COMPLETE interrupts come even when these
-        * are disabled in the VE_INTERRUPT_CTRL register so clear them to
-        * prevent unnecessary interrupt calls.
-        */
-       if (sts & VE_INTERRUPT_CAPTURE_COMPLETE)
-               sts &= ~VE_INTERRUPT_CAPTURE_COMPLETE;
-       if (sts & VE_INTERRUPT_FRAME_COMPLETE)
-               sts &= ~VE_INTERRUPT_FRAME_COMPLETE;
-
        return sts ? IRQ_NONE : IRQ_HANDLED;
 }