media: intel/ipu6: do not handle interrupts when device is disabled

commit 1429826883bb18847092b2e04c6598ef34bae1d4 upstream.

Some IPU6 devices have shared interrupts. We need to handle properly
case when interrupt is triggered from other device on shared irq line
and IPU6 itself disabled. In such case we get 0xffffffff from
ISR_STATUS register and handle all irq's cases, for what we are not
not prepared and usually hang the whole system.

To avoid the issue use pm_runtime_get_if_active() to check if
the device is enabled and prevent suspending it when we handle irq
until the end of irq. Additionally use synchronize_irq() in suspend

Fixes: ab29a2478e70 ("media: intel/ipu6: add IPU6 buttress interface driver")
Cc: stable@vger.kernel.org
Signed-off-by: Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Tested-by: Hans de Goede <hdegoede@redhat.com> # ThinkPad X1 Yoga Gen 8, ov2740
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/media/pci/intel/ipu6/ipu6-buttress.c b/drivers/media/pci/intel/ipu6/ipu6-buttress.c
index d66db537be4a6678227e2867e53aeaba8b46c9b2..1ee63ef4a40b22d6d3b75345657cd43eeab65d3e 100644 (file)
--- a/drivers/media/pci/intel/ipu6/ipu6-buttress.c
+++ b/drivers/media/pci/intel/ipu6/ipu6-buttress.c
@@ -346,12 +346,16 @@ irqreturn_t ipu6_buttress_isr(int irq, void *isp_ptr)
        u32 disable_irqs = 0;
        u32 irq_status;
        u32 i, count = 0;
+       int active;
 
-       pm_runtime_get_noresume(&isp->pdev->dev);
+       active = pm_runtime_get_if_active(&isp->pdev->dev);
+       if (!active)
+               return IRQ_NONE;
 
        irq_status = readl(isp->base + reg_irq_sts);
-       if (!irq_status) {
-               pm_runtime_put_noidle(&isp->pdev->dev);
+       if (irq_status == 0 || WARN_ON_ONCE(irq_status == 0xffffffffu)) {
+               if (active > 0)
+                       pm_runtime_put_noidle(&isp->pdev->dev);
                return IRQ_NONE;
        }
 
@@ -427,7 +431,8 @@ irqreturn_t ipu6_buttress_isr(int irq, void *isp_ptr)
                writel(BUTTRESS_IRQS & ~disable_irqs,
                       isp->base + BUTTRESS_REG_ISR_ENABLE);
 
-       pm_runtime_put(&isp->pdev->dev);
+       if (active > 0)
+               pm_runtime_put(&isp->pdev->dev);
 
        return ret;
 }

diff --git a/drivers/media/pci/intel/ipu6/ipu6.c b/drivers/media/pci/intel/ipu6/ipu6.c
index bbd646378ab3ed93b0fdc3a5db4b01dd515d920b..518d3377bfbecb91ebf6cb996d42059aefc7d7ae 100644 (file)
--- a/drivers/media/pci/intel/ipu6/ipu6.c
+++ b/drivers/media/pci/intel/ipu6/ipu6.c
@@ -758,6 +758,9 @@ static void ipu6_pci_reset_done(struct pci_dev *pdev)
  */
 static int ipu6_suspend(struct device *dev)
 {
+       struct pci_dev *pdev = to_pci_dev(dev);
+
+       synchronize_irq(pdev->irq);
        return 0;
 }