This patchset contains misc improve patches. Mainly to improve safety from
invalid dts input.
Change notes:
v6: No change code. just reword the commit message in [3/6] from Angelo.
v5: https://lore.kernel.org/linux-mediatek/[email protected]/
a) Loop from MTK_LARB_NR_MAX in the error path from Angelo.
b) Fix the redundant put_device for the error patch outside the loop from dan.
v4: https://lore.kernel.org/linux-mediatek/[email protected]/
a) Just remove the first patch about dev_err_probe since it was merged.
b) Rebase v6.0-rc1
v3: https://lore.kernel.org/linux-mediatek/[email protected]/
a) Add platform_device_put from Robin.
b) Use component_match_add instead component_match_add_release suggested from Robin.
v2: https://lore.kernel.org/linux-mediatek/[email protected]/
a) Rebase on v5.19-rc1.
b) Add a New patch [5/5] just remove a variable that only is for v1.
v1: https://lore.kernel.org/linux-mediatek/[email protected]/
Base on linux-next-20220510.
the improve safety from dts is base on:
https://lore.kernel.org/linux-mediatek/[email protected]/
Guenter Roeck (1):
iommu/mediatek: Validate number of phandles associated with
"mediatek,larbs"
Yong Wu (5):
iommu/mediatek: Add platform_device_put for recovering the device
refcnt
iommu/mediatek: Use component_match_add
iommu/mediatek: Add error path for loop of mm_dts_parse
iommu/mediatek: Improve safety for mediatek,smi property in larb nodes
iommu/mediatek: Remove unused "mapping" member from mtk_iommu_data
drivers/iommu/mtk_iommu.c | 106 +++++++++++++++++++++++++++-----------
1 file changed, 76 insertions(+), 30 deletions(-)
--
2.18.0
In order to simplify the error patch(avoid call of_node_put), Use
component_match_add instead component_match_add_release since we are only
interested in the "device" here. Then we could always call of_node_put in
normal path.
Strictly this is not a fixes patch, but it is a prepare for adding the
error path, thus I add a Fixes tag too.
Fixes: d2e9a1102cfc ("iommu/mediatek: Contain MM IOMMU flow with the MM TYPE")
Suggested-by: Robin Murphy <[email protected]>
Signed-off-by: Yong Wu <[email protected]>
Reviewed-by: AngeloGioacchino Del Regno <[email protected]>
---
drivers/iommu/mtk_iommu.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index 21a8ce503a0e..83b279432406 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -1066,19 +1066,17 @@ static int mtk_iommu_mm_dts_parse(struct device *dev, struct component_match **m
id = i;
plarbdev = of_find_device_by_node(larbnode);
- if (!plarbdev) {
- of_node_put(larbnode);
+ of_node_put(larbnode);
+ if (!plarbdev)
return -ENODEV;
- }
+
if (!plarbdev->dev.driver) {
- of_node_put(larbnode);
platform_device_put(plarbdev);
return -EPROBE_DEFER;
}
data->larb_imu[id].dev = &plarbdev->dev;
- component_match_add_release(dev, match, component_release_of,
- component_compare_of, larbnode);
+ component_match_add(dev, match, component_compare_dev, &plarbdev->dev);
platform_device_put(plarbdev);
}
--
2.18.0