Message ID | 1453781562-23556-4-git-send-email-yong.wu@mediatek.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Tue, Jan 26, 2016 at 12:12 PM, Yong Wu <yong.wu@mediatek.com> wrote: > This patch add SMI(Smart Multimedia Interface) driver. This driver > is responsible to enable/disable iommu and control the power domain > and clocks of each local arbiter. > > Signed-off-by: Yong Wu <yong.wu@mediatek.com> > Tested-by: Philipp Zabel <p.zabel@pengutronix.de> Reviewed-by: Daniel Kurtz <djkurtz@chromium.org> Tested-by: Daniel Kurtz <djkurtz@chromium.org> Thanks!
On 26/01/16 05:12, Yong Wu wrote: > This patch add SMI(Smart Multimedia Interface) driver. This driver > is responsible to enable/disable iommu and control the power domain > and clocks of each local arbiter. > > Signed-off-by: Yong Wu <yong.wu@mediatek.com> > Tested-by: Philipp Zabel <p.zabel@pengutronix.de> > --- Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com> Joerg would you mind to take this through your branch? Thanks, Matthias
On Sun, Jan 31, 2016 at 12:00:41PM +0100, Matthias Brugger wrote: > > > On 26/01/16 05:12, Yong Wu wrote: > >This patch add SMI(Smart Multimedia Interface) driver. This driver > >is responsible to enable/disable iommu and control the power domain > >and clocks of each local arbiter. > > > >Signed-off-by: Yong Wu <yong.wu@mediatek.com> > >Tested-by: Philipp Zabel <p.zabel@pengutronix.de> > >--- > > Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com> > > Joerg would you mind to take this through your branch? Could you put it on a separate branch that I may also merge into the DRM driver pull request? regards Philipp
On Sun, Jan 31, 2016 at 12:00:41PM +0100, Matthias Brugger wrote: > > > On 26/01/16 05:12, Yong Wu wrote: > >This patch add SMI(Smart Multimedia Interface) driver. This driver > >is responsible to enable/disable iommu and control the power domain > >and clocks of each local arbiter. > > > >Signed-off-by: Yong Wu <yong.wu@mediatek.com> > >Tested-by: Philipp Zabel <p.zabel@pengutronix.de> > >--- > > Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com> > > Joerg would you mind to take this through your branch? Hmm, I somehow missed the patch-set, at least I can't find the v8 patches in my inbox. Yong, can you please re-send with all Acks and other tags added? Thanks, Joerg
Hi Joerg, On 16/02/16 14:11, Joerg Roedel wrote: > On Sun, Jan 31, 2016 at 12:00:41PM +0100, Matthias Brugger wrote: >> >> >> On 26/01/16 05:12, Yong Wu wrote: >>> This patch add SMI(Smart Multimedia Interface) driver. This driver >>> is responsible to enable/disable iommu and control the power domain >>> and clocks of each local arbiter. >>> >>> Signed-off-by: Yong Wu <yong.wu@mediatek.com> >>> Tested-by: Philipp Zabel <p.zabel@pengutronix.de> >>> --- >> >> Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com> >> >> Joerg would you mind to take this through your branch? > > Hmm, I somehow missed the patch-set, at least I can't find the v8 > patches in my inbox. > > Yong, can you please re-send with all Acks and other tags added? Just to note patch 4 of this series also depends on the v3 io-pgtable short-descriptor series posted separately[1] - is that on your radar already or would you like that resent as well? Robin. [1]:http://thread.gmane.org/gmane.linux.kernel.iommu/12007 > > > Thanks, > > Joerg > > _______________________________________________ > iommu mailing list > iommu@lists.linux-foundation.org > https://lists.linuxfoundation.org/mailman/listinfo/iommu >
On Tue, Feb 16, 2016 at 03:32:11PM +0000, Robin Murphy wrote: > Hi Joerg, > > On 16/02/16 14:11, Joerg Roedel wrote: > >On Sun, Jan 31, 2016 at 12:00:41PM +0100, Matthias Brugger wrote: > >> > >> > >>On 26/01/16 05:12, Yong Wu wrote: > >>>This patch add SMI(Smart Multimedia Interface) driver. This driver > >>>is responsible to enable/disable iommu and control the power domain > >>>and clocks of each local arbiter. > >>> > >>>Signed-off-by: Yong Wu <yong.wu@mediatek.com> > >>>Tested-by: Philipp Zabel <p.zabel@pengutronix.de> > >>>--- > >> > >>Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com> > >> > >>Joerg would you mind to take this through your branch? > > > >Hmm, I somehow missed the patch-set, at least I can't find the v8 > >patches in my inbox. > > > >Yong, can you please re-send with all Acks and other tags added? > > Just to note patch 4 of this series also depends on the v3 > io-pgtable short-descriptor series posted separately[1] - is that on > your radar already or would you like that resent as well? No, that was not on my radar, I somehow expected Will to handle this series :) So please resend that as well. Thanks, Joerg
On Tue, Feb 16, 2016 at 05:10:09PM +0100, Joerg Roedel wrote: > On Tue, Feb 16, 2016 at 03:32:11PM +0000, Robin Murphy wrote: > > On 16/02/16 14:11, Joerg Roedel wrote: > > >On Sun, Jan 31, 2016 at 12:00:41PM +0100, Matthias Brugger wrote: > > >>On 26/01/16 05:12, Yong Wu wrote: > > >>>This patch add SMI(Smart Multimedia Interface) driver. This driver > > >>>is responsible to enable/disable iommu and control the power domain > > >>>and clocks of each local arbiter. > > >>> > > >>>Signed-off-by: Yong Wu <yong.wu@mediatek.com> > > >>>Tested-by: Philipp Zabel <p.zabel@pengutronix.de> > > >>>--- > > >> > > >>Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com> > > >> > > >>Joerg would you mind to take this through your branch? > > > > > >Hmm, I somehow missed the patch-set, at least I can't find the v8 > > >patches in my inbox. > > > > > >Yong, can you please re-send with all Acks and other tags added? > > > > Just to note patch 4 of this series also depends on the v3 > > io-pgtable short-descriptor series posted separately[1] - is that on > > your radar already or would you like that resent as well? > > No, that was not on my radar, I somehow expected Will to handle this > series :) I'm more than happy to bake a branch containing all the page table stuff, but Yong's stuff depends on it so I'll work with whatever is easiest for you. Will
On Tue, Feb 16, 2016 at 04:20:00PM +0000, Will Deacon wrote: > I'm more than happy to bake a branch containing all the page table stuff, > but Yong's stuff depends on it so I'll work with whatever is easiest for > you. Okay, to the best is if you would collect all the page table patches and send me a pull-request. I pull that into my tree then and put Yong's stuff on-top. Joerg
On Tue, Feb 16, 2016 at 05:26:41PM +0100, Joerg Roedel wrote: > On Tue, Feb 16, 2016 at 04:20:00PM +0000, Will Deacon wrote: > > I'm more than happy to bake a branch containing all the page table stuff, > > but Yong's stuff depends on it so I'll work with whatever is easiest for > > you. > > Okay, to the best is if you would collect all the page table patches and > send me a pull-request. I pull that into my tree then and put Yong's > stuff on-top. Okey doke, I'll put something together this week. Cheers, Will
On Tue, 2016-02-16 at 15:11 +0100, Joerg Roedel wrote: > On Sun, Jan 31, 2016 at 12:00:41PM +0100, Matthias Brugger wrote: > > > > > > On 26/01/16 05:12, Yong Wu wrote: > > >This patch add SMI(Smart Multimedia Interface) driver. This driver > > >is responsible to enable/disable iommu and control the power domain > > >and clocks of each local arbiter. > > > > > >Signed-off-by: Yong Wu <yong.wu@mediatek.com> > > >Tested-by: Philipp Zabel <p.zabel@pengutronix.de> > > >--- > > > > Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com> > > > > Joerg would you mind to take this through your branch? > > Hmm, I somehow missed the patch-set, at least I can't find the v8 > patches in my inbox. > > Yong, can you please re-send with all Acks and other tags added? Hi Joerg, I have re-sent v9[1] which has added all the tags yesterday. Could you find them in your inbox? If not again, please tell me. Thanks. [1]:http://lists.linuxfoundation.org/pipermail/iommu/2016-February/015713.html > > > Thanks, > > Joerg >
Hi Joerg, Am Dienstag, den 16.02.2016, 17:26 +0100 schrieb Joerg Roedel: > On Tue, Feb 16, 2016 at 04:20:00PM +0000, Will Deacon wrote: > > I'm more than happy to bake a branch containing all the page table stuff, > > but Yong's stuff depends on it so I'll work with whatever is easiest for > > you. > > Okay, to the best is if you would collect all the page table patches and > send me a pull-request. I pull that into my tree then and put Yong's > stuff on-top. could you provide a branch that I may then pull in, stack the mediatek-drm driver patches (that depend on the SMI driver) on top and have them merged via drm-next? regards Philipp
diff --git a/drivers/memory/Kconfig b/drivers/memory/Kconfig index 6f31546..51d5cd2 100644 --- a/drivers/memory/Kconfig +++ b/drivers/memory/Kconfig @@ -114,6 +114,14 @@ config JZ4780_NEMC the Ingenic JZ4780. This controller is used to handle external memory devices such as NAND and SRAM. +config MTK_SMI + bool + depends on ARCH_MEDIATEK || COMPILE_TEST + help + This driver is for the Memory Controller module in MediaTek SoCs, + mainly help enable/disable iommu and control the power domain and + clocks for each local arbiter. + source "drivers/memory/tegra/Kconfig" endif diff --git a/drivers/memory/Makefile b/drivers/memory/Makefile index 1c46af5..890bdf4 100644 --- a/drivers/memory/Makefile +++ b/drivers/memory/Makefile @@ -15,5 +15,6 @@ obj-$(CONFIG_FSL_IFC) += fsl_ifc.o obj-$(CONFIG_MVEBU_DEVBUS) += mvebu-devbus.o obj-$(CONFIG_TEGRA20_MC) += tegra20-mc.o obj-$(CONFIG_JZ4780_NEMC) += jz4780-nemc.o +obj-$(CONFIG_MTK_SMI) += mtk-smi.o obj-$(CONFIG_TEGRA_MC) += tegra/ diff --git a/drivers/memory/mtk-smi.c b/drivers/memory/mtk-smi.c new file mode 100644 index 0000000..702f0d2 --- /dev/null +++ b/drivers/memory/mtk-smi.c @@ -0,0 +1,272 @@ +/* + * Copyright (c) 2015-2016 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/clk.h> +#include <linux/component.h> +#include <linux/err.h> +#include <linux/io.h> +#include <linux/of_address.h> +#include <linux/of_platform.h> +#include <linux/platform_device.h> +#include <linux/pm_runtime.h> +#include <soc/mediatek/smi.h> + +#define SMI_LARB_MMU_EN 0xf00 + +struct mtk_smi { + struct device *dev; + struct clk *clk_apb, *clk_smi; +}; + +struct mtk_smi_larb { /* larb: local arbiter */ + struct mtk_smi smi; + void __iomem *base; + struct device *smi_common_dev; + u32 *mmu; +}; + +static int mtk_smi_enable(const struct mtk_smi *smi) +{ + int ret; + + ret = pm_runtime_get_sync(smi->dev); + if (ret < 0) + return ret; + + ret = clk_prepare_enable(smi->clk_apb); + if (ret) + goto err_put_pm; + + ret = clk_prepare_enable(smi->clk_smi); + if (ret) + goto err_disable_apb; + + return 0; + +err_disable_apb: + clk_disable_unprepare(smi->clk_apb); +err_put_pm: + pm_runtime_put_sync(smi->dev); + return ret; +} + +static void mtk_smi_disable(const struct mtk_smi *smi) +{ + clk_disable_unprepare(smi->clk_smi); + clk_disable_unprepare(smi->clk_apb); + pm_runtime_put_sync(smi->dev); +} + +int mtk_smi_larb_get(struct device *larbdev) +{ + struct mtk_smi_larb *larb = dev_get_drvdata(larbdev); + struct mtk_smi *common = dev_get_drvdata(larb->smi_common_dev); + int ret; + + /* Enable the smi-common's power and clocks */ + ret = mtk_smi_enable(common); + if (ret) + return ret; + + /* Enable the larb's power and clocks */ + ret = mtk_smi_enable(&larb->smi); + if (ret) { + mtk_smi_disable(common); + return ret; + } + + /* Configure the iommu info for this larb */ + writel(*larb->mmu, larb->base + SMI_LARB_MMU_EN); + + return 0; +} + +void mtk_smi_larb_put(struct device *larbdev) +{ + struct mtk_smi_larb *larb = dev_get_drvdata(larbdev); + struct mtk_smi *common = dev_get_drvdata(larb->smi_common_dev); + + /* + * Don't de-configure the iommu info for this larb since there may be + * several modules in this larb. + * The iommu info will be reset after power off. + */ + + mtk_smi_disable(&larb->smi); + mtk_smi_disable(common); +} + +static int +mtk_smi_larb_bind(struct device *dev, struct device *master, void *data) +{ + struct mtk_smi_larb *larb = dev_get_drvdata(dev); + struct mtk_smi_iommu *smi_iommu = data; + unsigned int i; + + for (i = 0; i < smi_iommu->larb_nr; i++) { + if (dev == smi_iommu->larb_imu[i].dev) { + /* The 'mmu' may be updated in iommu-attach/detach. */ + larb->mmu = &smi_iommu->larb_imu[i].mmu; + return 0; + } + } + return -ENODEV; +} + +static void +mtk_smi_larb_unbind(struct device *dev, struct device *master, void *data) +{ + /* Do nothing as the iommu is always enabled. */ +} + +static const struct component_ops mtk_smi_larb_component_ops = { + .bind = mtk_smi_larb_bind, + .unbind = mtk_smi_larb_unbind, +}; + +static int mtk_smi_larb_probe(struct platform_device *pdev) +{ + struct mtk_smi_larb *larb; + struct resource *res; + struct device *dev = &pdev->dev; + struct device_node *smi_node; + struct platform_device *smi_pdev; + + if (!dev->pm_domain) + return -EPROBE_DEFER; + + larb = devm_kzalloc(dev, sizeof(*larb), GFP_KERNEL); + if (!larb) + return -ENOMEM; + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + larb->base = devm_ioremap_resource(dev, res); + if (IS_ERR(larb->base)) + return PTR_ERR(larb->base); + + larb->smi.clk_apb = devm_clk_get(dev, "apb"); + if (IS_ERR(larb->smi.clk_apb)) + return PTR_ERR(larb->smi.clk_apb); + + larb->smi.clk_smi = devm_clk_get(dev, "smi"); + if (IS_ERR(larb->smi.clk_smi)) + return PTR_ERR(larb->smi.clk_smi); + larb->smi.dev = dev; + + smi_node = of_parse_phandle(dev->of_node, "mediatek,smi", 0); + if (!smi_node) + return -EINVAL; + + smi_pdev = of_find_device_by_node(smi_node); + of_node_put(smi_node); + if (smi_pdev) { + larb->smi_common_dev = &smi_pdev->dev; + } else { + dev_err(dev, "Failed to get the smi_common device\n"); + return -EINVAL; + } + + pm_runtime_enable(dev); + platform_set_drvdata(pdev, larb); + return component_add(dev, &mtk_smi_larb_component_ops); +} + +static int mtk_smi_larb_remove(struct platform_device *pdev) +{ + pm_runtime_disable(&pdev->dev); + component_del(&pdev->dev, &mtk_smi_larb_component_ops); + return 0; +} + +static const struct of_device_id mtk_smi_larb_of_ids[] = { + { .compatible = "mediatek,mt8173-smi-larb",}, + {} +}; + +static struct platform_driver mtk_smi_larb_driver = { + .probe = mtk_smi_larb_probe, + .remove = mtk_smi_larb_remove, + .driver = { + .name = "mtk-smi-larb", + .of_match_table = mtk_smi_larb_of_ids, + } +}; + +static int mtk_smi_common_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct mtk_smi *common; + + if (!dev->pm_domain) + return -EPROBE_DEFER; + + common = devm_kzalloc(dev, sizeof(*common), GFP_KERNEL); + if (!common) + return -ENOMEM; + common->dev = dev; + + common->clk_apb = devm_clk_get(dev, "apb"); + if (IS_ERR(common->clk_apb)) + return PTR_ERR(common->clk_apb); + + common->clk_smi = devm_clk_get(dev, "smi"); + if (IS_ERR(common->clk_smi)) + return PTR_ERR(common->clk_smi); + + pm_runtime_enable(dev); + platform_set_drvdata(pdev, common); + return 0; +} + +static int mtk_smi_common_remove(struct platform_device *pdev) +{ + pm_runtime_disable(&pdev->dev); + return 0; +} + +static const struct of_device_id mtk_smi_common_of_ids[] = { + { .compatible = "mediatek,mt8173-smi-common", }, + {} +}; + +static struct platform_driver mtk_smi_common_driver = { + .probe = mtk_smi_common_probe, + .remove = mtk_smi_common_remove, + .driver = { + .name = "mtk-smi-common", + .of_match_table = mtk_smi_common_of_ids, + } +}; + +static int __init mtk_smi_init(void) +{ + int ret; + + ret = platform_driver_register(&mtk_smi_common_driver); + if (ret != 0) { + pr_err("Failed to register SMI driver\n"); + return ret; + } + + ret = platform_driver_register(&mtk_smi_larb_driver); + if (ret != 0) { + pr_err("Failed to register SMI-LARB driver\n"); + goto err_unreg_smi; + } + return ret; + +err_unreg_smi: + platform_driver_unregister(&mtk_smi_common_driver); + return ret; +} +subsys_initcall(mtk_smi_init); diff --git a/include/soc/mediatek/smi.h b/include/soc/mediatek/smi.h new file mode 100644 index 0000000..8893c5e --- /dev/null +++ b/include/soc/mediatek/smi.h @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2015-2016 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. + */ +#ifndef MTK_IOMMU_SMI_H +#define MTK_IOMMU_SMI_H + +#include <linux/bitops.h> +#include <linux/device.h> + +#ifdef CONFIG_MTK_SMI + +#define MTK_LARB_NR_MAX 8 + +#define MTK_SMI_MMU_EN(port) BIT(port) + +struct mtk_smi_larb_iommu { + struct device *dev; + unsigned int mmu; +}; + +struct mtk_smi_iommu { + unsigned int larb_nr; + struct mtk_smi_larb_iommu larb_imu[MTK_LARB_NR_MAX]; +}; + +/* + * mtk_smi_larb_get: Enable the power domain and clocks for this local arbiter. + * It also initialize some basic setting(like iommu). + * mtk_smi_larb_put: Disable the power domain and clocks for this local arbiter. + * Both should be called in non-atomic context. + * + * Returns 0 if successful, negative on failure. + */ +int mtk_smi_larb_get(struct device *larbdev); +void mtk_smi_larb_put(struct device *larbdev); + +#else + +static inline int mtk_smi_larb_get(struct device *larbdev) +{ + return 0; +} + +static inline void mtk_smi_larb_put(struct device *larbdev) { } + +#endif + +#endif