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

iommu/rockchip: rename rk_iommu_[un]mask_irq() to rockchip_iommu_[un]mask_irq()

Browse Source 
Signed-off-by: Simon Xue <xxm@rock-chips.com>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I66d8248357039ff049002b8204dc99eab90d3666
This commit is contained in:
Simon Xue
2022-10-10 15:58:35 +08:00
committed by Tao Huang
parent 8e32089501
commit 91e883deed
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/iommu/rockchip-iommu.c
View File

@@ -1720,7 +1720,7 @@ static int rk_iommu_of_xlate(struct device *dev,
return 0;
}
void rk_iommu_mask_irq(struct device *dev)
void rockchip_iommu_mask_irq(struct device *dev)
{
struct rk_iommu *iommu = rk_iommu_from_dev(dev);
int i;
@@ -1731,9 +1731,9 @@ void rk_iommu_mask_irq(struct device *dev)
for (i = 0; i < iommu->num_mmu; i++)
rk_iommu_write(iommu->bases[i], RK_MMU_INT_MASK, 0);
}
EXPORT_SYMBOL(rk_iommu_mask_irq);
EXPORT_SYMBOL(rockchip_iommu_mask_irq);
void rk_iommu_unmask_irq(struct device *dev)
void rockchip_iommu_unmask_irq(struct device *dev)
{
struct rk_iommu *iommu = rk_iommu_from_dev(dev);
int i;
@@ -1749,7 +1749,7 @@ void rk_iommu_unmask_irq(struct device *dev)
rk_iommu_base_command(iommu->bases[i], RK_MMU_CMD_PAGE_FAULT_DONE);
}
}
EXPORT_SYMBOL(rk_iommu_unmask_irq);
EXPORT_SYMBOL(rockchip_iommu_unmask_irq);
static struct iommu_ops rk_iommu_ops = {
.domain_alloc = rk_iommu_domain_alloc,

2
drivers/video/rockchip/mpp/mpp_rkvdec2_link.c
View File

@@ -1797,7 +1797,7 @@ int rkvdec2_ccu_iommu_fault_handle(struct iommu_domain *iommu,
atomic_inc(&mpp->queue->reset_request);
for (i = 0; i < mpp->queue->core_count; i++)
rk_iommu_mask_irq(mpp->queue->cores[i]->dev);
rockchip_iommu_mask_irq(mpp->queue->cores[i]->dev);
kthread_queue_work(&mpp->queue->worker, &mpp->work);

4
drivers/video/rockchip/mpp/mpp_rkvenc.c
View File

@@ -1144,7 +1144,7 @@ static void rkvenc_iommu_handle_work(struct work_struct *work_s)
else
enc->aux_iova = page_iova;
rk_iommu_unmask_irq(mpp->dev);
rockchip_iommu_unmask_irq(mpp->dev);
mpp_iommu_up_write(mpp->iommu_info);
mpp_debug_leave();
@@ -1161,7 +1161,7 @@ static int rkvenc_iommu_fault_handle(struct iommu_domain *iommu,
mpp_debug(DEBUG_IOMMU, "IOMMU_GET_BUS_ID(status)=%d\n", IOMMU_GET_BUS_ID(status));
if (IOMMU_GET_BUS_ID(status)) {
enc->fault_iova = iova;
rk_iommu_mask_irq(mpp->dev);
rockchip_iommu_mask_irq(mpp->dev);
queue_work(enc->iommu_wq, &enc->iommu_work);
}
mpp_debug_leave();

8
include/soc/rockchip/rockchip_iommu.h
View File

@@ -13,8 +13,8 @@ int rockchip_iommu_disable(struct device *dev);
int rockchip_pagefault_done(struct device *master_dev);
void __iomem *rockchip_get_iommu_base(struct device *master_dev, int idx);
bool rockchip_iommu_is_enabled(struct device *dev);
void rk_iommu_mask_irq(struct device *dev);
void rk_iommu_unmask_irq(struct device *dev);
void rockchip_iommu_mask_irq(struct device *dev);
void rockchip_iommu_unmask_irq(struct device *dev);
#else
static inline int rockchip_iommu_enable(struct device *dev)
{
@@ -36,10 +36,10 @@ static inline bool rockchip_iommu_is_enabled(struct device *dev)
{
return false;
}
static inline void rk_iommu_mask_irq(struct device *dev)
static inline void rockchip_iommu_mask_irq(struct device *dev)
{
}
static inline void rk_iommu_unmask_irq(struct device *dev)
static inline void rockchip_iommu_unmask_irq(struct device *dev)
{
}
#endif