media: staging: imgu: do not hold spinlock during freeing mmu page table

[ Upstream commit e1ebe9f9c88e5a78fcc4670a9063c9b3cd87dda4 ]

ImgU need set the mmu page table in memory as uncached, and set back
to write-back when free the page table by set_memory_wb(),
set_memory_wb() can not do flushing without interrupt, so the spinlock
should not be hold during ImgU page alloc and free, the interrupt
should be enabled during memory cache flush.

This patch release spinlock before freeing pages table.

Signed-off-by: Bingbu Cao <bingbu.cao@intel.com>
Reviewed-by: Tomasz Figa <tfiga@chromium.org>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/staging/media/ipu3/ipu3-mmu.c b/drivers/staging/media/ipu3/ipu3-mmu.c
index 5f3ff964f3e76edca3603e8eaad5dd4cbbd1c599..cb9bf5fb29a589e69459008fdf818c2c01480b9d 100644 (file)
--- a/drivers/staging/media/ipu3/ipu3-mmu.c
+++ b/drivers/staging/media/ipu3/ipu3-mmu.c
@@ -174,8 +174,10 @@ static u32 *imgu_mmu_get_l2pt(struct imgu_mmu *mmu, u32 l1pt_idx)
        spin_lock_irqsave(&mmu->lock, flags);
 
        l2pt = mmu->l2pts[l1pt_idx];
-       if (l2pt)
-               goto done;
+       if (l2pt) {
+               spin_unlock_irqrestore(&mmu->lock, flags);
+               return l2pt;
+       }
 
        spin_unlock_irqrestore(&mmu->lock, flags);
 
@@ -190,8 +192,9 @@ static u32 *imgu_mmu_get_l2pt(struct imgu_mmu *mmu, u32 l1pt_idx)
 
        l2pt = mmu->l2pts[l1pt_idx];
        if (l2pt) {
+               spin_unlock_irqrestore(&mmu->lock, flags);
                imgu_mmu_free_page_table(new_l2pt);
-               goto done;
+               return l2pt;
        }
 
        l2pt = new_l2pt;
@@ -200,7 +203,6 @@ static u32 *imgu_mmu_get_l2pt(struct imgu_mmu *mmu, u32 l1pt_idx)
        pteval = IPU3_ADDR2PTE(virt_to_phys(new_l2pt));
        mmu->l1pt[l1pt_idx] = pteval;
 
-done:
        spin_unlock_irqrestore(&mmu->lock, flags);
        return l2pt;
 }