iommu/mediatek: Add PCIe support

Currently the code for of_iommu_configure_dev_id is like this:

static int of_iommu_configure_dev_id(struct device_node *master_np,
                                     struct device *dev,
                                     const u32 *id)
{
       struct of_phandle_args iommu_spec = { .args_count = 1 };

       err = of_map_id(master_np, *id, "iommu-map",
                       "iommu-map-mask", &iommu_spec.np,
                       iommu_spec.args);
...
}

It supports only one id output. BUT our PCIe HW has two ID(one is for
writing, the other is for reading). I'm not sure if we should change
of_map_id to support output MAX_PHANDLE_ARGS.

Here add the solution in ourselve drivers. If it's pcie case, enable one
more bit.

Not all infra iommu support PCIe, thus add a PCIe support flag here.

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-23-yong.wu@mediatek.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index ff48506b480c32939ca3d5745a356dc675ad4ff3..d63fe28c1403d1ba0bccc2178cff60c32034abfc 100644 (file)
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -20,6 +20,7 @@
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
 #include <linux/of_platform.h>
+#include <linux/pci.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/regmap.h>
@@ -134,6 +135,7 @@
 #define MTK_IOMMU_TYPE_MASK            (0x3 << 13)
 /* PM and clock always on. e.g. infra iommu */
 #define PM_CLK_AO                      BIT(15)
+#define IFA_IOMMU_PCIE_SUPPORT         BIT(16)
 
 #define MTK_IOMMU_HAS_FLAG_MASK(pdata, _x, mask)       \
                                ((((pdata)->flags) & (mask)) == (_x))
@@ -420,8 +422,11 @@ static int mtk_iommu_config(struct mtk_iommu_data *data, struct device *dev,
                                larb_mmu->mmu &= ~MTK_SMI_MMU_EN(portid);
                } else if (MTK_IOMMU_IS_TYPE(data->plat_data, MTK_IOMMU_TYPE_INFRA)) {
                        peri_mmuen_msk = BIT(portid);
-                       peri_mmuen = enable ? peri_mmuen_msk : 0;
+                       /* PCI dev has only one output id, enable the next writing bit for PCIe */
+                       if (dev_is_pci(dev))
+                               peri_mmuen_msk |= BIT(portid + 1);
 
+                       peri_mmuen = enable ? peri_mmuen_msk : 0;
                        ret = regmap_update_bits(data->pericfg, PERICFG_IOMMU_1,
                                                 peri_mmuen_msk, peri_mmuen);
                        if (ret)
@@ -1054,6 +1059,15 @@ static int mtk_iommu_probe(struct platform_device *pdev)
                ret = component_master_add_with_match(dev, &mtk_iommu_com_ops, match);
                if (ret)
                        goto out_bus_set_null;
+       } else if (MTK_IOMMU_IS_TYPE(data->plat_data, MTK_IOMMU_TYPE_INFRA) &&
+                  MTK_IOMMU_HAS_FLAG(data->plat_data, IFA_IOMMU_PCIE_SUPPORT)) {
+#ifdef CONFIG_PCI
+               if (!iommu_present(&pci_bus_type)) {
+                       ret = bus_set_iommu(&pci_bus_type, &mtk_iommu_ops);
+                       if (ret) /* PCIe fail don't affect platform_bus. */
+                               goto out_list_del;
+               }
+#endif
        }
        return ret;
 
@@ -1084,6 +1098,11 @@ static int mtk_iommu_remove(struct platform_device *pdev)
        if (MTK_IOMMU_IS_TYPE(data->plat_data, MTK_IOMMU_TYPE_MM)) {
                device_link_remove(data->smicomm_dev, &pdev->dev);
                component_master_del(&pdev->dev, &mtk_iommu_com_ops);
+       } else if (MTK_IOMMU_IS_TYPE(data->plat_data, MTK_IOMMU_TYPE_INFRA) &&
+                  MTK_IOMMU_HAS_FLAG(data->plat_data, IFA_IOMMU_PCIE_SUPPORT)) {
+#ifdef CONFIG_PCI
+               bus_set_iommu(&pci_bus_type, NULL);
+#endif
        }
        pm_runtime_disable(&pdev->dev);
        devm_free_irq(&pdev->dev, data->irq, data);