Skip to content

Commit

Permalink
iommu/mediatek: Add list_del in mtk_iommu_remove
Browse files Browse the repository at this point in the history
[ Upstream commit ee55f75 ]

Lack the list_del in the mtk_iommu_remove, and remove
bus_set_iommu(*, NULL) since there may be several iommu HWs.
we can not bus_set_iommu null when one iommu driver unbind.

This could be a fix for mt2712 which support 2 M4U HW and list them.

Fixes: 7c3a2ec ("iommu/mediatek: Merge 2 M4U HWs into one iommu domain")
Signed-off-by: Yong Wu <yong.wu@mediatek.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
Link: https://lore.kernel.org/r/20220503071427.2285-6-yong.wu@mediatek.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
YongWu-HF authored and gregkh committed Jun 9, 2022
1 parent 51d5847 commit da748d2
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions drivers/iommu/mtk_iommu.c
Original file line number Diff line number Diff line change
Expand Up @@ -768,8 +768,7 @@ static int mtk_iommu_remove(struct platform_device *pdev)
iommu_device_sysfs_remove(&data->iommu);
iommu_device_unregister(&data->iommu);

if (iommu_present(&platform_bus_type))
bus_set_iommu(&platform_bus_type, NULL);
list_del(&data->list);

clk_disable_unprepare(data->bclk);
devm_free_irq(&pdev->dev, data->irq, data);
Expand Down

0 comments on commit da748d2

Please sign in to comment.