diff options
| author | Jiasheng Jiang <jiasheng@iscas.ac.cn> | 2022-01-06 03:43:02 +0100 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2022-02-14 13:42:02 +0100 |
| commit | 1fdbbfd5099f797a4dac05e7ef0192ba4a9c39b4 (patch) | |
| tree | 60e552e38d4eaabc26a86b6f010d8d92cc8b45a1 /drivers/iommu/ipmmu-vmsa.c | |
| parent | Linux 5.17-rc4 (diff) | |
| download | linux-1fdbbfd5099f797a4dac05e7ef0192ba4a9c39b4.tar.xz linux-1fdbbfd5099f797a4dac05e7ef0192ba4a9c39b4.zip | |
iommu/ipmmu-vmsa: Check for error num after setting mask
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: 1c894225bf5b ("iommu/ipmmu-vmsa: IPMMU device is 40-bit bus master")
Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
Reviewed-by: Nikita Yushchenko <nikita.yoush@cogentembedded.com>
Link: https://lore.kernel.org/r/20220106024302.2574180-1-jiasheng@iscas.ac.cn
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu/ipmmu-vmsa.c')
| -rw-r--r-- | drivers/iommu/ipmmu-vmsa.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c index ca752bdc710f..61bd9a3004ed 100644 --- a/drivers/iommu/ipmmu-vmsa.c +++ b/drivers/iommu/ipmmu-vmsa.c @@ -1006,7 +1006,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); |