projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e66280c
)
rk iommu: fix system panic when iommu pagefault
author
hjc
<hjc@rock-chips.com>
Fri, 15 May 2015 01:29:24 +0000
(09:29 +0800)
committer
hjc
<hjc@rock-chips.com>
Fri, 15 May 2015 01:29:30 +0000
(09:29 +0800)
Signed-off-by: Simon <xxm@rock-chips.com>
Signed-off-by: cmy <cmy@rock-chips.com>
drivers/iommu/rockchip-iovmm.c
[changed mode: 0644->0755]
patch
|
blob
|
history
diff --git
a/drivers/iommu/rockchip-iovmm.c
b/drivers/iommu/rockchip-iovmm.c
old mode 100644
(file)
new mode 100755
(executable)
index
bb68d16
..
dffeab3
--- a/
drivers/iommu/rockchip-iovmm.c
+++ b/
drivers/iommu/rockchip-iovmm.c
@@
-146,9
+146,12
@@
dma_addr_t rockchip_iovmm_map(struct device *dev,
spin_unlock(&vmm->lock);
ret = rockchip_iommu_tlb_invalidate(dev);
- if (ret)
+ if (ret) {
+ spin_lock(&vmm->lock);
+ list_del(®ion->node);
+ spin_unlock(&vmm->lock);
goto err_map_map;
-
+ }
dev_dbg(dev->archdata.iommu, "IOVMM: Allocated VM region @ %p/%#X bytes.\n",
®ion->start, region->size);