forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

iommu/rockchip: Add shootdown_entire prop

Browse source 
Replace IOMMU_TLB_SHOT_ENTIRE by shootdown_entire defined in
iommu DT node for clean IOMMU framework code and more convenient
for masters. The master should call iommu_flush_iotlb_all to
zap cache manually.

Signed-off-by: Simon Xue <xxm@rock-chips.com>
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
Change-Id: I5feab72fa12782d0715ad84a98cbd96a88bcd598
This commit is contained in:
Herman Chen 2021-12-06 10:35:36 +08:00 • committed by Tao Huang
commit 30eb2be25b
2 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/gpu/drm/rockchip/rockchip_drm_gem.c
View file

@ -58,6 +58,8 @@ static int rockchip_gem_iommu_map(struct rockchip_gem_object *rk_obj)
goto err_remove_node;
}
iommu_flush_iotlb_all(private->domain);
rk_obj->size = ret;
return 0;

13
drivers/iommu/rockchip-iommu.c
View file

@ -117,6 +117,7 @@ struct rk_iommu_domain {
dma_addr_t dt_dma;
spinlock_t iommus_lock; /* lock for iommus list */
spinlock_t dt_lock; /* lock for modifying page directory table */
bool shootdown_entire;
struct iommu_domain domain;
};
@ -141,6 +142,7 @@ struct rk_iommu {
struct iommu_domain *domain; /* domain to which iommu is attached */
struct iommu_group *group;
u32 version;
bool shootdown_entire;
};
struct rk_iommudata {
@ -989,7 +991,9 @@ static int rk_iommu_map_iova(struct rk_iommu_domain *rk_domain, u32 *pte_addr,
* We only zap the first and last iova, since only they could have
* dte or pte shared with an existing mapping.
*/
rk_iommu_zap_iova_first_last(rk_domain, iova, size);
/* Do not zap tlb cache line if shootdown_entire set */
if (!rk_domain->shootdown_entire)
rk_iommu_zap_iova_first_last(rk_domain, iova, size);
return 0;
unwind:
@ -1034,7 +1038,9 @@ static int rk_iommu_map_iova_v2(struct rk_iommu_domain *rk_domain, u32 *pte_addr
* We only zap the first and last iova, since only they could have
* dte or pte shared with an existing mapping.
*/
rk_iommu_zap_iova_first_last(rk_domain, iova, size);
/* Do not zap tlb cache line if shootdown_entire set */
if (!rk_domain->shootdown_entire)
rk_iommu_zap_iova_first_last(rk_domain, iova, size);
return 0;
unwind:
@ -1394,6 +1400,7 @@ static int rk_iommu_attach_device(struct iommu_domain *domain,
list_add_tail(&iommu->node, &rk_domain->iommus);
spin_unlock_irqrestore(&rk_domain->iommus_lock, flags);
rk_domain->shootdown_entire = iommu->shootdown_entire;
ret = pm_runtime_get_if_in_use(iommu->dev);
if (!ret || WARN_ON_ONCE(ret < 0))
return 0;
@ -1732,6 +1739,8 @@ static int rk_iommu_probe(struct platform_device *pdev)
"rockchip,skip-mmu-read");
iommu->dlr_disable = device_property_read_bool(dev,
"rockchip,disable-device-link-resume");
iommu->shootdown_entire = device_property_read_bool(dev,
"rockchip,shootdown-entire");
if (of_machine_is_compatible("rockchip,rv1126") ||
of_machine_is_compatible("rockchip,rv1109"))