Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ae97a59 authored by Jiasheng Jiang's avatar Jiasheng Jiang Committed by Greg Kroah-Hartman
Browse files

iommu/ipmmu-vmsa: Check for error num after setting mask 



[ Upstream commit 1fdbbfd5099f797a4dac05e7ef0192ba4a9c39b4 ]

Because of the possible failure of the dma_supported(), the
dma_set_mask_and_coherent() may return error num.
Therefore, it should be better to check it and return the error if
fails.

Fixes: 1c894225 ("iommu/ipmmu-vmsa: IPMMU device is 40-bit bus master")
Signed-off-by: default avatarJiasheng Jiang <jiasheng@iscas.ac.cn>
Reviewed-by: default avatarNikita Yushchenko <nikita.yoush@cogentembedded.com>
Link: https://lore.kernel.org/r/20220106024302.2574180-1-jiasheng@iscas.ac.cn


Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent a29ce959

drivers/iommu/ipmmu-vmsa.c

+3 −1
Original line number Diff line number Diff line
@@ -1061,7 +1061,9 @@ static int ipmmu_probe(struct platform_device *pdev) 
	bitmap_zero(mmu->ctx, IPMMU_CTX_MAX);

	mmu->features = of_device_get_match_data(&pdev->dev);

	memset(mmu->utlb_ctx, IPMMU_CTX_INVALID, mmu->features->num_utlbs);

	dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(40));

	ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(40));

	if (ret)

		return ret;



	/* Map I/O memory and request IRQ. */

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);