Commit f13efafc authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Joerg Roedel
Browse files

iommu/mediatek: Fix out-of-range warning with clang 



clang-14 notices that a comparison is never true when
CONFIG_PHYS_ADDR_T_64BIT is disabled:

drivers/iommu/mtk_iommu.c:553:34: error: result of comparison of constant 5368709120 with expression of type 'phys_addr_t' (aka 'unsigned int') is always false [-Werror,-Wtautological-constant-out-of-range-compare]
        if (dom->data->enable_4GB && pa >= MTK_IOMMU_4GB_MODE_REMAP_BASE)
                                     ~~ ^  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Add an explicit check for the type of the variable to skip the check
and the warning in that case.

Fixes: b4dad40e ("iommu/mediatek: Adjust the PA for the 4GB Mode")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarYong Wu <yong.wu@mediatek.com>
Link: https://lore.kernel.org/r/20210927121857.941160-1-arnd@kernel.org


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

drivers/iommu/mtk_iommu.c

+3 −1
Original line number Diff line number Diff line
@@ -550,7 +550,9 @@ static phys_addr_t mtk_iommu_iova_to_phys(struct iommu_domain *domain, 
	phys_addr_t pa;



	pa = dom->iop->iova_to_phys(dom->iop, iova);

	if (dom->data->enable_4GB && pa >= MTK_IOMMU_4GB_MODE_REMAP_BASE)

	if (IS_ENABLED(CONFIG_PHYS_ADDR_T_64BIT) &&

	    dom->data->enable_4GB &&

	    pa >= MTK_IOMMU_4GB_MODE_REMAP_BASE)

		pa &= ~BIT_ULL(32);



	return pa;