rk3368: iommu: expose iommu tlb invalidate operation to owner

Signed-off-by: Simon <xxm@rock-chips.com>
This commit is contained in:
Simon
2015-04-07 17:50:00 +08:00
parent 28b00ae9fe
commit aa34284b75
4 changed files with 46 additions and 1 deletions

View File

@@ -754,6 +754,34 @@ static int rockchip_iommu_enable(struct iommu_drvdata *data, unsigned int pgtabl
return 0;
}
int rockchip_iommu_tlb_invalidate_global(struct device *dev)
{
unsigned long flags;
struct iommu_drvdata *data = dev_get_drvdata(dev->archdata.iommu);
int ret;
spin_lock_irqsave(&data->data_lock, flags);
if (rockchip_is_iommu_active(data)) {
int i;
for (i = 0; i < data->num_res_mem; i++) {
ret = rockchip_iommu_zap_tlb(data->res_bases[i]);
if (ret)
dev_err(dev->archdata.iommu, "(%s) %s failed\n",
data->dbgname, __func__);
}
} else {
dev_dbg(dev->archdata.iommu, "(%s) Disabled. Skipping invalidating TLB.\n",
data->dbgname);
ret = -1;
}
spin_unlock_irqrestore(&data->data_lock, flags);
return ret;
}
int rockchip_iommu_tlb_invalidate(struct device *dev)
{
unsigned long flags;

5
drivers/iommu/rockchip-iommu.h Executable file → Normal file
View File

@@ -79,12 +79,17 @@ static inline int rockchip_init_iovmm(struct device *iommu,
* This function flush all TLB entry in iommu
*/
int rockchip_iommu_tlb_invalidate(struct device *owner);
int rockchip_iommu_tlb_invalidate_global(struct device *owner);
#else /* CONFIG_ROCKCHIP_IOMMU */
static inline int rockchip_iommu_tlb_invalidate(struct device *owner)
{
return -1;
}
static int rockchip_iommu_tlb_invalidate_global(struct device *owner)
{
return -1;
}
#endif

7
drivers/iommu/rockchip-iovmm.c Executable file → Normal file
View File

@@ -30,6 +30,13 @@ static struct rk_vm_region *find_region(struct rk_iovmm *vmm, dma_addr_t iova)
return NULL;
}
int rockchip_iovmm_invalidate_tlb(struct device *dev)
{
int ret = rockchip_iommu_tlb_invalidate_global(dev);
return ret;
}
void rockchip_iovmm_set_fault_handler(struct device *dev,
rockchip_iommu_fault_handler_t handler)
{

7
include/linux/rockchip-iovmm.h Executable file → Normal file
View File

@@ -107,7 +107,8 @@ void rockchip_iovmm_set_fault_handler(struct device *dev,
* return value: non-zero if the fault is correctly resolved.
* zero if the fault is not handled.
*/
int rockchip_iovmm_invalidate_tlb(struct device *dev);
#else
static inline int rockchip_iovmm_activate(struct device *dev)
{
@@ -142,6 +143,10 @@ static inline void rockchip_iovmm_set_fault_handler(struct device *dev,
rockchip_iommu_fault_handler_t handler)
{
}
static inline int rockchip_iovmm_invalidate_tlb(struct device *dev)
{
return -ENOSYS;
}
#endif /* CONFIG_ROCKCHIP_IOVMM */