TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iommu/rockchip: fix rockchip private interface dependence

Browse Source 
Fixes: fae620b2b6 ("iommu/rockchip: add irq mask cb")
Change-Id: I9783a64d866d7919ade89a48e004b9c51b38dde6
Signed-off-by: Simon Xue <xxm@rock-chips.com>
This commit is contained in:
Simon Xue
2022-10-10 11:42:23 +08:00
committed by Tao Huang
parent 4512ef481e
commit 8e32089501
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/video/rockchip/mpp/mpp_rkvenc.c
+1
View File
@@ -28,6 +28,7 @@
#include <linux/nospec.h>
#include <linux/workqueue.h>
#include <soc/rockchip/pm_domains.h>
#include <soc/rockchip/rockchip_iommu.h>
#include <soc/rockchip/rockchip_ipa.h>
#include <soc/rockchip/rockchip_opp_select.h>
#include <soc/rockchip/rockchip_system_monitor.h>
include/linux/iommu.h
-10
View File
@@ -588,8 +588,6 @@ static inline void iommu_iotlb_gather_add_page(struct iommu_domain *domain,
extern struct iommu_group *pci_device_group(struct device *dev);
/* Generic device grouping function */
extern struct iommu_group *generic_device_group(struct device *dev);
extern void rk_iommu_mask_irq(struct device *dev);
extern void rk_iommu_unmask_irq(struct device *dev);
/* FSL-MC device grouping function */
struct iommu_group *fsl_mc_device_group(struct device *dev);
@@ -1098,14 +1096,6 @@ static inline struct iommu_fwspec *dev_iommu_fwspec_get(struct device *dev)
{
return NULL;
}
static inline void rk_iommu_mask_irq(struct device *dev)
{
}
static inline void rk_iommu_unmask_irq(struct device *dev)
{
}
#endif /* CONFIG_IOMMU_API */
/**
include/soc/rockchip/rockchip_iommu.h
+8
View File
@@ -13,6 +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);
#else
static inline int rockchip_iommu_enable(struct device *dev)
{
@@ -34,6 +36,12 @@ 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 rk_iommu_unmask_irq(struct device *dev)
{
}
#endif
#endif