diff options
| author | Simon Xue <xxm@rock-chips.com> | 2017-07-24 10:37:15 +0800 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2017-07-27 14:15:21 +0200 |
| commit | c3aa47424918acdfed8982d5a3588351ebefdfc1 (patch) | |
| tree | e04107e97bd5a3743c4ae69328cbb227ca22a8a5 /drivers/iommu/rockchip-iommu.c | |
| parent | 03f732f89034b3f5fbe7ef34cd3482f2e9c335cf (diff) | |
| download | linux-stable-c3aa47424918acdfed8982d5a3588351ebefdfc1.tar.gz linux-stable-c3aa47424918acdfed8982d5a3588351ebefdfc1.tar.bz2 linux-stable-c3aa47424918acdfed8982d5a3588351ebefdfc1.zip | |
iommu/rockchip: ignore isp mmu reset operation
ISP mmu can't support reset operation, it won't get the
expected result when reset, but rest functions work normally.
Add this patch as a WA for this issue.
Signed-off-by: Simon Xue <xxm@rock-chips.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu/rockchip-iommu.c')
| -rw-r--r-- | drivers/iommu/rockchip-iommu.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c index e2852b041231..78ea341c7c75 100644 --- a/drivers/iommu/rockchip-iommu.c +++ b/drivers/iommu/rockchip-iommu.c @@ -92,6 +92,7 @@ struct rk_iommu { int num_mmu; int *irq; int num_irq; + bool reset_disabled; struct iommu_device iommu; struct list_head node; /* entry in rk_iommu_domain.iommus */ struct iommu_domain *domain; /* domain to which iommu is attached */ @@ -415,6 +416,9 @@ static int rk_iommu_force_reset(struct rk_iommu *iommu) int ret, i; u32 dte_addr; + if (iommu->reset_disabled) + return 0; + /* * Check if register DTE_ADDR is working by writing DTE_ADDR_DUMMY * and verifying that upper 5 nybbles are read back. @@ -1180,6 +1184,9 @@ static int rk_iommu_probe(struct platform_device *pdev) } } + iommu->reset_disabled = device_property_read_bool(dev, + "rockchip,disable-mmu-reset"); + err = iommu_device_sysfs_add(&iommu->iommu, dev, NULL, dev_name(dev)); if (err) return err; |