Commit c987b65a authored by Benjamin Gaignard's avatar Benjamin Gaignard Committed by Joerg Roedel
Browse files

iommu/rockchip: Fix physical address decoding 



Restore bits 39 to 32 at correct position.
It reverses the operation done in rk_dma_addr_dte_v2().

Fixes: c55356c5 ("iommu: rockchip: Add support for iommu v2")
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarBenjamin Gaignard <benjamin.gaignard@collabora.com>
Link: https://lore.kernel.org/r/20210712101232.318589-1-benjamin.gaignard@collabora.com


Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 474dd1c6

drivers/iommu/rockchip-iommu.c

+4 −2
Original line number Diff line number Diff line
@@ -544,12 +544,14 @@ static inline u32 rk_dma_addr_dte(dma_addr_t dt_dma) 
}



#define DT_HI_MASK GENMASK_ULL(39, 32)

#define DTE_BASE_HI_MASK GENMASK(11, 4)

#define DT_SHIFT   28



static inline phys_addr_t rk_dte_addr_phys_v2(u32 addr)

{

	return (phys_addr_t)(addr & RK_DTE_PT_ADDRESS_MASK) |

	       ((addr & DT_HI_MASK) << DT_SHIFT);

	u64 addr64 = addr;

	return (phys_addr_t)(addr64 & RK_DTE_PT_ADDRESS_MASK) |

	       ((addr64 & DTE_BASE_HI_MASK) << DT_SHIFT);

}



static inline u32 rk_dma_addr_dte_v2(dma_addr_t dt_dma)