lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.18 665/879] iommu/mediatek: Add list_del in mtk_iommu_remove
    Date
    From: Yong Wu <yong.wu@mediatek.com>

    [ Upstream commit ee55f75e4bcade81d253163641b63bef3e76cac4 ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/iommu/mtk_iommu.c | 3 +--
    1 file changed, 1 insertion(+), 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);
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-08 03:40    [W:4.506 / U:1.344 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site