Message ID | 1444357388-30257-6-git-send-email-yong.wu@mediatek.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Fri, Oct 09, 2015 at 10:23:07AM +0800, Yong Wu wrote: > + /* > + * There is a domain for each a iommu device in normal case. > + * But MTK only has one iommu domain called the m4u domain which all > + * the multimedia HW share. Here we reserve one as the m4u domain and > + * free the others. > + * > + * And the attach_device that from __iommu_setup_dma_ops > + * will be called earlier than probe. > + */ Okay, with this being the case, you need to put all devices behind one IOMMU into the same iommu-group, because the IOMMU can't really isolate the devices from each other. > +static int mtk_iommu_add_device(struct device *dev) > +{ > + struct iommu_group *group; > + struct mtk_iommu_client_priv *priv; > + struct mtk_iommu_domain *m4udom; > + struct iommu_domain *domain; > + int ret; > + > + if (!dev->archdata.iommu) /* Not a iommu client device */ > + return -ENODEV; > + > + group = iommu_group_get(dev); > + if (!group) { > + group = iommu_group_alloc(); > + if (IS_ERR(group)) { > + dev_err(dev, "Failed to allocate IOMMU group\n"); > + return PTR_ERR(group); > + } > + } > + > + ret = iommu_group_add_device(group, dev); > + if (ret) { > + dev_err(dev, "Failed to add IOMMU group\n"); > + goto err_group_put; > + } > + > + domain = iommu_get_domain_for_dev(dev); > + if (!domain) { > + /* > + * Get the m4u iommu domain from the m4u device. > + * Attach all the client devices into the m4u domain. > + */ > + priv = dev->archdata.iommu; > + m4udom = dev_get_drvdata(priv->m4udev); > + ret = iommu_attach_group(&m4udom->domain, group); > + if (ret) > + dev_err(dev, "Failed to attach IOMMU group\n"); > + } > + > +err_group_put: > + iommu_group_put(group); > + return ret; > +} Here it looks like you are allocating one group for each device. As I said, all devices need to be in one group. Joerg
On Wed, 2015-10-14 at 14:53 +0200, Joerg Roedel wrote: > On Fri, Oct 09, 2015 at 10:23:07AM +0800, Yong Wu wrote: > > + /* > > + * There is a domain for each a iommu device in normal case. > > + * But MTK only has one iommu domain called the m4u domain which all > > + * the multimedia HW share. Here we reserve one as the m4u domain and > > + * free the others. > > + * > > + * And the attach_device that from __iommu_setup_dma_ops > > + * will be called earlier than probe. > > + */ > > Okay, with this being the case, you need to put all devices behind one > IOMMU into the same iommu-group, because the IOMMU can't really isolate > the devices from each other. > > > +static int mtk_iommu_add_device(struct device *dev) > > +{ > > + struct iommu_group *group; > > + struct mtk_iommu_client_priv *priv; > > + struct mtk_iommu_domain *m4udom; > > + struct iommu_domain *domain; > > + int ret; > > + > > + if (!dev->archdata.iommu) /* Not a iommu client device */ > > + return -ENODEV; > > + > > + group = iommu_group_get(dev); > > + if (!group) { > > + group = iommu_group_alloc(); > > + if (IS_ERR(group)) { > > + dev_err(dev, "Failed to allocate IOMMU group\n"); > > + return PTR_ERR(group); > > + } > > + } > > + > > + ret = iommu_group_add_device(group, dev); > > + if (ret) { > > + dev_err(dev, "Failed to add IOMMU group\n"); > > + goto err_group_put; > > + } > > + > > + domain = iommu_get_domain_for_dev(dev); > > + if (!domain) { > > + /* > > + * Get the m4u iommu domain from the m4u device. > > + * Attach all the client devices into the m4u domain. > > + */ > > + priv = dev->archdata.iommu; > > + m4udom = dev_get_drvdata(priv->m4udev); > > + ret = iommu_attach_group(&m4udom->domain, group); > > + if (ret) > > + dev_err(dev, "Failed to attach IOMMU group\n"); > > + } > > + > > +err_group_put: > > + iommu_group_put(group); > > + return ret; > > +} > > Here it looks like you are allocating one group for each device. As I > said, all devices need to be in one group. > > Joerg > Thanks for this suggestion. I have put all the iommu client devices into the same iommu group, the code looks like below. And I will send this in the next version after the Short descriptor is reviewed. static int mtk_iommu_add_device(struct device *dev) { struct iommu_group *group; struct mtk_iommu_client_priv *priv; struct mtk_iommu_domain *m4udom; struct iommu_domain *domain; int ret; priv = dev->archdata.iommu; if (!priv) /* Not a iommu client device */ return -ENODEV; m4udom = dev_get_drvdata(priv->m4udev); group = iommu_group_get(dev); if (!group) { /* * All the iommu client devices are in the m4u domain, * they all are in the same m4u iommu-group too here. */ if (!m4udom->m4u_group) { group = iommu_group_alloc(); if (IS_ERR(group)) { dev_err(dev, "Failed to allocate IOMMU group\n"); return PTR_ERR(group); } m4udom->m4u_group = group; } else { group = m4udom->m4u_group; } } ret = iommu_group_add_device(group, dev); if (ret) { dev_err(dev, "Failed to add IOMMU group\n"); goto err_group_put; } domain = iommu_get_domain_for_dev(dev); if (!domain) ret = iommu_attach_group(&m4udom->domain, group); err_group_put: iommu_group_put(group); return ret; }
On 09/10/15 03:23, Yong Wu wrote: [...] > +#include <linux/io.h> > +#include <linux/interrupt.h> > +#include <linux/platform_device.h> > +#include <linux/module.h> > +#include <linux/iommu.h> > +#include <linux/dma-iommu.h> > +#include <linux/of_iommu.h> > +#include <linux/of_address.h> > +#include <linux/of_irq.h> > +#include <linux/of_platform.h> > +#include <linux/list.h> > +#include <linux/clk.h> > +#include <linux/iopoll.h> Nit: ordering? > +#include <soc/mediatek/smi.h> > +#include "io-pgtable.h" [...] > +struct mtk_iommu_data { > + void __iomem *base; > + int irq; > + struct device *dev; > + struct device *larbdev[MTK_IOMMU_LARB_MAX_NR]; > + struct clk *bclk; > + phys_addr_t protect_base; /* protect memory base */ > + int larb_nr;/* local arbiter number */ > + struct mtk_iommu_suspend_reg reg; > +}; I think I've finally got my head round the way this hardware works - each LARB can be configured to block or allow transactions from the client device behind each port, but they _don't_ otherwise pass any information downstream such that the M4U itself can identify individual transactions, right? If that is indeed the case, then Joerg is totally correct that all clients of one M4U should be in a single group, so you might as well keep a handy iommu_group pointer here. I'll refer back to that idea later... [...] > +static void mtk_iommu_clear_intr(const struct mtk_iommu_data *data) > +{ > + u32 val; > + > + val = readl_relaxed(data->base + REG_MMU_INT_CONTROL0); > + val |= F_INT_L2_CLR_BIT; > + writel_relaxed(val, data->base + REG_MMU_INT_CONTROL0); > +} Do you anticipate any other callers of this? AFAICS these 3 lines could just be rolled into mtk_iommu_isr(). > +static void mtk_iommu_tlb_flush_all(void *cookie) > +{ > + struct mtk_iommu_domain *domain = cookie; > + void __iomem *base; > + > + base = domain->data->base; > + writel_relaxed(F_INVLD_EN1 | F_INVLD_EN0, base + REG_MMU_INV_SEL); > + writel_relaxed(F_ALL_INVLD, base + REG_MMU_INVALIDATE); > + mb();/* Make sure flush all done */ If it's purely to make sure the write has completed, would wmb() be sufficient here? > +} > + > +static void mtk_iommu_tlb_add_flush(unsigned long iova, size_t size, > + bool leaf, void *cookie) > +{ > + struct mtk_iommu_domain *domain = cookie; > + void __iomem *base = domain->data->base; > + unsigned int iova_start = iova, iova_end = iova + size - 1; Nit: why not simply name the argument iova_start in the first place, or just use iova below? > + writel_relaxed(F_INVLD_EN1 | F_INVLD_EN0, base + REG_MMU_INV_SEL); > + > + writel_relaxed(iova_start, base + REG_MMU_INVLD_START_A); > + writel_relaxed(iova_end, base + REG_MMU_INVLD_END_A); > + writel_relaxed(F_MMU_INV_RANGE, base + REG_MMU_INVALIDATE); > +} > + > +static void mtk_iommu_tlb_sync(void *cookie) > +{ > + struct mtk_iommu_domain *domain = cookie; > + void __iomem *base = domain->data->base; > + int ret; > + u32 tmp; > + > + ret = readl_poll_timeout_atomic(base + REG_MMU_CPE_DONE, tmp, > + tmp != 0, 10, 1000000); > + if (ret) { > + dev_warn(domain->data->dev, > + "Partial TLB flush timed out, falling back to full flush\n"); > + mtk_iommu_tlb_flush_all(cookie); > + } > + writel_relaxed(0, base + REG_MMU_CPE_DONE); Do you still need this writeback in the ret==0 case when you've already read CPE_DONE as 0, or should this be inside the condition? (in which case you could also use an early return to lose the indent) > +} [...] > +static int mtk_iommu_hw_init(const struct mtk_iommu_domain *mtkdom) > +{ > + struct mtk_iommu_data *data = mtkdom->data; > + void __iomem *base = data->base; > + u32 regval; > + int ret; > + > + ret = clk_prepare_enable(data->bclk); > + if (ret) { > + dev_err(data->dev, "Failed to enable iommu clk(%d)\n", ret); > + return ret; > + } I'm not sure about the asymmetry here; the clock gets enabled when attaching clients to a domain, but not disabled until the IOMMU itself is torn down in mtk_iommu_remove() (i.e. never). It seems like either the clock should be enabled in mtk_iommu_probe(), or disabled in domain detach. > + writel_relaxed(mtkdom->cfg.arm_short_cfg.ttbr[0], > + base + REG_MMU_PT_BASE_ADDR); > + > + regval = F_MMU_PREFETCH_RT_REPLACE_MOD | > + F_MMU_TF_PROTECT_SEL(2) | > + F_COHERENCE_EN; > + writel_relaxed(regval, 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, 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, base + REG_MMU_INT_MAIN_CONTROL); > + > + regval = ALIGN(data->protect_base, MTK_PROTECT_PA_ALIGN); > + regval = F_MMU_IVRP_PA_SET(regval); From the look of it, it might not hurt to just fold the ALIGN() into the F_MMU_IVRP_PA_SET() macro itself. > + writel_relaxed(regval, base + REG_MMU_IVRP_PADDR); > + > + writel_relaxed(0, base + REG_MMU_DCM_DIS); > + writel_relaxed(0, base + REG_MMU_STANDARD_AXI_MODE); > + > + if (devm_request_irq(data->dev, data->irq, mtk_iommu_isr, 0, > + dev_name(data->dev), (void *)mtkdom)) { > + writel_relaxed(0, base + REG_MMU_PT_BASE_ADDR); > + clk_disable_unprepare(data->bclk); > + dev_err(data->dev, "Failed @ IRQ-%d Request\n", data->irq); > + return -ENODEV; > + } Maybe balance this with a devm_free_irq() in mtk_iommu_domain_free()? (otherwise it's hanging around forever since the platform bus never seems to get destroyed) > + return 0; > +} > + > +static int mtk_iommu_config(struct mtk_iommu_domain *mtkdom > + struct device *dev, bool enable) > +{ > + struct mtk_iommu_data *data = mtkdom->data; > + struct mtk_iommu_client_priv *head, *cur, *next; > + > + head = dev->archdata.iommu; > + list_for_each_entry_safe(cur, next, &head->client, client) { > + if (cur->larbid >= data->larb_nr) { > + dev_err(data->dev, "Invalid larb:%d\n", cur->larbid); > + return -EINVAL; > + } > + > + mtk_smi_config_port(data->larbdev[cur->larbid], > + cur->portid, enable); > + if (!enable) { > + list_del(&cur->client); > + kfree(cur); > + } This list wasn't created by attach_device(), so it doesn't look right that detach_device() should cause it to be freed - I think this teardown belongs in mtk_iommu_remove_device(), as the counterpoint to the of_xlate/add_device operation. > + } > + > + if (!enable) { > + kfree(head); > + dev->archdata.iommu = NULL; Ditto. > + } > + return 0; > +} [...] > +static int mtk_iommu_attach_device(struct iommu_domain *domain, > + struct device *dev) > +{ > + struct mtk_iommu_domain *priv = to_mtk_domain(domain), *m4udom; > + struct iommu_group *group; > + struct mtk_iommu_client_priv *clientpriv; > + struct device *m4udev; > + int ret; > + > + clientpriv = dev->archdata.iommu; > + if (!clientpriv) > + return -ENODEV; > + m4udev = clientpriv->m4udev; > + > + /* > + * There is a domain for each a iommu device in normal case. > + * But MTK only has one iommu domain called the m4u domain which all > + * the multimedia HW share. Here we reserve one as the m4u domain and > + * free the others. > + * > + * And the attach_device that from __iommu_setup_dma_ops > + * will be called earlier than probe. > + */ > + m4udom = dev_get_drvdata(m4udev); > + if (!m4udom) > + dev_set_drvdata(m4udev, priv); > + else if (m4udom != priv) > + iommu_domain_free(domain); With the client devices in a single group, then I realise we shouldn't actually need any special handling of domains at all - we can freely create multiple domains, and since the group can only be attached to one at a time, all we do is point the hardware at the relevant page table on attach, and reset it on detach. That should make life somewhat easier, and means we no longer have to subvert the IOMMU API like this. > + group = iommu_group_get(dev); > + if (!group) Either way you shouldn't need this - you've already bailed out if this isn't one of your client devices (via the dev->archdata.iommu check), and if it is, then it already has a group by virtue of mtk_iommu_add_device()... > + return 0; ...and regardless, indicating success without attaching anything to anything looks very off. > + iommu_group_put(group); > + > + /* Initial the m4u domain context which is from the add_device */ > + ret = mtk_iommu_init_domain_context(priv); > + if (ret) > + return ret; > + > + return mtk_iommu_config(priv, dev, true); > +} [...] > +static int mtk_iommu_add_device(struct device *dev) > +{ > + struct iommu_group *group; > + struct mtk_iommu_client_priv *priv; > + struct mtk_iommu_domain *m4udom; > + struct iommu_domain *domain; > + int ret; > + > + if (!dev->archdata.iommu) /* Not a iommu client device */ > + return -ENODEV; > + > + group = iommu_group_get(dev); If this became just a case of looking up mtk_iommu_data->group in archdata.iommu and adding this device to it, then everything else here should be able to go away - the arch code will create a default domain for the first device in the group, then sees each subsequent device appear in that domain as you add them, so just sets their dma_ops without any further interference (I have tested multi-device groups!) > + if (!group) { > + group = iommu_group_alloc(); > + if (IS_ERR(group)) { > + dev_err(dev, "Failed to allocate IOMMU group\n"); > + return PTR_ERR(group); > + } > + } (although you might still need the lazy group allocation here if mtk_iommu_probe() turns out to run too early to do it). > + ret = iommu_group_add_device(group, dev); > + if (ret) { > + dev_err(dev, "Failed to add IOMMU group\n"); > + goto err_group_put; > + } > + > + domain = iommu_get_domain_for_dev(dev); > + if (!domain) { > + /* > + * Get the m4u iommu domain from the m4u device. > + * Attach all the client devices into the m4u domain. > + */ > + priv = dev->archdata.iommu; > + m4udom = dev_get_drvdata(priv->m4udev); > + ret = iommu_attach_group(&m4udom->domain, group); > + if (ret) > + dev_err(dev, "Failed to attach IOMMU group\n"); > + } > + > +err_group_put: > + iommu_group_put(group); > + return ret; > +} [...] > +static int mtk_iommu_init_fn(struct device_node *np) > +{ > + struct platform_device *pdev; > + > + pdev = of_platform_device_create(np, NULL, platform_bus_type.dev_root); Hmm, is it OK that the driver isn't yet registered at this point? If you can guarantee that none of the client devices will also be registering their drivers at subsys_initcall level, then I guess it works out reasonably safe in practice, but it still smells a bit racy. > + if (IS_ERR(pdev)) > + return PTR_ERR(pdev); > + > + of_iommu_set_ops(np, &mtk_iommu_ops); > + > + return 0; > +} > + > +IOMMU_OF_DECLARE(mtkm4u, "mediatek,mt8173-m4u", mtk_iommu_init_fn); > + > +static int mtk_iommu_probe(struct platform_device *pdev) > +{ > + struct mtk_iommu_data *data; > + struct device *dev = &pdev->dev; > + struct mtk_iommu_domain *m4udom; > + void __iomem *protect; > + int ret; > + > + data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL); > + if (!data) > + return -ENOMEM; > + data->dev = dev; > + > + /* Protect memory. HW will access here while translation fault.*/ > + protect = devm_kzalloc(dev, MTK_PROTECT_PA_ALIGN * 2, GFP_KERNEL); > + if (!protect) > + return -ENOMEM; > + data->protect_base = virt_to_phys(protect); > + > + ret = mtk_iommu_parse_dt(pdev, data); > + if (ret) > + return ret; Hopefully you could allocate your group here and avoid the extra complication in add_device, but it might be problematic if the early device creation means this gets called before sysfs is fully up and running. > + m4udom = dev_get_drvdata(dev); > + if (m4udom) > + m4udom->data = data; > + > + return 0; > +} [...] > +static int mtk_iommu_resume(struct device *dev) > +{ > + struct mtk_iommu_domain *mtkdom = dev_get_drvdata(dev); > + struct mtk_iommu_suspend_reg *reg; > + void __iomem *base; > + > + if (!mtkdom) > + return 0; > + > + reg = &mtkdom->data->reg; > + base = mtkdom->data->base; > + writel_relaxed(mtkdom->cfg.arm_short_cfg.ttbr[0], > + base + REG_MMU_PT_BASE_ADDR); > + writel_relaxed(reg->standard_axi_mode, > + base + REG_MMU_STANDARD_AXI_MODE); > + writel_relaxed(reg->dcm_dis, base + REG_MMU_DCM_DIS); > + writel_relaxed(reg->ctrl_reg, base + REG_MMU_CTRL_REG); > + writel_relaxed(reg->ivrp_paddr, base + REG_MMU_IVRP_PADDR); On closer inspection, it looks pretty cheap to recalculate this one from data->protect_base, so perhaps that could be one less thing to save. > + writel_relaxed(reg->int_control0, base + REG_MMU_INT_CONTROL0); > + writel_relaxed(reg->int_main_control, base + REG_MMU_INT_MAIN_CONTROL); > + return 0; > +} Robin.
On Tue, 2015-10-27 at 13:25 +0000, Robin Murphy wrote: > On 09/10/15 03:23, Yong Wu wrote: > [...] > > +#include <linux/io.h> > > +#include <linux/interrupt.h> > > +#include <linux/platform_device.h> > > +#include <linux/module.h> > > +#include <linux/iommu.h> > > +#include <linux/dma-iommu.h> > > +#include <linux/of_iommu.h> > > +#include <linux/of_address.h> > > +#include <linux/of_irq.h> > > +#include <linux/of_platform.h> > > +#include <linux/list.h> > > +#include <linux/clk.h> > > +#include <linux/iopoll.h> > > Nit: ordering? Yes. Thanks. I will order them in next time. > > > +#include <soc/mediatek/smi.h> > > +#include "io-pgtable.h" > > [...] > > +struct mtk_iommu_data { > > + void __iomem *base; > > + int irq; > > + struct device *dev; > > + struct device *larbdev[MTK_IOMMU_LARB_MAX_NR]; > > + struct clk *bclk; > > + phys_addr_t protect_base; /* protect memory base */ > > + int larb_nr;/* local arbiter number */ > > + struct mtk_iommu_suspend_reg reg; > > +}; > > I think I've finally got my head round the way this hardware works - > each LARB can be configured to block or allow transactions from the > client device behind each port, but they _don't_ otherwise pass any > information downstream such that the M4U itself can identify individual > transactions, right? If that is indeed the case, then Joerg is totally > correct that all clients of one M4U should be in a single group, so you > might as well keep a handy iommu_group pointer here. I'll refer back to > that idea later... I will put them into a single group and rebase Joerg's patchset(iommu: Make core iommu-groups code more generic) too. see later. > > [...] > > +static void mtk_iommu_clear_intr(const struct mtk_iommu_data *data) > > +{ > > + u32 val; > > + > > + val = readl_relaxed(data->base + REG_MMU_INT_CONTROL0); > > + val |= F_INT_L2_CLR_BIT; > > + writel_relaxed(val, data->base + REG_MMU_INT_CONTROL0); > > +} > > Do you anticipate any other callers of this? AFAICS these 3 lines could > just be rolled into mtk_iommu_isr(). Yes. Thanks. We can put it into the isr. > > > +static void mtk_iommu_tlb_flush_all(void *cookie) > > +{ > > + struct mtk_iommu_domain *domain = cookie; > > + void __iomem *base; > > + > > + base = domain->data->base; > > + writel_relaxed(F_INVLD_EN1 | F_INVLD_EN0, base + REG_MMU_INV_SEL); > > + writel_relaxed(F_ALL_INVLD, base + REG_MMU_INVALIDATE); > > + mb();/* Make sure flush all done */ > > If it's purely to make sure the write has completed, would wmb() be > sufficient here? YES. > > > +} > > + > > +static void mtk_iommu_tlb_add_flush(unsigned long iova, size_t size, > > + bool leaf, void *cookie) > > +{ > > + struct mtk_iommu_domain *domain = cookie; > > + void __iomem *base = domain->data->base; > > + unsigned int iova_start = iova, iova_end = iova + size - 1; > > Nit: why not simply name the argument iova_start in the first place, or > just use iova below? I will delete them and just use "iova" below. > > > + writel_relaxed(F_INVLD_EN1 | F_INVLD_EN0, base + REG_MMU_INV_SEL); > > + > > + writel_relaxed(iova_start, base + REG_MMU_INVLD_START_A); > > + writel_relaxed(iova_end, base + REG_MMU_INVLD_END_A); > > + writel_relaxed(F_MMU_INV_RANGE, base + REG_MMU_INVALIDATE); > > +} > > + > > +static void mtk_iommu_tlb_sync(void *cookie) > > +{ > > + struct mtk_iommu_domain *domain = cookie; > > + void __iomem *base = domain->data->base; > > + int ret; > > + u32 tmp; > > + > > + ret = readl_poll_timeout_atomic(base + REG_MMU_CPE_DONE, tmp, > > + tmp != 0, 10, 1000000); > > + if (ret) { > > + dev_warn(domain->data->dev, > > + "Partial TLB flush timed out, falling back to full flush\n"); > > + mtk_iommu_tlb_flush_all(cookie); > > + } > > + writel_relaxed(0, base + REG_MMU_CPE_DONE); > > Do you still need this writeback in the ret==0 case when you've already > read CPE_DONE as 0, or should this be inside the condition? (in which > case you could also use an early return to lose the indent) Yes. I still need this writeback in the ret==0 case. REG_MMU_CPE_DONE is the state of CPE. It's 1 while the non-secure range invalidation is done. Write 1'b0 is for the purpose of clearing the current status, then we could check the next status again. So "write 1" is also needed in ret==0 case. so I will keep it and add a comment for more readable here. writel_relaxed(0, base + REG_MMU_CPE_DONE);/* Clear the CPE state */ > > > +} > [...] > > +static int mtk_iommu_hw_init(const struct mtk_iommu_domain *mtkdom) > > +{ > > + struct mtk_iommu_data *data = mtkdom->data; > > + void __iomem *base = data->base; > > + u32 regval; > > + int ret; > > + > > + ret = clk_prepare_enable(data->bclk); > > + if (ret) { > > + dev_err(data->dev, "Failed to enable iommu clk(%d)\n", ret); > > + return ret; > > + } > > I'm not sure about the asymmetry here; the clock gets enabled when > attaching clients to a domain, but not disabled until the IOMMU itself > is torn down in mtk_iommu_remove() (i.e. never). It seems like either > the clock should be enabled in mtk_iommu_probe(), or disabled in domain > detach. From your comment, I realize that some places here is not asymmetry. I will move this mtk_iommu_hw_init into mtk_iommu_probe. > > > + writel_relaxed(mtkdom->cfg.arm_short_cfg.ttbr[0], > > + base + REG_MMU_PT_BASE_ADDR); > > + > > + regval = F_MMU_PREFETCH_RT_REPLACE_MOD | > > + F_MMU_TF_PROTECT_SEL(2) | > > + F_COHERENCE_EN; > > + writel_relaxed(regval, 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, 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, base + REG_MMU_INT_MAIN_CONTROL); > > + > > + regval = ALIGN(data->protect_base, MTK_PROTECT_PA_ALIGN); > > + regval = F_MMU_IVRP_PA_SET(regval); > > From the look of it, it might not hurt to just fold the ALIGN() into > the F_MMU_IVRP_PA_SET() macro itself. If the ALIGN is moved into the macro, that line will be over 80 chars. so I seperate them. In the next version I will align data->protect_base in probe, then the code here will be more simply. and it also could be used in mtk_iommu_resume. > > > + writel_relaxed(regval, base + REG_MMU_IVRP_PADDR); > > + > > + writel_relaxed(0, base + REG_MMU_DCM_DIS); > > + writel_relaxed(0, base + REG_MMU_STANDARD_AXI_MODE); > > + > > + if (devm_request_irq(data->dev, data->irq, mtk_iommu_isr, 0, > > + dev_name(data->dev), (void *)mtkdom)) { > > + writel_relaxed(0, base + REG_MMU_PT_BASE_ADDR); > > + clk_disable_unprepare(data->bclk); > > + dev_err(data->dev, "Failed @ IRQ-%d Request\n", data->irq); > > + return -ENODEV; > > + } > > Maybe balance this with a devm_free_irq() in mtk_iommu_domain_free()? > (otherwise it's hanging around forever since the platform bus never > seems to get destroyed) I will move the mtk_iommu_hw_init into mtk_iommu_probe, and add devm_free_irq into mtk_iommu_remove. (I cann't add devm_free_irq in mtk_iommu_domain_free and detach_device) > > > + return 0; > > +} > > + > > +static int mtk_iommu_config(struct mtk_iommu_domain *mtkdom > > + struct device *dev, bool enable) > > +{ > > + struct mtk_iommu_data *data = mtkdom->data; > > + struct mtk_iommu_client_priv *head, *cur, *next; > > + > > + head = dev->archdata.iommu; > > + list_for_each_entry_safe(cur, next, &head->client, client) { > > + if (cur->larbid >= data->larb_nr) { > > + dev_err(data->dev, "Invalid larb:%d\n", cur->larbid); > > + return -EINVAL; > > + } > > + > > + mtk_smi_config_port(data->larbdev[cur->larbid], > > + cur->portid, enable); > > + if (!enable) { > > + list_del(&cur->client); > > + kfree(cur); > > + } > > This list wasn't created by attach_device(), so it doesn't look right > that detach_device() should cause it to be freed - I think this teardown > belongs in mtk_iommu_remove_device(), as the counterpoint to the > of_xlate/add_device operation. It is also asymmetry here. I will move kfree into mtk_iommu_remove_device. > > > + } > > + > > + if (!enable) { > > + kfree(head); > > + dev->archdata.iommu = NULL; > > Ditto. > > > + } > > + return 0; > > +} > [...] > > +static int mtk_iommu_attach_device(struct iommu_domain *domain, > > + struct device *dev) > > +{ > > + struct mtk_iommu_domain *priv = to_mtk_domain(domain), *m4udom; > > + struct iommu_group *group; > > + struct mtk_iommu_client_priv *clientpriv; > > + struct device *m4udev; > > + int ret; > > + > > + clientpriv = dev->archdata.iommu; > > + if (!clientpriv) > > + return -ENODEV; > > + m4udev = clientpriv->m4udev; > > + > > + /* > > + * There is a domain for each a iommu device in normal case. > > + * But MTK only has one iommu domain called the m4u domain which all > > + * the multimedia HW share. Here we reserve one as the m4u domain and > > + * free the others. > > + * > > + * And the attach_device that from __iommu_setup_dma_ops > > + * will be called earlier than probe. > > + */ > > + m4udom = dev_get_drvdata(m4udev); > > + if (!m4udom) > > + dev_set_drvdata(m4udev, priv); > > + else if (m4udom != priv) > > + iommu_domain_free(domain); > > With the client devices in a single group, then I realise we shouldn't > actually need any special handling of domains at all - we can freely > create multiple domains, and since the group can only be attached to one > at a time, all we do is point the hardware at the relevant page table on > attach, and reset it on detach. That should make life somewhat easier, > and means we no longer have to subvert the IOMMU API like this. "we can freely create multiple domains", Do we need to free the unnecessary domain here? This function also is a little complex after changed to a single group. see below. > > > + group = iommu_group_get(dev); > > + if (!group) > > Either way you shouldn't need this - you've already bailed out if this > isn't one of your client devices (via the dev->archdata.iommu check), > and if it is, then it already has a group by virtue of > mtk_iommu_add_device()... I think I can not use "dev->archdata.iommu" to break here. Like the comment "the attach_device that from __iommu_setup_dma_ops will be called earlier than probe." If I use dev->archdata.iommu, the code will also go down. But at that time some data has not been initialization(dev_get_drvdata is null). So I use iommu_group_get to guarantee the sequence: The code could go down only after the mtk_iommu_probe. > > > + return 0; > > ...and regardless, indicating success without attaching anything to > anything looks very off. I have to return "0" here. I need the DMA help update dev->archdata.dma_ops into iommu_dma_ops. (If I don't return 0 here, the do_iommu_attach will never update archdata->dma_ops for the client device.) If I am wrong, please tell me. Thanks. > > > + iommu_group_put(group); > > + > > + /* Initial the m4u domain context which is from the add_device */ > > + ret = mtk_iommu_init_domain_context(priv); > > + if (ret) > > + return ret; > > + > > + return mtk_iommu_config(priv, dev, true); > > +} > [...] > > +static int mtk_iommu_add_device(struct device *dev) > > +{ > > + struct iommu_group *group; > > + struct mtk_iommu_client_priv *priv; > > + struct mtk_iommu_domain *m4udom; > > + struct iommu_domain *domain; > > + int ret; > > + > > + if (!dev->archdata.iommu) /* Not a iommu client device */ > > + return -ENODEV; > > + > > + group = iommu_group_get(dev); > > If this became just a case of looking up mtk_iommu_data->group in > archdata.iommu and adding this device to it, then everything else here > should be able to go away - the arch code will create a default domain > for the first device in the group, then sees each subsequent device > appear in that domain as you add them, so just sets their dma_ops > without any further interference (I have tested multi-device groups!) Do you mean this function "iommu_group_get_for_dev" which will create a default domain? I also notice that Joerg's "iommu: Make core iommu-groups code more generic" patchset has a device_group callback, then I could return the same iommu group easily. So I add this patchset and test, then the code flow is changed greatly. see below. > > > + if (!group) { > > + group = iommu_group_alloc(); > > + if (IS_ERR(group)) { > > + dev_err(dev, "Failed to allocate IOMMU group\n"); > > + return PTR_ERR(group); > > + } > > + } > > (although you might still need the lazy group allocation here if > mtk_iommu_probe() turns out to run too early to do it). > > > + ret = iommu_group_add_device(group, dev); > > + if (ret) { > > + dev_err(dev, "Failed to add IOMMU group\n"); > > + goto err_group_put; > > + } > > + > > + domain = iommu_get_domain_for_dev(dev); > > + if (!domain) { > > + /* > > + * Get the m4u iommu domain from the m4u device. > > + * Attach all the client devices into the m4u domain. > > + */ > > + priv = dev->archdata.iommu; > > + m4udom = dev_get_drvdata(priv->m4udev); > > + ret = iommu_attach_group(&m4udom->domain, group); > > + if (ret) > > + dev_err(dev, "Failed to attach IOMMU group\n"); > > + } > > + > > +err_group_put: > > + iommu_group_put(group); > > + return ret; > > +} > [...] > > +static int mtk_iommu_init_fn(struct device_node *np) > > +{ > > + struct platform_device *pdev; > > + > > + pdev = of_platform_device_create(np, NULL, platform_bus_type.dev_root); > > Hmm, is it OK that the driver isn't yet registered at this point? If you > can guarantee that none of the client devices will also be registering > their drivers at subsys_initcall level, then I guess it works out > reasonably safe in practice, but it still smells a bit racy. Do you means that we could delete of_platform_device_create here if I can guarantee none of the client devices is registered at subsys_initcall level? I think all the iommu client devices should be called after our iommu device, but it will be more safe if there is of_platform_device_create here. sorry, I may misunderstand here. > > > + if (IS_ERR(pdev)) > > + return PTR_ERR(pdev); > > + > > + of_iommu_set_ops(np, &mtk_iommu_ops); > > + > > + return 0; > > +} > > + > > +IOMMU_OF_DECLARE(mtkm4u, "mediatek,mt8173-m4u", mtk_iommu_init_fn); > > + > > +static int mtk_iommu_probe(struct platform_device *pdev) > > +{ > > + struct mtk_iommu_data *data; > > + struct device *dev = &pdev->dev; > > + struct mtk_iommu_domain *m4udom; > > + void __iomem *protect; > > + int ret; > > + > > + data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL); > > + if (!data) > > + return -ENOMEM; > > + data->dev = dev; > > + > > + /* Protect memory. HW will access here while translation fault.*/ > > + protect = devm_kzalloc(dev, MTK_PROTECT_PA_ALIGN * 2, GFP_KERNEL); > > + if (!protect) > > + return -ENOMEM; > > + data->protect_base = virt_to_phys(protect); > > + > > + ret = mtk_iommu_parse_dt(pdev, data); > > + if (ret) > > + return ret; > > Hopefully you could allocate your group here and avoid the extra > complication in add_device, but it might be problematic if the early > device creation means this gets called before sysfs is fully up and running. If I use Joerg's patch, then we don't need allocate the group here. > > > + m4udom = dev_get_drvdata(dev); > > + if (m4udom) > > + m4udom->data = data; > > + > > + return 0; > > +} > [...] > > +static int mtk_iommu_resume(struct device *dev) > > +{ > > + struct mtk_iommu_domain *mtkdom = dev_get_drvdata(dev); > > + struct mtk_iommu_suspend_reg *reg; > > + void __iomem *base; > > + > > + if (!mtkdom) > > + return 0; > > + > > + reg = &mtkdom->data->reg; > > + base = mtkdom->data->base; > > + writel_relaxed(mtkdom->cfg.arm_short_cfg.ttbr[0], > > + base + REG_MMU_PT_BASE_ADDR); > > + writel_relaxed(reg->standard_axi_mode, > > + base + REG_MMU_STANDARD_AXI_MODE); > > + writel_relaxed(reg->dcm_dis, base + REG_MMU_DCM_DIS); > > + writel_relaxed(reg->ctrl_reg, base + REG_MMU_CTRL_REG); > > + writel_relaxed(reg->ivrp_paddr, base + REG_MMU_IVRP_PADDR); > > On closer inspection, it looks pretty cheap to recalculate this one from > data->protect_base, so perhaps that could be one less thing to save. Yes, It's OK. > > > + writel_relaxed(reg->int_control0, base + REG_MMU_INT_CONTROL0); > > + writel_relaxed(reg->int_main_control, base + REG_MMU_INT_MAIN_CONTROL); > > + return 0; > > +} > > Robin. > After add Joerg's patchset[1], I test locally and it looks ok. I copy most of the code here for your confirm. If there is some place I don't understand your comment exactly, please help tell me. (I will sent it as the next version after the Short-desc is reviewed.) [1]: http://lists.linuxfoundation.org/pipermail/iommu/2015-October/014764.html //=========================== struct mtk_iommu_domain { struct imu_pgd_t *pgd; spinlock_t pgtlock; /* lock for page table */ struct io_pgtable_cfg cfg; struct io_pgtable_ops *iop; struct iommu_domain domain; }; struct mtk_iommu_data { void __iomem *base; int irq; struct device *dev; struct device *larbdev[MTK_IOMMU_LARB_MAX_NR]; struct clk *bclk; phys_addr_t protect_base; /* protect memory base */ int larb_nr;/* local arbiter number */ struct mtk_iommu_suspend_reg reg; struct mtk_iommu_domain *m4udom; struct iommu_group *m4ugroup; }; static void mtk_iommu_tlb_flush_all(void *cookie) { struct mtk_iommu_data *data = cookie; void __iomem *base = data->base; writel_relaxed(F_INVLD_EN1 | F_INVLD_EN0, base + REG_MMU_INV_SEL); writel_relaxed(F_ALL_INVLD, base + REG_MMU_INVALIDATE); wmb();/* Make sure tlb flush all done */ } static void mtk_iommu_tlb_add_flush(unsigned long iova, size_t size, bool leaf, void *cookie) { struct mtk_iommu_data *data = cookie; void __iomem *base = data->base; writel_relaxed(F_INVLD_EN1 | F_INVLD_EN0, base + REG_MMU_INV_SEL); writel_relaxed(iova, base + REG_MMU_INVLD_START_A); writel_relaxed(iova + size - 1, base + REG_MMU_INVLD_END_A); writel_relaxed(F_MMU_INV_RANGE, base + REG_MMU_INVALIDATE); } static void mtk_iommu_tlb_sync(void *cookie) { struct mtk_iommu_data *data = cookie; void __iomem *base = data->base; int ret; u32 tmp; ret = readl_poll_timeout_atomic(base + REG_MMU_CPE_DONE, tmp, tmp != 0, 10, 1000000); if (ret) { dev_warn(data->dev, "Partial TLB flush timed out, falling back to full flush\n"); mtk_iommu_tlb_flush_all(cookie); } writel_relaxed(0, base + REG_MMU_CPE_DONE); /* Clear the CPE status */ } static struct iommu_gather_ops mtk_iommu_gather_ops = { .tlb_flush_all = mtk_iommu_tlb_flush_all, .tlb_add_flush = mtk_iommu_tlb_add_flush, .tlb_sync = mtk_iommu_tlb_sync, }; static irqreturn_t mtk_iommu_isr(int irq, void *dev_id) { struct mtk_iommu_data *data = dev_id; struct mtk_iommu_domain *mtkdom = data->m4udom; u32 int_state, regval, fault_iova, fault_pa; unsigned int fault_larb, fault_port; bool layer, write; /* Read error info from registers */ int_state = readl_relaxed(data->base + REG_MMU_FAULT_ST1); fault_iova = readl_relaxed(data->base + REG_MMU_FAULT_VA); layer = fault_iova & F_MMU_FAULT_VA_LAYER_BIT; write = fault_iova & F_MMU_FAULT_VA_WRITE_BIT; fault_iova &= F_MMU_FAULT_VA_MSK; fault_pa = readl_relaxed(data->base + REG_MMU_INVLD_PA); regval = readl_relaxed(data->base + REG_MMU_INT_ID); fault_larb = F_MMU0_INT_ID_LARB_ID(regval); fault_port = F_MMU0_INT_ID_PORT_ID(regval); if (report_iommu_fault(&mtkdom->domain, data->dev, fault_iova, write ? IOMMU_FAULT_WRITE : IOMMU_FAULT_READ)) { dev_err_ratelimited( data->dev, "fault type=0x%x iova=0x%x pa=0x%x larb=%d port=%d layer=%d %s\n", int_state, fault_iova, fault_pa, fault_larb, fault_port, layer, write ? "write" : "read"); } /* Interrupt clear */ regval = readl_relaxed(data->base + REG_MMU_INT_CONTROL0); regval |= F_INT_CLR_BIT; writel_relaxed(regval, data->base + REG_MMU_INT_CONTROL0); mtk_iommu_tlb_flush_all(data); return IRQ_HANDLED; } static int mtk_iommu_parse_dt(struct platform_device *pdev, struct mtk_iommu_data *data) { [...] } static int mtk_iommu_hw_init(const struct mtk_iommu_data *data) { void __iomem *base = data->base; 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; writel_relaxed(regval, 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, 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, base + REG_MMU_INT_MAIN_CONTROL); regval = F_MMU_IVRP_PA_SET(data->protect_base); writel_relaxed(regval, base + REG_MMU_IVRP_PADDR); writel_relaxed(0, base + REG_MMU_DCM_DIS); writel_relaxed(0, 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, 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; } static int mtk_iommu_config(struct mtk_iommu_data *data, struct device *dev, bool enable) { struct mtk_iommu_client_priv *head, *cur, *next; int ret; head = dev->archdata.iommu; list_for_each_entry_safe(cur, next, &head->client, client) { if (cur->larbid >= data->larb_nr) { dev_err(data->dev, "Invalid larb: %d\n", cur->larbid); return -EINVAL; } ret = mtk_smi_config_port(data->larbdev[cur->larbid], cur->portid, enable); if (ret) return ret; } return 0; } static int mtk_iommu_init_domain_context(struct mtk_iommu_data *data) { struct mtk_iommu_domain *dom = data->m4udom; if (dom->iop) return 0; spin_lock_init(&dom->pgtlock); dom->cfg.quirks = IO_PGTABLE_QUIRK_ARM_NS | IO_PGTABLE_QUIRK_NO_PERMS | IO_PGTABLE_QUIRK_TLBI_ON_MAP | IO_PGTABLE_QUIRK_SHORT_SUPERSECTION; dom->cfg.pgsize_bitmap = mtk_iommu_ops.pgsize_bitmap, dom->cfg.ias = 32; dom->cfg.oas = 32; dom->cfg.tlb = &mtk_iommu_gather_ops; dom->cfg.iommu_dev = data->dev; dom->iop = alloc_io_pgtable_ops(ARM_SHORT_DESC, &dom->cfg, data); if (!dom->iop) { dev_err(data->dev, "Failed to alloc io pgtable\n"); return -EINVAL; } /* Update our support page sizes bitmap */ mtk_iommu_ops.pgsize_bitmap = dom->cfg.pgsize_bitmap; /* Update the pagetable base address */ writel_relaxed(data->m4udom->cfg.arm_short_cfg.ttbr[0], data->base + REG_MMU_PT_BASE_ADDR); return 0; } static struct iommu_domain *mtk_iommu_domain_alloc(unsigned type) { struct mtk_iommu_domain *priv; if (type != IOMMU_DOMAIN_UNMANAGED && type != IOMMU_DOMAIN_DMA) return NULL; priv = kzalloc(sizeof(*priv), GFP_KERNEL); if (!priv) return NULL; if (type == IOMMU_DOMAIN_DMA && iommu_get_dma_cookie(&priv->domain)) { kfree(priv); return NULL; } priv->domain.geometry.aperture_start = 0; priv->domain.geometry.aperture_end = DMA_BIT_MASK(32); priv->domain.geometry.force_aperture = true; return &priv->domain; } static void mtk_iommu_domain_free(struct iommu_domain *domain) { if (domain->type == IOMMU_DOMAIN_DMA) iommu_put_dma_cookie(domain); kfree(to_mtk_domain(domain)); } static int mtk_iommu_attach_device(struct iommu_domain *domain, struct device *dev) { struct mtk_iommu_domain *dom = to_mtk_domain(domain); struct iommu_group *group; struct mtk_iommu_client_priv *priv = dev->archdata.iommu; struct mtk_iommu_data *m4udata; int ret; if (!priv) return -ENODEV; group = iommu_group_get(dev); if (!group) { /* __iommu_setup_dma_ops will create a domain for each a device * defaultly, But MTK only has only one iommu domain called the * m4u domain which all the multimedia HW share. * We don't need its default domain here. */ iommu_domain_free(domain); return 0; } iommu_group_put(group); /* * The iommu core will create a default domain for each a iommu group. * This default domain is used for the m4u domain here. */ m4udata = dev_get_drvdata(priv->m4udev); if (!m4udata->m4udom) { m4udata->m4udom = dom; ret = iommu_dma_init_domain(domain, 0, DMA_BIT_MASK(32)); <<<=== iommu_group_get_for_dev don't help initialize the domain, I have to initialize it here. if (ret) return ret; } /* * All the client devices are in the same group, they also are in the * same domain. confirm it here. */ WARN_ON(dom != m4udata->m4udom); ret = mtk_iommu_init_domain_context(m4udata); if (ret) return ret; return mtk_iommu_config(m4udata, dev, true); } static void mtk_iommu_detach_device(struct iommu_domain *domain, struct device *dev) { struct mtk_iommu_client_priv *priv = dev->archdata.iommu; struct mtk_iommu_data *m4udata; struct iommu_group *group; if (!priv) return; group = iommu_group_get(dev); if (!group) return; iommu_group_put(group); m4udata = dev_get_drvdata(priv->m4udev); mtk_iommu_config(m4udata, dev, false); } static int mtk_iommu_map(struct iommu_domain *domain, unsigned long iova, phys_addr_t paddr, size_t size, int prot) { struct mtk_iommu_domain *dom = to_mtk_domain(domain); unsigned long flags; int ret; spin_lock_irqsave(&dom->pgtlock, flags); ret = dom->iop->map(dom->iop, iova, paddr, size, prot); spin_unlock_irqrestore(&dom->pgtlock, flags); return ret; } static size_t mtk_iommu_unmap(struct iommu_domain *domain, unsigned long iova, size_t size) { struct mtk_iommu_domain *dom = to_mtk_domain(domain); unsigned long flags; size_t unmapsize; spin_lock_irqsave(&dom->pgtlock, flags); unmapsize = dom->iop->unmap(dom->iop, iova, size); spin_unlock_irqrestore(&dom->pgtlock, flags); return unmapsize; } static phys_addr_t mtk_iommu_iova_to_phys(struct iommu_domain *domain, dma_addr_t iova) { struct mtk_iommu_domain *dom = to_mtk_domain(domain); unsigned long flags; phys_addr_t pa; spin_lock_irqsave(&dom->pgtlock, flags); pa = dom->iop->iova_to_phys(dom->iop, iova); spin_unlock_irqrestore(&dom->pgtlock, flags); return pa; } static int mtk_iommu_add_device(struct device *dev) { struct iommu_group *group; if (!dev->archdata.iommu) /* Not a iommu client device */ return -ENODEV; group = iommu_group_get_for_dev(dev); if (IS_ERR(group)) return PTR_ERR(group); iommu_group_put(group); return 0; } static void mtk_iommu_remove_device(struct device *dev) { struct mtk_iommu_client_priv *head, *cur, *next; head = dev->archdata.iommu; if (!head) return; list_for_each_entry_safe(cur, next, &head->client, client) { list_del(&cur->client); kfree(cur); } kfree(head); dev->archdata.iommu = NULL; iommu_group_remove_device(dev); } static struct iommu_group *mtk_iommu_device_group(struct device *dev) { struct mtk_iommu_data *m4udata; struct mtk_iommu_client_priv *priv; priv = dev->archdata.iommu; if (!priv) return ERR_PTR(-ENODEV); m4udata = dev_get_drvdata(priv->m4udev); /* All the client devices are in the same m4u iommu-group */ if (!m4udata->m4ugroup) { m4udata->m4ugroup = iommu_group_alloc(); if (IS_ERR(m4udata->m4ugroup)) dev_err(dev, "Failed to allocate M4U IOMMU group\n"); } return m4udata->m4ugroup; } static int mtk_iommu_of_xlate(struct device *dev, struct of_phandle_args *args) { [...] } static struct iommu_ops mtk_iommu_ops = { .domain_alloc = mtk_iommu_domain_alloc, .domain_free = mtk_iommu_domain_free, .attach_dev = mtk_iommu_attach_device, .detach_dev = mtk_iommu_detach_device, .map = mtk_iommu_map, .unmap = mtk_iommu_unmap, .map_sg = default_iommu_map_sg, .iova_to_phys = mtk_iommu_iova_to_phys, .add_device = mtk_iommu_add_device, .remove_device = mtk_iommu_remove_device, .device_group = mtk_iommu_device_group, .of_xlate = mtk_iommu_of_xlate, .pgsize_bitmap = SZ_4K | SZ_64K | SZ_1M | SZ_16M, }; static const struct of_device_id mtk_iommu_of_ids[] = { { .compatible = "mediatek,mt8173-m4u", }, {} }; static int mtk_iommu_init_fn(struct device_node *np) { struct platform_device *pdev; pdev = of_platform_device_create(np, NULL, platform_bus_type.dev_root); if (IS_ERR(pdev)) return PTR_ERR(pdev); of_iommu_set_ops(np, &mtk_iommu_ops); return 0; } IOMMU_OF_DECLARE(mtkm4u, "mediatek,mt8173-m4u", mtk_iommu_init_fn); static int mtk_iommu_probe(struct platform_device *pdev) { struct mtk_iommu_data *data; struct device *dev = &pdev->dev; void __iomem *protect; int ret; data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL); if (!data) return -ENOMEM; data->dev = dev; /* Protect memory. HW will access here while translation fault.*/ protect = devm_kzalloc(dev, MTK_PROTECT_PA_ALIGN * 2, GFP_KERNEL); if (!protect) return -ENOMEM; data->protect_base = ALIGN(virt_to_phys(protect), MTK_PROTECT_PA_ALIGN); ret = mtk_iommu_parse_dt(pdev, data); if (ret) return ret; ret = mtk_iommu_hw_init(data); if (ret) return ret; dev_set_drvdata(dev, data); return 0; } static int mtk_iommu_remove(struct platform_device *pdev) { struct mtk_iommu_data *data = dev_get_drvdata(&pdev->dev); free_io_pgtable_ops(data->m4udom->iop); /* Destroy domain context */ <<<===== the free domain-context is also asymmetric too, but I can not move it into detach_device, the detach_device may be called the client device. the domain cann't be freed by a client device. clk_disable_unprepare(data->bclk); devm_free_irq(&pdev->dev, data->irq, data); return 0; } //===========================
diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig index a7920fb..b964364 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig @@ -387,4 +387,19 @@ config ARM_SMMU_V3 Say Y here if your system includes an IOMMU device implementing the ARM SMMUv3 architecture. +config MTK_IOMMU + bool "MTK IOMMU Support" + depends on ARCH_MEDIATEK || COMPILE_TEST + select IOMMU_API + select IOMMU_DMA + select IOMMU_IO_PGTABLE_SHORT + select MEMORY + select MTK_SMI + help + Support for the M4U on certain Mediatek SOCs. M4U is MultiMedia + Memory Management Unit. This option enables remapping of DMA memory + accesses for the multimedia subsystem. + + If unsure, say N here. + endif # IOMMU_SUPPORT diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile index 06df3e6..f4f2f2c 100644 --- a/drivers/iommu/Makefile +++ b/drivers/iommu/Makefile @@ -21,6 +21,7 @@ obj-$(CONFIG_ROCKCHIP_IOMMU) += rockchip-iommu.o obj-$(CONFIG_TEGRA_IOMMU_GART) += tegra-gart.o obj-$(CONFIG_TEGRA_IOMMU_SMMU) += tegra-smmu.o obj-$(CONFIG_EXYNOS_IOMMU) += exynos-iommu.o +obj-$(CONFIG_MTK_IOMMU) += mtk_iommu.o obj-$(CONFIG_SHMOBILE_IOMMU) += shmobile-iommu.o obj-$(CONFIG_SHMOBILE_IPMMU) += shmobile-ipmmu.o obj-$(CONFIG_FSL_PAMU) += fsl_pamu.o fsl_pamu_domain.o diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c new file mode 100644 index 0000000..39839f7 --- /dev/null +++ b/drivers/iommu/mtk_iommu.c @@ -0,0 +1,767 @@ +/* + * Copyright (c) 2014-2015 MediaTek Inc. + * Author: Yong Wu <yong.wu@mediatek.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ +#include <linux/io.h> +#include <linux/interrupt.h> +#include <linux/platform_device.h> +#include <linux/module.h> +#include <linux/iommu.h> +#include <linux/dma-iommu.h> +#include <linux/of_iommu.h> +#include <linux/of_address.h> +#include <linux/of_irq.h> +#include <linux/of_platform.h> +#include <linux/list.h> +#include <linux/clk.h> +#include <linux/iopoll.h> +#include <soc/mediatek/smi.h> +#include "io-pgtable.h" + +#define REG_MMU_PT_BASE_ADDR 0x000 + +#define REG_MMU_INVALIDATE 0x020 +#define F_ALL_INVLD 0x2 +#define F_MMU_INV_RANGE 0x1 + +#define REG_MMU_INVLD_START_A 0x024 +#define REG_MMU_INVLD_END_A 0x028 + +#define REG_MMU_INV_SEL 0x038 +#define F_INVLD_EN0 BIT(0) +#define F_INVLD_EN1 BIT(1) + +#define REG_MMU_STANDARD_AXI_MODE 0x048 +#define REG_MMU_DCM_DIS 0x050 + +#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) + +#define REG_MMU_IVRP_PADDR 0x114 +#define F_MMU_IVRP_PA_SET(pa) ((pa) >> 1) + +#define REG_MMU_INT_CONTROL0 0x120 +#define F_L2_MULIT_HIT_EN BIT(0) +#define F_TABLE_WALK_FAULT_INT_EN BIT(1) +#define F_PREETCH_FIFO_OVERFLOW_INT_EN BIT(2) +#define F_MISS_FIFO_OVERFLOW_INT_EN BIT(3) +#define F_PREFETCH_FIFO_ERR_INT_EN BIT(5) +#define F_MISS_FIFO_ERR_INT_EN BIT(6) +#define F_INT_L2_CLR_BIT BIT(12) + +#define REG_MMU_INT_MAIN_CONTROL 0x124 +#define F_INT_TRANSLATION_FAULT BIT(0) +#define F_INT_MAIN_MULTI_HIT_FAULT BIT(1) +#define F_INT_INVALID_PA_FAULT BIT(2) +#define F_INT_ENTRY_REPLACEMENT_FAULT BIT(3) +#define F_INT_TLB_MISS_FAULT BIT(4) +#define F_INT_MISS_TRANSATION_FIFO_FAULT BIT(5) +#define F_INT_PRETETCH_TRANSATION_FIFO_FAULT BIT(6) + +#define REG_MMU_CPE_DONE 0x12C + +#define REG_MMU_FAULT_ST1 0x134 + +#define REG_MMU_FAULT_VA 0x13c +#define F_MMU_FAULT_VA_MSK 0xfffff000 +#define F_MMU_FAULT_VA_WRITE_BIT BIT(1) +#define F_MMU_FAULT_VA_LAYER_BIT BIT(0) + +#define REG_MMU_INVLD_PA 0x140 +#define REG_MMU_INT_ID 0x150 +#define F_MMU0_INT_ID_LARB_ID(a) (((a) >> 7) & 0x7) +#define F_MMU0_INT_ID_PORT_ID(a) (((a) >> 2) & 0x1f) + +#define MTK_PROTECT_PA_ALIGN 128 +#define MTK_IOMMU_LARB_MAX_NR 8 +#define MTK_IOMMU_REG_NR 10 + +struct mtk_iommu_suspend_reg { + u32 standard_axi_mode; + u32 dcm_dis; + u32 ctrl_reg; + u32 ivrp_paddr; + u32 int_control0; + u32 int_main_control; +}; + +struct mtk_iommu_data { + void __iomem *base; + int irq; + struct device *dev; + struct device *larbdev[MTK_IOMMU_LARB_MAX_NR]; + struct clk *bclk; + phys_addr_t protect_base; /* protect memory base */ + int larb_nr;/* local arbiter number */ + struct mtk_iommu_suspend_reg reg; +}; + +struct mtk_iommu_domain { + struct imu_pgd_t *pgd; + spinlock_t pgtlock; /* lock for page table */ + + struct io_pgtable_cfg cfg; + struct io_pgtable_ops *iop; + + struct mtk_iommu_data *data; + struct iommu_domain domain; +}; + +struct mtk_iommu_client_priv { + struct list_head client; + unsigned int larbid; + unsigned int portid; + struct device *m4udev; +}; + +static struct iommu_ops mtk_iommu_ops; + +static struct mtk_iommu_domain *to_mtk_domain(struct iommu_domain *dom) +{ + return container_of(dom, struct mtk_iommu_domain, domain); +} + +static void mtk_iommu_clear_intr(const struct mtk_iommu_data *data) +{ + u32 val; + + val = readl_relaxed(data->base + REG_MMU_INT_CONTROL0); + val |= F_INT_L2_CLR_BIT; + writel_relaxed(val, data->base + REG_MMU_INT_CONTROL0); +} + +static void mtk_iommu_tlb_flush_all(void *cookie) +{ + struct mtk_iommu_domain *domain = cookie; + void __iomem *base; + + base = domain->data->base; + writel_relaxed(F_INVLD_EN1 | F_INVLD_EN0, base + REG_MMU_INV_SEL); + writel_relaxed(F_ALL_INVLD, base + REG_MMU_INVALIDATE); + mb();/* Make sure flush all done */ +} + +static void mtk_iommu_tlb_add_flush(unsigned long iova, size_t size, + bool leaf, void *cookie) +{ + struct mtk_iommu_domain *domain = cookie; + void __iomem *base = domain->data->base; + unsigned int iova_start = iova, iova_end = iova + size - 1; + + writel_relaxed(F_INVLD_EN1 | F_INVLD_EN0, base + REG_MMU_INV_SEL); + + writel_relaxed(iova_start, base + REG_MMU_INVLD_START_A); + writel_relaxed(iova_end, base + REG_MMU_INVLD_END_A); + writel_relaxed(F_MMU_INV_RANGE, base + REG_MMU_INVALIDATE); +} + +static void mtk_iommu_tlb_sync(void *cookie) +{ + struct mtk_iommu_domain *domain = cookie; + void __iomem *base = domain->data->base; + int ret; + u32 tmp; + + ret = readl_poll_timeout_atomic(base + REG_MMU_CPE_DONE, tmp, + tmp != 0, 10, 1000000); + if (ret) { + dev_warn(domain->data->dev, + "Partial TLB flush timed out, falling back to full flush\n"); + mtk_iommu_tlb_flush_all(cookie); + } + writel_relaxed(0, base + REG_MMU_CPE_DONE); +} + +static struct iommu_gather_ops mtk_iommu_gather_ops = { + .tlb_flush_all = mtk_iommu_tlb_flush_all, + .tlb_add_flush = mtk_iommu_tlb_add_flush, + .tlb_sync = mtk_iommu_tlb_sync, +}; + +static irqreturn_t mtk_iommu_isr(int irq, void *dev_id) +{ + struct mtk_iommu_domain *mtkdom = dev_id; + struct mtk_iommu_data *data = mtkdom->data; + u32 int_state, regval, fault_iova, fault_pa; + unsigned int fault_larb, fault_port; + bool layer, write; + + int_state = readl_relaxed(data->base + REG_MMU_FAULT_ST1); + + /* Read error info */ + fault_iova = readl_relaxed(data->base + REG_MMU_FAULT_VA); + layer = fault_iova & F_MMU_FAULT_VA_LAYER_BIT; + write = fault_iova & F_MMU_FAULT_VA_WRITE_BIT; + fault_iova &= F_MMU_FAULT_VA_MSK; + fault_pa = readl_relaxed(data->base + REG_MMU_INVLD_PA); + regval = readl_relaxed(data->base + REG_MMU_INT_ID); + fault_larb = F_MMU0_INT_ID_LARB_ID(regval); + fault_port = F_MMU0_INT_ID_PORT_ID(regval); + + if (report_iommu_fault(&mtkdom->domain, data->dev, fault_iova, + write ? IOMMU_FAULT_WRITE : IOMMU_FAULT_READ)) { + dev_err_ratelimited( + data->dev, + "fault type=0x%x iova=0x%x pa=0x%x larb=%d port=%d layer=%d %s\n", + int_state, fault_iova, fault_pa, fault_larb, fault_port, + layer, write ? "write" : "read"); + } + + mtk_iommu_clear_intr(data); + mtk_iommu_tlb_flush_all(mtkdom); + + return IRQ_HANDLED; +} + +static int mtk_iommu_parse_dt(struct platform_device *pdev, + struct mtk_iommu_data *data) +{ + struct device *dev = &pdev->dev; + struct device_node *ofnode; + struct resource *res; + int i; + + ofnode = dev->of_node; + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + data->base = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(data->base)) + return PTR_ERR(data->base); + + data->irq = platform_get_irq(pdev, 0); + if (data->irq < 0) + return data->irq; + + data->bclk = devm_clk_get(dev, "bclk"); + if (IS_ERR(data->bclk)) + return PTR_ERR(data->bclk); + + data->larb_nr = of_count_phandle_with_args( + ofnode, "mediatek,larb", NULL); + if (data->larb_nr < 0) + return data->larb_nr; + + for (i = 0; i < data->larb_nr; i++) { + struct device_node *larbnode; + struct platform_device *plarbdev; + + larbnode = of_parse_phandle(ofnode, "mediatek,larb", i); + if (!larbnode) + return -EINVAL; + + plarbdev = of_find_device_by_node(larbnode); + of_node_put(larbnode); + if (!plarbdev) + return -EPROBE_DEFER; + data->larbdev[i] = &plarbdev->dev; + } + + return 0; +} + +static int mtk_iommu_hw_init(const struct mtk_iommu_domain *mtkdom) +{ + struct mtk_iommu_data *data = mtkdom->data; + void __iomem *base = data->base; + u32 regval; + int ret; + + ret = clk_prepare_enable(data->bclk); + if (ret) { + dev_err(data->dev, "Failed to enable iommu clk(%d)\n", ret); + return ret; + } + + writel_relaxed(mtkdom->cfg.arm_short_cfg.ttbr[0], + base + REG_MMU_PT_BASE_ADDR); + + regval = F_MMU_PREFETCH_RT_REPLACE_MOD | + F_MMU_TF_PROTECT_SEL(2) | + F_COHERENCE_EN; + writel_relaxed(regval, 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, 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, base + REG_MMU_INT_MAIN_CONTROL); + + regval = ALIGN(data->protect_base, MTK_PROTECT_PA_ALIGN); + regval = F_MMU_IVRP_PA_SET(regval); + writel_relaxed(regval, base + REG_MMU_IVRP_PADDR); + + writel_relaxed(0, base + REG_MMU_DCM_DIS); + writel_relaxed(0, base + REG_MMU_STANDARD_AXI_MODE); + + if (devm_request_irq(data->dev, data->irq, mtk_iommu_isr, 0, + dev_name(data->dev), (void *)mtkdom)) { + writel_relaxed(0, 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; +} + +static int mtk_iommu_config(struct mtk_iommu_domain *mtkdom, + struct device *dev, bool enable) +{ + struct mtk_iommu_data *data = mtkdom->data; + struct mtk_iommu_client_priv *head, *cur, *next; + + head = dev->archdata.iommu; + list_for_each_entry_safe(cur, next, &head->client, client) { + if (cur->larbid >= data->larb_nr) { + dev_err(data->dev, "Invalid larb:%d\n", cur->larbid); + return -EINVAL; + } + + mtk_smi_config_port(data->larbdev[cur->larbid], + cur->portid, enable); + if (!enable) { + list_del(&cur->client); + kfree(cur); + } + } + + if (!enable) { + kfree(head); + dev->archdata.iommu = NULL; + } + return 0; +} + +static int mtk_iommu_init_domain_context(struct mtk_iommu_domain *dom) +{ + int ret; + + if (dom->iop) + return 0; + + spin_lock_init(&dom->pgtlock); + dom->cfg.quirks = IO_PGTABLE_QUIRK_ARM_NS | + IO_PGTABLE_QUIRK_NO_PERMS | + IO_PGTABLE_QUIRK_TLBI_ON_MAP | + IO_PGTABLE_QUIRK_SHORT_SUPERSECTION; + dom->cfg.pgsize_bitmap = mtk_iommu_ops.pgsize_bitmap, + dom->cfg.ias = 32; + dom->cfg.oas = 32; + dom->cfg.tlb = &mtk_iommu_gather_ops; + dom->cfg.iommu_dev = dom->data->dev; + + dom->iop = alloc_io_pgtable_ops(ARM_SHORT_DESC, &dom->cfg, dom); + if (!dom->iop) { + dev_err(dom->data->dev, "Failed to alloc io pgtable\n"); + return -EINVAL; + } + + /* Update our support page sizes bitmap */ + mtk_iommu_ops.pgsize_bitmap = dom->cfg.pgsize_bitmap; + + ret = mtk_iommu_hw_init(dom); + if (ret) + free_io_pgtable_ops(dom->iop); + + return ret; +} + +static struct iommu_domain *mtk_iommu_domain_alloc(unsigned type) +{ + struct mtk_iommu_domain *priv; + + if (type != IOMMU_DOMAIN_UNMANAGED && type != IOMMU_DOMAIN_DMA) + return NULL; + + priv = kzalloc(sizeof(*priv), GFP_KERNEL); + if (!priv) + return NULL; + + if (type == IOMMU_DOMAIN_DMA && iommu_get_dma_cookie(&priv->domain)) { + kfree(priv); + return NULL; + } + + priv->domain.geometry.aperture_start = 0; + priv->domain.geometry.aperture_end = DMA_BIT_MASK(32); + priv->domain.geometry.force_aperture = true; + + return &priv->domain; +} + +static void mtk_iommu_domain_free(struct iommu_domain *domain) +{ + if (domain->type == IOMMU_DOMAIN_DMA) + iommu_put_dma_cookie(domain); + kfree(to_mtk_domain(domain)); +} + +static int mtk_iommu_attach_device(struct iommu_domain *domain, + struct device *dev) +{ + struct mtk_iommu_domain *priv = to_mtk_domain(domain), *m4udom; + struct iommu_group *group; + struct mtk_iommu_client_priv *clientpriv; + struct device *m4udev; + int ret; + + clientpriv = dev->archdata.iommu; + if (!clientpriv) + return -ENODEV; + m4udev = clientpriv->m4udev; + + /* + * There is a domain for each a iommu device in normal case. + * But MTK only has one iommu domain called the m4u domain which all + * the multimedia HW share. Here we reserve one as the m4u domain and + * free the others. + * + * And the attach_device that from __iommu_setup_dma_ops + * will be called earlier than probe. + */ + m4udom = dev_get_drvdata(m4udev); + if (!m4udom) + dev_set_drvdata(m4udev, priv); + else if (m4udom != priv) + iommu_domain_free(domain); + + group = iommu_group_get(dev); + if (!group) + return 0; + iommu_group_put(group); + + /* Initial the m4u domain context which is from the add_device */ + ret = mtk_iommu_init_domain_context(priv); + if (ret) + return ret; + + return mtk_iommu_config(priv, dev, true); +} + +static void mtk_iommu_detach_device(struct iommu_domain *domain, + struct device *dev) +{ + mtk_iommu_config(to_mtk_domain(domain), dev, false); +} + +static int mtk_iommu_map(struct iommu_domain *domain, unsigned long iova, + phys_addr_t paddr, size_t size, int prot) +{ + struct mtk_iommu_domain *priv = to_mtk_domain(domain); + unsigned long flags; + int ret; + + spin_lock_irqsave(&priv->pgtlock, flags); + ret = priv->iop->map(priv->iop, iova, paddr, size, prot); + spin_unlock_irqrestore(&priv->pgtlock, flags); + + return ret; +} + +static size_t mtk_iommu_unmap(struct iommu_domain *domain, + unsigned long iova, size_t size) +{ + struct mtk_iommu_domain *priv = to_mtk_domain(domain); + unsigned long flags; + size_t unmapsize; + + spin_lock_irqsave(&priv->pgtlock, flags); + unmapsize = priv->iop->unmap(priv->iop, iova, size); + spin_unlock_irqrestore(&priv->pgtlock, flags); + + return unmapsize; +} + +static phys_addr_t mtk_iommu_iova_to_phys(struct iommu_domain *domain, + dma_addr_t iova) +{ + struct mtk_iommu_domain *priv = to_mtk_domain(domain); + unsigned long flags; + phys_addr_t pa; + + spin_lock_irqsave(&priv->pgtlock, flags); + pa = priv->iop->iova_to_phys(priv->iop, iova); + spin_unlock_irqrestore(&priv->pgtlock, flags); + + return pa; +} + +static int mtk_iommu_add_device(struct device *dev) +{ + struct iommu_group *group; + struct mtk_iommu_client_priv *priv; + struct mtk_iommu_domain *m4udom; + struct iommu_domain *domain; + int ret; + + if (!dev->archdata.iommu) /* Not a iommu client device */ + return -ENODEV; + + group = iommu_group_get(dev); + if (!group) { + group = iommu_group_alloc(); + if (IS_ERR(group)) { + dev_err(dev, "Failed to allocate IOMMU group\n"); + return PTR_ERR(group); + } + } + + ret = iommu_group_add_device(group, dev); + if (ret) { + dev_err(dev, "Failed to add IOMMU group\n"); + goto err_group_put; + } + + domain = iommu_get_domain_for_dev(dev); + if (!domain) { + /* + * Get the m4u iommu domain from the m4u device. + * Attach all the client devices into the m4u domain. + */ + priv = dev->archdata.iommu; + m4udom = dev_get_drvdata(priv->m4udev); + ret = iommu_attach_group(&m4udom->domain, group); + if (ret) + dev_err(dev, "Failed to attach IOMMU group\n"); + } + +err_group_put: + iommu_group_put(group); + return ret; +} + +static void mtk_iommu_remove_device(struct device *dev) +{ + if (!dev->archdata.iommu) + return; + + iommu_group_remove_device(dev); +} + +static int mtk_iommu_of_xlate(struct device *dev, struct of_phandle_args *args) +{ + struct mtk_iommu_client_priv *head, *priv, *next; + struct platform_device *m4updev; + + if (args->args_count != 2) { + dev_err(dev, "invalid #iommu-cells(%d) property for IOMMU\n", + args->args_count); + return -EINVAL; + } + + if (!dev->archdata.iommu) { + /* Get the m4u device */ + m4updev = of_find_device_by_node(args->np); + of_node_put(args->np); + if (WARN_ON(!m4updev)) + return -EINVAL; + + head = kzalloc(sizeof(*head), GFP_KERNEL); + if (!head) + return -ENOMEM; + + dev->archdata.iommu = head; + INIT_LIST_HEAD(&head->client); + head->m4udev = &m4updev->dev; + } else { + head = dev->archdata.iommu; + } + + priv = kzalloc(sizeof(*priv), GFP_KERNEL); + if (!priv) + goto err_free_mem; + + priv->larbid = args->args[0]; + priv->portid = args->args[1]; + list_add_tail(&priv->client, &head->client); + + return 0; + +err_free_mem: + list_for_each_entry_safe(priv, next, &head->client, client) + kfree(priv); + kfree(head); + dev->archdata.iommu = NULL; + return -ENOMEM; +} + +static struct iommu_ops mtk_iommu_ops = { + .domain_alloc = mtk_iommu_domain_alloc, + .domain_free = mtk_iommu_domain_free, + .attach_dev = mtk_iommu_attach_device, + .detach_dev = mtk_iommu_detach_device, + .map = mtk_iommu_map, + .unmap = mtk_iommu_unmap, + .map_sg = default_iommu_map_sg, + .iova_to_phys = mtk_iommu_iova_to_phys, + .add_device = mtk_iommu_add_device, + .remove_device = mtk_iommu_remove_device, + .of_xlate = mtk_iommu_of_xlate, + .pgsize_bitmap = SZ_4K | SZ_64K | SZ_1M | SZ_16M, +}; + +static const struct of_device_id mtk_iommu_of_ids[] = { + { .compatible = "mediatek,mt8173-m4u", }, + {} +}; + +static int mtk_iommu_init_fn(struct device_node *np) +{ + struct platform_device *pdev; + + pdev = of_platform_device_create(np, NULL, platform_bus_type.dev_root); + if (IS_ERR(pdev)) + return PTR_ERR(pdev); + + of_iommu_set_ops(np, &mtk_iommu_ops); + + return 0; +} + +IOMMU_OF_DECLARE(mtkm4u, "mediatek,mt8173-m4u", mtk_iommu_init_fn); + +static int mtk_iommu_probe(struct platform_device *pdev) +{ + struct mtk_iommu_data *data; + struct device *dev = &pdev->dev; + struct mtk_iommu_domain *m4udom; + void __iomem *protect; + int ret; + + data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL); + if (!data) + return -ENOMEM; + data->dev = dev; + + /* Protect memory. HW will access here while translation fault.*/ + protect = devm_kzalloc(dev, MTK_PROTECT_PA_ALIGN * 2, GFP_KERNEL); + if (!protect) + return -ENOMEM; + data->protect_base = virt_to_phys(protect); + + ret = mtk_iommu_parse_dt(pdev, data); + if (ret) + return ret; + + m4udom = dev_get_drvdata(dev); + if (m4udom) + m4udom->data = data; + + return 0; +} + +static int mtk_iommu_remove(struct platform_device *pdev) +{ + struct mtk_iommu_domain *mtkdom = dev_get_drvdata(&pdev->dev); + + if (!mtkdom) + return 0; + + free_io_pgtable_ops(mtkdom->iop); /* Destroy domain context */ + clk_disable_unprepare(mtkdom->data->bclk); + return 0; +} + +static int mtk_iommu_suspend(struct device *dev) +{ + struct mtk_iommu_domain *mtkdom = dev_get_drvdata(dev); + struct mtk_iommu_suspend_reg *reg; + void __iomem *base; + + if (!mtkdom) + return 0; + + reg = &mtkdom->data->reg; + base = mtkdom->data->base; + reg->standard_axi_mode = readl_relaxed(base + + REG_MMU_STANDARD_AXI_MODE); + reg->dcm_dis = readl_relaxed(base + REG_MMU_DCM_DIS); + reg->ctrl_reg = readl_relaxed(base + REG_MMU_CTRL_REG); + reg->ivrp_paddr = readl_relaxed(base + REG_MMU_IVRP_PADDR); + reg->int_control0 = readl_relaxed(base + REG_MMU_INT_CONTROL0); + reg->int_main_control = readl_relaxed(base + REG_MMU_INT_MAIN_CONTROL); + return 0; +} + +static int mtk_iommu_resume(struct device *dev) +{ + struct mtk_iommu_domain *mtkdom = dev_get_drvdata(dev); + struct mtk_iommu_suspend_reg *reg; + void __iomem *base; + + if (!mtkdom) + return 0; + + reg = &mtkdom->data->reg; + base = mtkdom->data->base; + writel_relaxed(mtkdom->cfg.arm_short_cfg.ttbr[0], + base + REG_MMU_PT_BASE_ADDR); + writel_relaxed(reg->standard_axi_mode, + base + REG_MMU_STANDARD_AXI_MODE); + writel_relaxed(reg->dcm_dis, base + REG_MMU_DCM_DIS); + writel_relaxed(reg->ctrl_reg, base + REG_MMU_CTRL_REG); + writel_relaxed(reg->ivrp_paddr, base + REG_MMU_IVRP_PADDR); + writel_relaxed(reg->int_control0, base + REG_MMU_INT_CONTROL0); + writel_relaxed(reg->int_main_control, base + REG_MMU_INT_MAIN_CONTROL); + return 0; +} + +const struct dev_pm_ops mtk_iommu_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(mtk_iommu_suspend, mtk_iommu_resume) +}; + +static struct platform_driver mtk_iommu_driver = { + .probe = mtk_iommu_probe, + .remove = mtk_iommu_remove, + .driver = { + .name = "mtk-iommu", + .of_match_table = mtk_iommu_of_ids, + .pm = &mtk_iommu_pm_ops, + } +}; + +static int __init mtk_iommu_init(void) +{ + int ret; + + ret = platform_driver_register(&mtk_iommu_driver); + if (ret) { + pr_err("%s: Failed to register driver\n", __func__); + return ret; + } + + if (!iommu_present(&platform_bus_type)) + bus_set_iommu(&platform_bus_type, &mtk_iommu_ops); + + return 0; +} + +static void __exit mtk_iommu_exit(void) +{ + return platform_driver_unregister(&mtk_iommu_driver); +} + +subsys_initcall(mtk_iommu_init); +module_exit(mtk_iommu_exit);
This patch adds support for mediatek m4u (MultiMedia Memory Management Unit). Signed-off-by: Yong Wu <yong.wu@mediatek.com> --- drivers/iommu/Kconfig | 15 + drivers/iommu/Makefile | 1 + drivers/iommu/mtk_iommu.c | 767 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 783 insertions(+) create mode 100644 drivers/iommu/mtk_iommu.c