| Message ID | 20230703080725.2065635-1-stanislaw.gruszka@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/2] accel/ivpu: Fix VPU register access in irq disable | expand |
Reviewed-by: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com> On 03.07.2023 10:07, Stanislaw Gruszka wrote: > From: Karol Wachowski <karol.wachowski@linux.intel.com> > > Incorrect REGB_WR32() macro was used to access VPUIP register. > Use correct REGV_WR32(). > > Fixes: 35b137630f08 ("accel/ivpu: Introduce a new DRM driver for Intel VPU") > Cc: stable@vger.kernel.org # 6.3.x > Signed-off-by: Karol Wachowski <karol.wachowski@linux.intel.com> > Signed-off-by: Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com> > --- > drivers/accel/ivpu/ivpu_hw_mtl.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/accel/ivpu/ivpu_hw_mtl.c b/drivers/accel/ivpu/ivpu_hw_mtl.c > index 3ff60fbbc8d9..d3ba633daaa0 100644 > --- a/drivers/accel/ivpu/ivpu_hw_mtl.c > +++ b/drivers/accel/ivpu/ivpu_hw_mtl.c > @@ -874,7 +874,7 @@ static void ivpu_hw_mtl_irq_disable(struct ivpu_device *vdev) > REGB_WR32(MTL_BUTTRESS_GLOBAL_INT_MASK, 0x1); > REGB_WR32(MTL_BUTTRESS_LOCAL_INT_MASK, BUTTRESS_IRQ_DISABLE_MASK); > REGV_WR64(MTL_VPU_HOST_SS_ICB_ENABLE_0, 0x0ull); > - REGB_WR32(MTL_VPU_HOST_SS_FW_SOC_IRQ_EN, 0x0); > + REGV_WR32(MTL_VPU_HOST_SS_FW_SOC_IRQ_EN, 0x0); > } > > static void ivpu_hw_mtl_irq_wdt_nce_handler(struct ivpu_device *vdev)
Applied to drm-misc-fixes Thanks Stanislaw On Mon, Jul 03, 2023 at 10:07:24AM +0200, Stanislaw Gruszka wrote: > From: Karol Wachowski <karol.wachowski@linux.intel.com> > > Incorrect REGB_WR32() macro was used to access VPUIP register. > Use correct REGV_WR32(). > > Fixes: 35b137630f08 ("accel/ivpu: Introduce a new DRM driver for Intel VPU") > Cc: stable@vger.kernel.org # 6.3.x > Signed-off-by: Karol Wachowski <karol.wachowski@linux.intel.com> > Signed-off-by: Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com> > --- > drivers/accel/ivpu/ivpu_hw_mtl.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/accel/ivpu/ivpu_hw_mtl.c b/drivers/accel/ivpu/ivpu_hw_mtl.c > index 3ff60fbbc8d9..d3ba633daaa0 100644 > --- a/drivers/accel/ivpu/ivpu_hw_mtl.c > +++ b/drivers/accel/ivpu/ivpu_hw_mtl.c > @@ -874,7 +874,7 @@ static void ivpu_hw_mtl_irq_disable(struct ivpu_device *vdev) > REGB_WR32(MTL_BUTTRESS_GLOBAL_INT_MASK, 0x1); > REGB_WR32(MTL_BUTTRESS_LOCAL_INT_MASK, BUTTRESS_IRQ_DISABLE_MASK); > REGV_WR64(MTL_VPU_HOST_SS_ICB_ENABLE_0, 0x0ull); > - REGB_WR32(MTL_VPU_HOST_SS_FW_SOC_IRQ_EN, 0x0); > + REGV_WR32(MTL_VPU_HOST_SS_FW_SOC_IRQ_EN, 0x0); > } > > static void ivpu_hw_mtl_irq_wdt_nce_handler(struct ivpu_device *vdev) > -- > 2.25.1 >
diff --git a/drivers/accel/ivpu/ivpu_hw_mtl.c b/drivers/accel/ivpu/ivpu_hw_mtl.c index 3ff60fbbc8d9..d3ba633daaa0 100644 --- a/drivers/accel/ivpu/ivpu_hw_mtl.c +++ b/drivers/accel/ivpu/ivpu_hw_mtl.c @@ -874,7 +874,7 @@ static void ivpu_hw_mtl_irq_disable(struct ivpu_device *vdev) REGB_WR32(MTL_BUTTRESS_GLOBAL_INT_MASK, 0x1); REGB_WR32(MTL_BUTTRESS_LOCAL_INT_MASK, BUTTRESS_IRQ_DISABLE_MASK); REGV_WR64(MTL_VPU_HOST_SS_ICB_ENABLE_0, 0x0ull); - REGB_WR32(MTL_VPU_HOST_SS_FW_SOC_IRQ_EN, 0x0); + REGV_WR32(MTL_VPU_HOST_SS_FW_SOC_IRQ_EN, 0x0); } static void ivpu_hw_mtl_irq_wdt_nce_handler(struct ivpu_device *vdev)