accel/ivpu: Fix wrong register read in LNL failure diagnostics
Karol Wachowski
maintainerPATCH 1/1 accel/ivpu: Fix wrong register read in LNL failure diagnostics
diagnose_failure_lnl() read VPU_HW_BTRS_MTL_INTERRUPT_STAT instead of VPU_HW_BTRS_LNL_INTERRUPT_STAT, which on LNL and newer parts is a different register with a different bit layout, so failure diagnostics decoded the wrong register and reported a bogus error cause. Read the LNL interrupt status register instead.
--- drivers/accel/ivpu/ivpu_hw_btrs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/accel/ivpu/ivpu_hw_btrs.c +1 -1
@@ -927,7 +927,7 @@ static void diagnose_failure_mtl(struct ivpu_device *vdev)static void diagnose_failure_lnl (struct ivpu_device *vdev) { -u32 reg =REGB_RD32 (VPU_HW_BTRS_MTL_INTERRUPT_STAT ) &BTRS_LNL_IRQ_MASK ; +u32 reg =REGB_RD32 (VPU_HW_BTRS_LNL_INTERRUPT_STAT ) &BTRS_LNL_IRQ_MASK ;if (REG_TEST_FLD (VPU_HW_BTRS_LNL_INTERRUPT_STAT ,ATS_ERR , reg)) { ivpu_err(vdev, "ATS_ERR_LOG1 0x%08x ATS_ERR_LOG2 0x%08x\n",
Signature · 1 line
2.43.0
Quoted 17 lines · Karol Wachowski
diagnose_failure_lnl()readVPU_HW_BTRS_MTL_INTERRUPT_STATinstead ofVPU_HW_BTRS_LNL_INTERRUPT_STAT, which on LNL and newer parts is a different register with a different bit layout, so failure diagnostics decoded the wrong register and reported a bogus error cause. Read the LNL interrupt status register instead.Fixes 8a27ad81f7d3 ("accel/ivpu: Split IP and buttress code")Signed-off-by Karol Wachowski <[email protected]>--- drivers/accel/ivpu/ivpu_hw_btrs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/accel/ivpu/ivpu_hw_btrs.c +0
-0
drivers/accel/ivpu/ivpu_hw_btrs.c static void diagnose_failure_mtl(struct ivpu_device *vdev) · line 933
Quoted 8 lines
drivers/accel/ivpu/ivpu_hw_btrs.c +1
-1@@ -927,7 +927,7 @@ static void diagnose_failure_mtl(struct ivpu_device *vdev)static void diagnose_failure_lnl (struct ivpu_device *vdev) { -u32 reg =REGB_RD32 (VPU_HW_BTRS_MTL_INTERRUPT_STAT ) &BTRS_LNL_IRQ_MASK ; +u32 reg =REGB_RD32 (VPU_HW_BTRS_LNL_INTERRUPT_STAT ) &BTRS_LNL_IRQ_MASK ;if (REG_TEST_FLD (VPU_HW_BTRS_LNL_INTERRUPT_STAT ,ATS_ERR , reg)) { ivpu_err(vdev, "ATS_ERR_LOG1 0x%08x ATS_ERR_LOG2 0x%08x\n",
Wachowski, Karol
maintainerQuoted 13 lines · Andrzej Kacprowski
Quoted 12 lines · Karol Wachowski
diagnose_failure_lnl()readVPU_HW_BTRS_MTL_INTERRUPT_STATinstead ofVPU_HW_BTRS_LNL_INTERRUPT_STAT, which on LNL and newer parts is a different register with a different bit layout, so failure diagnostics decoded the wrong register and reported a bogus error cause. Read the LNL interrupt status register instead.Fixes 8a27ad81f7d3 ("accel/ivpu: Split IP and buttress code")Signed-off-by Karol Wachowski <[email protected]>---
drivers/accel/ivpu/ivpu_hw_btrs.c| 2 +-1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 16 lines
Quoted 13 lines
drivers/accel/ivpu/ivpu_hw_btrs.c +1
-1@@ -927,7 +927,7 @@ static void diagnose_failure_mtl(struct ivpu_device *vdev) static void diagnose_failure_lnl(struct ivpu_device *vdev) { - u32 reg = REGB_RD32(VPU_HW_BTRS_MTL_INTERRUPT_STAT) &BTRS_LNL_IRQ_MASK ; + u32 reg = REGB_RD32(VPU_HW_BTRS_LNL_INTERRUPT_STAT) &BTRS_LNL_IRQ_MASK ; if (REG_TEST_FLD(VPU_HW_BTRS_LNL_INTERRUPT_STAT, ATS_ERR, reg)) {Quoted 1 line
ivpu_err(vdev, "
ATS_ERR_LOG10x%08xATS_ERR_LOG20x%08x\n",Reviewed-by Andrzej Kacprowski <[email protected]>
Thanks!
Applied to drm-misc-fixes.