[PATCH 4/4] iommu/rockchip: replace pt_address cb with dma_addr_dte when setting dt addr

Dafna Hirschfeld dafna.hirschfeld at collabora.com
Sat Dec 4 07:24:28 PST 2021


The dt address is calculated using the dma_addr_dte cb.
So when setting the dt address to the DTE_ADDR_DUMMY
that cb should be used instead of pt_address.

Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld at collabora.com>
---
 drivers/iommu/rockchip-iommu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
index ba60f0faafcc..013f7608a2e6 100644
--- a/drivers/iommu/rockchip-iommu.c
+++ b/drivers/iommu/rockchip-iommu.c
@@ -510,7 +510,7 @@ static int rk_iommu_force_reset(struct rk_iommu *iommu)
 	 * and verifying that upper 5 nybbles are read back.
 	 */
 	for (i = 0; i < iommu->num_mmu; i++) {
-		dte_addr = rk_ops->pt_address(DTE_ADDR_DUMMY);
+		dte_addr = rk_ops->dma_addr_dte(DTE_ADDR_DUMMY);
 		rk_iommu_write(iommu->bases[i], RK_MMU_DTE_ADDR, dte_addr);
 
 		if (dte_addr != rk_iommu_read(iommu->bases[i], RK_MMU_DTE_ADDR)) {
-- 
2.17.1




More information about the linux-arm-kernel mailing list