projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b5b2858
)
iommu/ipmmu-vmsa: Check for error num after setting mask
author
Jiasheng Jiang
<jiasheng@iscas.ac.cn>
Thu, 6 Jan 2022 02:43:02 +0000
(10:43 +0800)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Fri, 8 Apr 2022 12:23:31 +0000
(14:23 +0200)
[ 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:
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/iommu/ipmmu-vmsa.c
patch
|
blob
|
history
diff --git
a/drivers/iommu/ipmmu-vmsa.c
b/drivers/iommu/ipmmu-vmsa.c
index
d38ff29
..
96708cd
100644
(file)
--- a/
drivers/iommu/ipmmu-vmsa.c
+++ b/
drivers/iommu/ipmmu-vmsa.c
@@
-982,7
+982,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);