shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 19:08:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

video: rockchip: mpp: Fix report wrong dev when pagefault

Browse Source 
On some platforms(such as px30), vepu and vdpu shared the
same mmu.So when registering the iommu handle function,
there will be overwriting.Results in the reported device mismatch
when page fault.

Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: Id07c7f3088c52fcb987797c689296154c670078c
This commit is contained in:
Yandong Lin
2021-10-18 17:55:01 +08:00
committed by Tao Huang
parent 4cc0b13369
commit d6a0a91bc4
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/video/rockchip/mpp/mpp_common.c
View File

@@ -1780,13 +1780,19 @@ static int mpp_iommu_handle(struct iommu_domain *iommu,
unsigned long iova,
int status, void *arg)
{
struct mpp_dev *mpp = (struct mpp_dev *)arg;
struct mpp_task *task = mpp_taskqueue_get_running_task(mpp->queue);
struct mpp_taskqueue *queue = (struct mpp_taskqueue *)arg;
struct mpp_task *task = mpp_taskqueue_get_running_task(queue);
struct mpp_dev *mpp;
dev_err(mpp->dev, "fault addr 0x%08lx status %x\n", iova, status);
if (!task)
/*
* NOTE: In link mode, this task may not be the task of the current
* hardware processing error
*/
if (!task || !task->session)
return -EIO;
/* get mpp from cur task */
mpp = task->session->mpp;
dev_err(mpp->dev, "fault addr 0x%08lx status %x\n", iova, status);
mpp_task_dump_mem_region(mpp, task);
mpp_task_dump_hw_reg(mpp, task);
@@ -1896,7 +1902,7 @@ int mpp_dev_probe(struct mpp_dev *mpp,
/* set iommu fault handler */
if (!IS_ERR(mpp->iommu_info))
iommu_set_fault_handler(mpp->iommu_info->domain,
mpp_iommu_handle, mpp);
mpp_iommu_handle, mpp->queue);
/* read hardware id */
if (hw_info->reg_id >= 0) {