Re: [PATCH v7 4/5] iommu/mediatek: Add mt8173 IOMMU driver
On Fri, 2015-12-18 at 17:44 +, Robin Murphy wrote: > On 18/12/15 08:09, Yong Wu wrote: > > This patch adds support for mediatek m4u (MultiMedia Memory Management > > Unit). > > > > Signed-off-by: Yong Wu> > --- > > drivers/iommu/Kconfig | 14 + > > drivers/iommu/Makefile| 1 + > > drivers/iommu/mtk_iommu.c | 734 > > ++ > > 3 files changed, 749 insertions(+) > > create mode 100644 drivers/iommu/mtk_iommu.c > > > > > diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c > > new file mode 100644 > > index 000..d000d31 > > --- /dev/null > > +++ b/drivers/iommu/mtk_iommu.c > > [...] > > > +#define REG_MMU_CTRL_REG 0x110 > > +#define F_MMU_PREFETCH_RT_REPLACE_MOD BIT(4) > > +#define F_MMU_TF_PROTECT_SEL(prot) (((prot) & 0x3) << 5) > > +#define F_COHERENCE_EN BIT(8) > > [...] > > > +static int mtk_iommu_hw_init(const struct mtk_iommu_data *data) > > +{ > > + u32 regval; > > + int ret; > > + > > + ret = clk_prepare_enable(data->bclk); > > + if (ret) { > > + dev_err(data->dev, "Failed to enable iommu bclk(%d)\n", ret); > > + return ret; > > + } > > + > > + regval = F_MMU_PREFETCH_RT_REPLACE_MOD | > > + F_MMU_TF_PROTECT_SEL(2) | > > + F_COHERENCE_EN; > > I meant to ask this last time - does setting F_COHERENCE_EN here imply > that the M4U is capable of cache-coherent page table walks, or something > else? If it's the former, and assuming the MT8173 is actually wired up > to support that, then you should add a dma-coherent property to its DT > node in patch 5 (which will also save you all the cache flushes on page > table updates). No. F_COHERENCE_EN is not for m4u's cache-coherent page table walking. More about it: There are two iommu cells in the HW. one is perisys-iommu, the other is mm-iommu. The perisys-iommu currently is not contained in this upstream version. it will support this F_COHERENCE_EN bit which will enable coherence access for the master port if the sharable(S) bit is set in the pagetable descriptor. And in the mm-iommu, the iommu HW will work regardless of this bit. So I will delete this bit for readable as this is m4u(mm-iommu) in next time. > > > + writel_relaxed(regval, data->base + REG_MMU_CTRL_REG); > > + > > + regval = F_L2_MULIT_HIT_EN | > > + F_TABLE_WALK_FAULT_INT_EN | > > + F_PREETCH_FIFO_OVERFLOW_INT_EN | > > + F_MISS_FIFO_OVERFLOW_INT_EN | > > + F_PREFETCH_FIFO_ERR_INT_EN | > > + F_MISS_FIFO_ERR_INT_EN; > > + writel_relaxed(regval, data->base + REG_MMU_INT_CONTROL0); > > + > > + regval = F_INT_TRANSLATION_FAULT | > > + F_INT_MAIN_MULTI_HIT_FAULT | > > + F_INT_INVALID_PA_FAULT | > > + F_INT_ENTRY_REPLACEMENT_FAULT | > > + F_INT_TLB_MISS_FAULT | > > + F_INT_MISS_TRANSATION_FIFO_FAULT | > > + F_INT_PRETETCH_TRANSATION_FIFO_FAULT; > > + writel_relaxed(regval, data->base + REG_MMU_INT_MAIN_CONTROL); > > + > > + regval = F_MMU_IVRP_PA_SET(data->protect_base); > > + writel_relaxed(regval, data->base + REG_MMU_IVRP_PADDR); > > + > > + writel_relaxed(0, data->base + REG_MMU_DCM_DIS); > > + writel_relaxed(0, data->base + REG_MMU_STANDARD_AXI_MODE); > > + > > + if (devm_request_irq(data->dev, data->irq, mtk_iommu_isr, 0, > > +dev_name(data->dev), (void *)data)) { > > + writel_relaxed(0, data->base + REG_MMU_PT_BASE_ADDR); > > + clk_disable_unprepare(data->bclk); > > + dev_err(data->dev, "Failed @ IRQ-%d Request\n", data->irq); > > + return -ENODEV; > > + } > > + > > + return 0; > > +} > > Otherwise, I've not had the chance to go through this thoroughly but at > a glance it seems in pretty good shape now - nothing immediately jumps > out as looking wrong or worth making a fuss over. > > Thanks, > Robin. ___ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v7 4/5] iommu/mediatek: Add mt8173 IOMMU driver
Hi Yong, [auto build test ERROR on tegra/for-next] [also build test ERROR on v4.4-rc5] [cannot apply to iommu/next next-20151217] url: https://github.com/0day-ci/linux/commits/Yong-Wu/MT8173-IOMMU-SUPPORT/20151218-161550 base: https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux for-next config: parisc-allyesconfig (attached as .config) reproduce: wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross # save the attached .config to linux build tree make.cross ARCH=parisc All error/warnings (new ones prefixed by >>): drivers/iommu/dma-iommu.c: In function '__iommu_dma_alloc_pages': drivers/iommu/dma-iommu.c:198:3: error: implicit declaration of function 'vzalloc' [-Werror=implicit-function-declaration] pages = vzalloc(array_size); ^ drivers/iommu/dma-iommu.c:198:9: warning: assignment makes pointer from integer without a cast pages = vzalloc(array_size); ^ drivers/iommu/dma-iommu.c: In function 'iommu_dma_free': >> drivers/iommu/dma-iommu.c:256:12: error: 'DMA_ERROR_CODE' undeclared (first >> use in this function) *handle = DMA_ERROR_CODE; ^ drivers/iommu/dma-iommu.c:256:12: note: each undeclared identifier is reported only once for each function it appears in drivers/iommu/dma-iommu.c: In function 'iommu_dma_alloc': drivers/iommu/dma-iommu.c:288:12: error: 'DMA_ERROR_CODE' undeclared (first use in this function) *handle = DMA_ERROR_CODE; ^ drivers/iommu/dma-iommu.c: In function 'iommu_dma_map_page': drivers/iommu/dma-iommu.c:369:10: error: 'DMA_ERROR_CODE' undeclared (first use in this function) return DMA_ERROR_CODE; ^ drivers/iommu/dma-iommu.c: In function '__invalidate_sg': drivers/iommu/dma-iommu.c:419:28: error: 'DMA_ERROR_CODE' undeclared (first use in this function) if (sg_dma_address(s) != DMA_ERROR_CODE) ^ drivers/iommu/dma-iommu.c: In function 'iommu_dma_mapping_error': drivers/iommu/dma-iommu.c:523:21: error: 'DMA_ERROR_CODE' undeclared (first use in this function) return dma_addr == DMA_ERROR_CODE; ^ >> drivers/iommu/dma-iommu.c:524:1: warning: control reaches end of non-void >> function [-Wreturn-type] } ^ cc1: some warnings being treated as errors -- drivers/iommu/mtk_iommu.c:174:2: warning: initialization from incompatible pointer type .tlb_add_flush = mtk_iommu_tlb_add_flush_nosync, ^ drivers/iommu/mtk_iommu.c:174:2: warning: (near initialization for 'mtk_iommu_gather_ops.tlb_add_flush') drivers/iommu/mtk_iommu.c: In function 'mtk_iommu_config': >> drivers/iommu/mtk_iommu.c:223:22: error: 'struct dev_archdata' has no member >> named 'iommu' head = dev->archdata.iommu; ^ drivers/iommu/mtk_iommu.c: In function 'mtk_iommu_domain_finalise': drivers/iommu/mtk_iommu.c:247:4: error: 'IO_PGTABLE_QUIRK_NO_PERMS' undeclared (first use in this function) IO_PGTABLE_QUIRK_NO_PERMS | ^ drivers/iommu/mtk_iommu.c:247:4: note: each undeclared identifier is reported only once for each function it appears in drivers/iommu/mtk_iommu.c:248:4: error: 'IO_PGTABLE_QUIRK_TLBI_ON_MAP' undeclared (first use in this function) IO_PGTABLE_QUIRK_TLBI_ON_MAP, ^ drivers/iommu/mtk_iommu.c:256:34: error: 'ARM_V7S' undeclared (first use in this function) dom->iop = alloc_io_pgtable_ops(ARM_V7S, >cfg, data); ^ drivers/iommu/mtk_iommu.c:265:27: error: 'struct io_pgtable_cfg' has no member named 'arm_v7s_cfg' writel(data->m4u_dom->cfg.arm_v7s_cfg.ttbr[0], ^ drivers/iommu/mtk_iommu.c: In function 'mtk_iommu_attach_device': drivers/iommu/mtk_iommu.c:303:52: error: 'struct dev_archdata' has no member named 'iommu' struct mtk_iommu_client_priv *priv = dev->archdata.iommu; ^ drivers/iommu/mtk_iommu.c: In function 'mtk_iommu_detach_device': drivers/iommu/mtk_iommu.c:331:52: error: 'struct dev_archdata' has no member named 'iommu' struct mtk_iommu_client_priv *priv = dev->archdata.iommu; ^ drivers/iommu/mtk_iommu.c: In function 'mtk_iommu_add_device': drivers/iommu/mtk_iommu.c:387:20: error: 'struct dev_archdata' has no member named 'iommu' if (!dev->archdata.iommu) /* Not a iommu client device */ ^ drivers/iommu/mtk_iommu.c: In function 'mtk_iommu_remove_device': drivers/iommu/mtk_iommu.c:402:22: error: 'struct dev_archdata' has no member named 'iommu' head = dev->archdata.iommu; ^ drivers/iommu/mtk_iommu.c:411:15: error: 'struct dev_archdata' has no member named 'iommu' dev->archdata.iommu = NULL;