diff options
| author | Yong Wu <yong.wu@mediatek.com> | 2022-05-03 15:13:56 +0800 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2022-05-04 10:39:38 +0200 |
| commit | ee55f75e4bcade81d253163641b63bef3e76cac4 (patch) | |
| tree | 4bd67ff86a3976cf15118e8a02411679ddcd53c0 /drivers/iommu | |
| parent | 645b87c190c959e9bb4f216b8c4add4ee880451a (diff) | |
| download | linux-ee55f75e4bcade81d253163641b63bef3e76cac4.tar.gz linux-ee55f75e4bcade81d253163641b63bef3e76cac4.tar.bz2 linux-ee55f75e4bcade81d253163641b63bef3e76cac4.zip | |
iommu/mediatek: Add list_del in mtk_iommu_remove
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: 7c3a2ec02806 ("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>
Diffstat (limited to 'drivers/iommu')
| -rw-r--r-- | drivers/iommu/mtk_iommu.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c index 95c82b8bcc35..e4b4ebbcb73f 100644 --- a/drivers/iommu/mtk_iommu.c +++ b/drivers/iommu/mtk_iommu.c @@ -955,8 +955,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); device_link_remove(data->smicomm_dev, &pdev->dev); |