Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma

[linux-2.6-microblaze.git] / drivers / iommu / mtk_iommu.c

diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index 785b228..c072cee 100644 (file)
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -3,7 +3,6 @@
  * Copyright (c) 2015-2016 MediaTek Inc.
  * Author: Yong Wu <yong.wu@mediatek.com>
  */
-#include <linux/memblock.h>
 #include <linux/bug.h>
 #include <linux/clk.h>
 #include <linux/component.h>
@@ -15,13 +14,16 @@
 #include <linux/iommu.h>
 #include <linux/iopoll.h>
 #include <linux/list.h>
+#include <linux/mfd/syscon.h>
 #include <linux/of_address.h>
 #include <linux/of_iommu.h>
 #include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/platform_device.h>
+#include <linux/regmap.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
+#include <linux/soc/mediatek/infracfg.h>
 #include <asm/barrier.h>
 #include <soc/mediatek/smi.h>
 
@@ -116,6 +118,7 @@
 #define OUT_ORDER_WR_EN                        BIT(4)
 #define HAS_SUB_COMM                   BIT(5)
 #define WR_THROT_EN                    BIT(6)
+#define HAS_LEGACY_IVRP_PADDR          BIT(7)
 
 #define MTK_IOMMU_HAS_FLAG(pdata, _x) \
                ((((pdata)->flags) & (_x)) == (_x))
@@ -582,7 +585,7 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data)
                F_INT_PRETETCH_TRANSATION_FIFO_FAULT;
        writel_relaxed(regval, data->base + REG_MMU_INT_MAIN_CONTROL);
 
-       if (data->plat_data->m4u_plat == M4U_MT8173)
+       if (MTK_IOMMU_HAS_FLAG(data->plat_data, HAS_LEGACY_IVRP_PADDR))
                regval = (data->protect_base >> 1) | (data->enable_4GB << 31);
        else
                regval = lower_32_bits(data->protect_base) |
@@ -640,8 +643,11 @@ static int mtk_iommu_probe(struct platform_device *pdev)
        struct resource         *res;
        resource_size_t         ioaddr;
        struct component_match  *match = NULL;
+       struct regmap           *infracfg;
        void                    *protect;
        int                     i, larb_nr, ret;
+       u32                     val;
+       char                    *p;
 
        data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
        if (!data)
@@ -655,10 +661,28 @@ static int mtk_iommu_probe(struct platform_device *pdev)
                return -ENOMEM;
        data->protect_base = ALIGN(virt_to_phys(protect), MTK_PROTECT_PA_ALIGN);
 
-       /* Whether the current dram is over 4GB */
-       data->enable_4GB = !!(max_pfn > (BIT_ULL(32) >> PAGE_SHIFT));
-       if (!MTK_IOMMU_HAS_FLAG(data->plat_data, HAS_4GB_MODE))
-               data->enable_4GB = false;
+       if (MTK_IOMMU_HAS_FLAG(data->plat_data, HAS_4GB_MODE)) {
+               switch (data->plat_data->m4u_plat) {
+               case M4U_MT2712:
+                       p = "mediatek,mt2712-infracfg";
+                       break;
+               case M4U_MT8173:
+                       p = "mediatek,mt8173-infracfg";
+                       break;
+               default:
+                       p = NULL;
+               }
+
+               infracfg = syscon_regmap_lookup_by_compatible(p);
+
+               if (IS_ERR(infracfg))
+                       return PTR_ERR(infracfg);
+
+               ret = regmap_read(infracfg, REG_INFRA_MISC, &val);
+               if (ret)
+                       return ret;
+               data->enable_4GB = !!(val & F_DDR_4GB_SUPPORT_EN);
+       }
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        data->base = devm_ioremap_resource(dev, res);
@@ -816,9 +840,17 @@ static const struct mtk_iommu_plat_data mt6779_data = {
        .larbid_remap  = {{0}, {1}, {2}, {3}, {5}, {7, 8}, {10}, {9}},
 };
 
+static const struct mtk_iommu_plat_data mt8167_data = {
+       .m4u_plat     = M4U_MT8167,
+       .flags        = RESET_AXI | HAS_LEGACY_IVRP_PADDR,
+       .inv_sel_reg  = REG_MMU_INV_SEL_GEN1,
+       .larbid_remap = {{0}, {1}, {2}}, /* Linear mapping. */
+};
+
 static const struct mtk_iommu_plat_data mt8173_data = {
        .m4u_plat     = M4U_MT8173,
-       .flags        = HAS_4GB_MODE | HAS_BCLK | RESET_AXI,
+       .flags        = HAS_4GB_MODE | HAS_BCLK | RESET_AXI |
+                       HAS_LEGACY_IVRP_PADDR,
        .inv_sel_reg  = REG_MMU_INV_SEL_GEN1,
        .larbid_remap = {{0}, {1}, {2}, {3}, {4}, {5}}, /* Linear mapping. */
 };
@@ -833,6 +865,7 @@ static const struct mtk_iommu_plat_data mt8183_data = {
 static const struct of_device_id mtk_iommu_of_ids[] = {
        { .compatible = "mediatek,mt2712-m4u", .data = &mt2712_data},
        { .compatible = "mediatek,mt6779-m4u", .data = &mt6779_data},
+       { .compatible = "mediatek,mt8167-m4u", .data = &mt8167_data},
        { .compatible = "mediatek,mt8173-m4u", .data = &mt8173_data},
        { .compatible = "mediatek,mt8183-m4u", .data = &mt8183_data},
        {}
@@ -843,7 +876,7 @@ static struct platform_driver mtk_iommu_driver = {
        .remove = mtk_iommu_remove,
        .driver = {
                .name = "mtk-iommu",
-               .of_match_table = of_match_ptr(mtk_iommu_of_ids),
+               .of_match_table = mtk_iommu_of_ids,
                .pm = &mtk_iommu_pm_ops,
        }
 };