Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1693405

[PATCH V2 3/3] iommu/rockchip: ignore isp mmu reset operation

Show all headers | View raw

From: Simon <xxm@rock-chips.com>

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 <xxm@rock-chips.com>
---
changes since V1:
 - use '-' instead of '_' for DT property.

 drivers/iommu/rockchip-iommu.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
index 3c462c0..3c6dc81 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.
@@ -1177,6 +1181,9 @@ static int rk_iommu_probe(struct platform_device *pdev)
 		}
 	}
 
+	iommu->reset_disabled = device_property_read_bool(dev,
+					"rk-iommu,disable-reset-quirk");
+
 	err = iommu_device_sysfs_add(&iommu->iommu, dev, NULL, dev_name(dev));
 	if (err)
 		return err;
-- 
1.9.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH V2 1/3] Docs: dt: rockchip: add rk-iommu,disable-reset-quirk property Simon Xue <xxm@rock-chips.com> - 2017-07-21 08:30 +0200
  [PATCH V2 3/3] iommu/rockchip: ignore isp mmu reset operation Simon Xue <xxm@rock-chips.com> - 2017-07-21 08:30 +0200
  [PATCH V2 2/3] iommu/rockchip: add multi irqs support Simon Xue <xxm@rock-chips.com> - 2017-07-21 08:30 +0200
    Re: [PATCH V2 2/3] iommu/rockchip: add multi irqs support Heiko Stuebner <heiko@sntech.de> - 2017-07-21 09:10 +0200
      Re: [PATCH V2 2/3] iommu/rockchip: add multi irqs support xxm <xxm@rock-chips.com> - 2017-07-21 10:00 +0200
        Re: [PATCH V2 2/3] iommu/rockchip: add multi irqs support Heiko Stuebner <heiko@sntech.de> - 2017-07-21 20:40 +0200
  Re: [PATCH V2 1/3] Docs: dt: rockchip: add rk-iommu,disable-reset-quirk property Heiko Stuebner <heiko@sntech.de> - 2017-07-21 09:00 +0200

csiph-web