From: Karol Wachowski <karol.wachow...@intel.com>

Don't leave a context descriptor in case CFGI_ALL flush fails.
Mark it as invalid (by clearing valid bit) so nothing is left in
partially-initialized state.

Signed-off-by: Karol Wachowski <karol.wachow...@intel.com>
Reviewed-by: Jacek Lawrynowicz <jacek.lawrynow...@linux.intel.com>
Signed-off-by: Jacek Lawrynowicz <jacek.lawrynow...@linux.intel.com>
---
 drivers/accel/ivpu/ivpu_mmu.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/drivers/accel/ivpu/ivpu_mmu.c b/drivers/accel/ivpu/ivpu_mmu.c
index 4ff0d7a519859..26ef52fbb93e5 100644
--- a/drivers/accel/ivpu/ivpu_mmu.c
+++ b/drivers/accel/ivpu/ivpu_mmu.c
@@ -749,10 +749,17 @@ static int ivpu_mmu_cdtab_entry_set(struct ivpu_device 
*vdev, u32 ssid, u64 cd_d
 
        ret = ivpu_mmu_cmdq_write_cfgi_all(vdev);
        if (ret)
-               goto unlock;
+               goto err_invalidate;
 
        ret = ivpu_mmu_cmdq_sync(vdev);
+       if (ret)
+               goto err_invalidate;
 unlock:
+       mutex_unlock(&mmu->lock);
+       return 0;
+
+err_invalidate:
+       WRITE_ONCE(entry[0], 0);
        mutex_unlock(&mmu->lock);
        return ret;
 }
-- 
2.45.1

Reply via email to