| Message ID | 20231024161952.759914-1-stanislaw.gruszka@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | accel/ivpu/37xx: Fix missing VPUIP interrupts | expand |
On Tue, Oct 24, 2023 at 06:19:52PM +0200, Stanislaw Gruszka wrote: > From: Karol Wachowski <karol.wachowski@linux.intel.com> > > Move sequence of masking and unmasking global interrupts from buttress > interrupt handler to generic one that handles both VPUIP and BTRS > interrupts. Unmasking global interrupts will re-trigger MSI for any > pending interrupts. > > Lack of this sequence will cause the driver to miss any > VPUIP interrupt that comes after reading VPU_37XX_HOST_SS_ICB_STATUS_0 > and before clearing all active interrupt sources. > > Signed-off-by: Karol Wachowski <karol.wachowski@linux.intel.com> > Reviewed-by: Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com> > Signed-off-by: Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com> Added: Fixes: 35b137630f08 ("accel/ivpu: Introduce a new DRM driver for Intel VPU") Cc: stable@vger.kernel.org and applied to drm-misc-fixes Thanks Stanislaw > --- > drivers/accel/ivpu/ivpu_hw_37xx.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/drivers/accel/ivpu/ivpu_hw_37xx.c b/drivers/accel/ivpu/ivpu_hw_37xx.c > index 7e4e87aa7602..5c0246b9e522 100644 > --- a/drivers/accel/ivpu/ivpu_hw_37xx.c > +++ b/drivers/accel/ivpu/ivpu_hw_37xx.c > @@ -906,9 +906,6 @@ static u32 ivpu_hw_37xx_irqb_handler(struct ivpu_device *vdev, int irq) > if (status == 0) > return 0; > > - /* Disable global interrupt before handling local buttress interrupts */ > - REGB_WR32(VPU_37XX_BUTTRESS_GLOBAL_INT_MASK, 0x1); > - > if (REG_TEST_FLD(VPU_37XX_BUTTRESS_INTERRUPT_STAT, FREQ_CHANGE, status)) > ivpu_dbg(vdev, IRQ, "FREQ_CHANGE irq: %08x", > REGB_RD32(VPU_37XX_BUTTRESS_CURRENT_PLL)); > @@ -940,9 +937,6 @@ static u32 ivpu_hw_37xx_irqb_handler(struct ivpu_device *vdev, int irq) > else > REGB_WR32(VPU_37XX_BUTTRESS_INTERRUPT_STAT, status); > > - /* Re-enable global interrupt */ > - REGB_WR32(VPU_37XX_BUTTRESS_GLOBAL_INT_MASK, 0x0); > - > if (schedule_recovery) > ivpu_pm_schedule_recovery(vdev); > > @@ -954,9 +948,14 @@ static irqreturn_t ivpu_hw_37xx_irq_handler(int irq, void *ptr) > struct ivpu_device *vdev = ptr; > u32 ret_irqv, ret_irqb; > > + REGB_WR32(VPU_37XX_BUTTRESS_GLOBAL_INT_MASK, 0x1); > + > ret_irqv = ivpu_hw_37xx_irqv_handler(vdev, irq); > ret_irqb = ivpu_hw_37xx_irqb_handler(vdev, irq); > > + /* Re-enable global interrupts to re-trigger MSI for pending interrupts */ > + REGB_WR32(VPU_37XX_BUTTRESS_GLOBAL_INT_MASK, 0x0); > + > return IRQ_RETVAL(ret_irqb | ret_irqv); > } > > -- > 2.25.1 >
diff --git a/drivers/accel/ivpu/ivpu_hw_37xx.c b/drivers/accel/ivpu/ivpu_hw_37xx.c index 7e4e87aa7602..5c0246b9e522 100644 --- a/drivers/accel/ivpu/ivpu_hw_37xx.c +++ b/drivers/accel/ivpu/ivpu_hw_37xx.c @@ -906,9 +906,6 @@ static u32 ivpu_hw_37xx_irqb_handler(struct ivpu_device *vdev, int irq) if (status == 0) return 0; - /* Disable global interrupt before handling local buttress interrupts */ - REGB_WR32(VPU_37XX_BUTTRESS_GLOBAL_INT_MASK, 0x1); - if (REG_TEST_FLD(VPU_37XX_BUTTRESS_INTERRUPT_STAT, FREQ_CHANGE, status)) ivpu_dbg(vdev, IRQ, "FREQ_CHANGE irq: %08x", REGB_RD32(VPU_37XX_BUTTRESS_CURRENT_PLL)); @@ -940,9 +937,6 @@ static u32 ivpu_hw_37xx_irqb_handler(struct ivpu_device *vdev, int irq) else REGB_WR32(VPU_37XX_BUTTRESS_INTERRUPT_STAT, status); - /* Re-enable global interrupt */ - REGB_WR32(VPU_37XX_BUTTRESS_GLOBAL_INT_MASK, 0x0); - if (schedule_recovery) ivpu_pm_schedule_recovery(vdev); @@ -954,9 +948,14 @@ static irqreturn_t ivpu_hw_37xx_irq_handler(int irq, void *ptr) struct ivpu_device *vdev = ptr; u32 ret_irqv, ret_irqb; + REGB_WR32(VPU_37XX_BUTTRESS_GLOBAL_INT_MASK, 0x1); + ret_irqv = ivpu_hw_37xx_irqv_handler(vdev, irq); ret_irqb = ivpu_hw_37xx_irqb_handler(vdev, irq); + /* Re-enable global interrupts to re-trigger MSI for pending interrupts */ + REGB_WR32(VPU_37XX_BUTTRESS_GLOBAL_INT_MASK, 0x0); + return IRQ_RETVAL(ret_irqb | ret_irqv); }