From: Matthias Brugger <matthias.bgg@gmail.com> To: Yong Wu <yong.wu@mediatek.com>, Joerg Roedel <joro@8bytes.org>, Robin Murphy <robin.murphy@arm.com>, Rob Herring <robh+dt@kernel.org> Cc: youlin.pei@mediatek.com, devicetree@vger.kernel.org, Nicolas Boichat <drinkcat@chromium.org>, srv_heupstream@mediatek.com, Will Deacon <will.deacon@arm.com>, linux-kernel@vger.kernel.org, Evan Green <evgreen@chromium.org>, Tomasz Figa <tfiga@google.com>, iommu@lists.linux-foundation.org, Matthias Kaehlcke <mka@chromium.org>, linux-mediatek@lists.infradead.org, yingjoe.chen@mediatek.com, anan.sun@mediatek.com, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH v7 15/21] memory: mtk-smi: Invoke pm runtime_callback to enable clocks Date: Mon, 17 Jun 2019 18:13:56 +0200 Message-ID: <719e0d71-a9e1-4cb2-0efb-0cdddc65e036@gmail.com> (raw) In-Reply-To: <1560169080-27134-16-git-send-email-yong.wu@mediatek.com> On 10/06/2019 14:17, Yong Wu wrote: > This patch only move the clk_prepare_enable and config_port into the > runtime suspend/resume callback. It doesn't change the code content > and sequence. > > This is a preparing patch for adjusting SMI_BUS_SEL for mt8183. > (SMI_BUS_SEL need to be restored after smi-common resume every time.) > Also it gives a chance to get rid of mtk_smi_larb_get/put which could > be a next topic. > > CC: Matthias Brugger <matthias.bgg@gmail.com> > Signed-off-by: Yong Wu <yong.wu@mediatek.com> > Reviewed-by: Evan Green <evgreen@chromium.org> Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com> > --- > drivers/memory/mtk-smi.c | 113 ++++++++++++++++++++++++++++++----------------- > 1 file changed, 72 insertions(+), 41 deletions(-) > > diff --git a/drivers/memory/mtk-smi.c b/drivers/memory/mtk-smi.c > index a430721..9790801 100644 > --- a/drivers/memory/mtk-smi.c > +++ b/drivers/memory/mtk-smi.c > @@ -86,17 +86,13 @@ struct mtk_smi_larb { /* larb: local arbiter */ > u32 *mmu; > }; > > -static int mtk_smi_enable(const struct mtk_smi *smi) > +static int mtk_smi_clk_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; > + return ret; > > ret = clk_prepare_enable(smi->clk_smi); > if (ret) > @@ -118,59 +114,28 @@ static int mtk_smi_enable(const struct mtk_smi *smi) > clk_disable_unprepare(smi->clk_smi); > 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) > +static void mtk_smi_clk_disable(const struct mtk_smi *smi) > { > clk_disable_unprepare(smi->clk_gals1); > clk_disable_unprepare(smi->clk_gals0); > 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); > - const struct mtk_smi_larb_gen *larb_gen = larb->larb_gen; > - struct mtk_smi *common = dev_get_drvdata(larb->smi_common_dev); > - int ret; > + int ret = pm_runtime_get_sync(larbdev); > > - /* 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 */ > - larb_gen->config_port(larbdev); > - > - return 0; > + return (ret < 0) ? ret : 0; > } > EXPORT_SYMBOL_GPL(mtk_smi_larb_get); > > 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); > + pm_runtime_put_sync(larbdev); > } > EXPORT_SYMBOL_GPL(mtk_smi_larb_put); > > @@ -385,12 +350,52 @@ static int mtk_smi_larb_remove(struct platform_device *pdev) > return 0; > } > > +static int __maybe_unused mtk_smi_larb_resume(struct device *dev) > +{ > + struct mtk_smi_larb *larb = dev_get_drvdata(dev); > + const struct mtk_smi_larb_gen *larb_gen = larb->larb_gen; > + int ret; > + > + /* Power on smi-common. */ > + ret = pm_runtime_get_sync(larb->smi_common_dev); > + if (ret < 0) { > + dev_err(dev, "Failed to pm get for smi-common(%d).\n", ret); > + return ret; > + } > + > + ret = mtk_smi_clk_enable(&larb->smi); > + if (ret < 0) { > + dev_err(dev, "Failed to enable clock(%d).\n", ret); > + pm_runtime_put_sync(larb->smi_common_dev); > + return ret; > + } > + > + /* Configure the basic setting for this larb */ > + larb_gen->config_port(dev); > + > + return 0; > +} > + > +static int __maybe_unused mtk_smi_larb_suspend(struct device *dev) > +{ > + struct mtk_smi_larb *larb = dev_get_drvdata(dev); > + > + mtk_smi_clk_disable(&larb->smi); > + pm_runtime_put_sync(larb->smi_common_dev); > + return 0; > +} > + > +static const struct dev_pm_ops smi_larb_pm_ops = { > + SET_RUNTIME_PM_OPS(mtk_smi_larb_suspend, mtk_smi_larb_resume, NULL) > +}; > + > 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, > + .pm = &smi_larb_pm_ops, > } > }; > > @@ -489,12 +494,38 @@ static int mtk_smi_common_remove(struct platform_device *pdev) > return 0; > } > > +static int __maybe_unused mtk_smi_common_resume(struct device *dev) > +{ > + struct mtk_smi *common = dev_get_drvdata(dev); > + int ret; > + > + ret = mtk_smi_clk_enable(common); > + if (ret) { > + dev_err(common->dev, "Failed to enable clock(%d).\n", ret); > + return ret; > + } > + return 0; > +} > + > +static int __maybe_unused mtk_smi_common_suspend(struct device *dev) > +{ > + struct mtk_smi *common = dev_get_drvdata(dev); > + > + mtk_smi_clk_disable(common); > + return 0; > +} > + > +static const struct dev_pm_ops smi_common_pm_ops = { > + SET_RUNTIME_PM_OPS(mtk_smi_common_suspend, mtk_smi_common_resume, NULL) > +}; > + > 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, > + .pm = &smi_common_pm_ops, > } > }; > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply index Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-06-10 12:17 [PATCH v7 00/21] MT8183 IOMMU SUPPORT Yong Wu 2019-06-10 12:17 ` [PATCH v7 01/21] dt-bindings: mediatek: Add binding for mt8183 IOMMU and SMI Yong Wu 2019-06-10 12:17 ` [PATCH v7 02/21] iommu/mediatek: Use a struct as the platform data Yong Wu 2019-06-10 12:17 ` [PATCH v7 03/21] memory: mtk-smi: Use a general config_port interface Yong Wu 2019-06-10 12:17 ` [PATCH v7 04/21] memory: mtk-smi: Use a struct for the platform data for smi-common Yong Wu 2019-06-10 12:17 ` [PATCH v7 05/21] iommu/io-pgtable-arm-v7s: Add paddr_to_iopte and iopte_to_paddr helpers Yong Wu 2019-06-10 12:17 ` [PATCH v7 06/21] iommu/io-pgtable-arm-v7s: Extend MediaTek 4GB Mode Yong Wu 2019-06-10 12:17 ` [PATCH v7 07/21] iommu/mediatek: Add bclk can be supported optionally Yong Wu 2019-06-15 19:18 ` Matthias Brugger 2019-06-10 12:17 ` [PATCH v7 08/21] iommu/mediatek: Add larb-id remapped support Yong Wu 2019-06-17 9:25 ` Matthias Brugger 2019-06-10 12:17 ` [PATCH v7 09/21] iommu/mediatek: Refine protect memory definition Yong Wu 2019-06-17 9:59 ` Matthias Brugger 2019-06-10 12:17 ` [PATCH v7 10/21] iommu/mediatek: Move reset_axi into plat_data Yong Wu 2019-06-17 10:19 ` Matthias Brugger 2019-06-10 12:17 ` [PATCH v7 11/21] iommu/mediatek: Move vld_pa_rng " Yong Wu 2019-06-17 10:27 ` Matthias Brugger 2019-06-10 12:17 ` [PATCH v7 12/21] memory: mtk-smi: Add gals support Yong Wu 2019-06-17 15:43 ` Matthias Brugger 2019-06-10 12:17 ` [PATCH v7 13/21] iommu/mediatek: Add mt8183 IOMMU support Yong Wu 2019-06-17 15:51 ` Matthias Brugger 2019-06-10 12:17 ` [PATCH v7 14/21] iommu/mediatek: Add mmu1 support Yong Wu 2019-06-17 15:58 ` Matthias Brugger 2019-06-18 6:19 ` Tomasz Figa 2019-06-18 12:09 ` Yong Wu 2019-06-18 14:05 ` Tomasz Figa 2019-06-10 12:17 ` [PATCH v7 15/21] memory: mtk-smi: Invoke pm runtime_callback to enable clocks Yong Wu 2019-06-17 16:13 ` Matthias Brugger [this message] 2019-06-10 12:17 ` [PATCH v7 16/21] memory: mtk-smi: Add bus_sel for mt8183 Yong Wu 2019-06-13 8:20 ` Pi-Hsun Shih 2019-06-17 16:28 ` Matthias Brugger 2019-06-17 16:23 ` Matthias Brugger 2019-06-18 12:10 ` Yong Wu 2019-06-18 21:07 ` Matthias Brugger [not found] ` <CANdKZ0d873PJ2u=Hn_aUJBu3dDiNyueVwBv94-VXHGLJBvAbGg@mail.gmail.com> 2019-06-20 9:35 ` Matthias Brugger 2019-06-20 11:38 ` Matthias Brugger 2019-06-21 3:57 ` Pi-Hsun Shih 2019-06-10 12:17 ` [PATCH v7 17/21] memory: mtk-smi: Get rid of need_larbid Yong Wu 2019-06-18 13:45 ` Matthias Brugger 2019-06-20 13:59 ` Yong Wu 2019-06-10 12:17 ` [PATCH v7 18/21] iommu/mediatek: Fix VLD_PA_RNG register backup when suspend Yong Wu 2019-06-17 16:30 ` Matthias Brugger 2019-06-10 12:17 ` [PATCH v7 19/21] iommu/mediatek: Rename enable_4GB to dram_is_4gb Yong Wu 2019-06-18 16:06 ` Matthias Brugger 2019-06-20 13:59 ` Yong Wu 2019-06-21 10:10 ` Matthias Brugger 2019-06-22 2:42 ` Yong Wu 2019-06-10 12:17 ` [PATCH v7 20/21] iommu/mediatek: Fix iova_to_phys PA start for 4GB mode Yong Wu 2019-06-18 16:35 ` Matthias Brugger 2019-06-20 14:00 ` Yong Wu 2019-06-10 12:18 ` [PATCH v7 21/21] iommu/mediatek: Switch to SPDX license identifier Yong Wu 2019-06-17 16:33 ` Matthias Brugger
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=719e0d71-a9e1-4cb2-0efb-0cdddc65e036@gmail.com \ --to=matthias.bgg@gmail.com \ --cc=anan.sun@mediatek.com \ --cc=devicetree@vger.kernel.org \ --cc=drinkcat@chromium.org \ --cc=evgreen@chromium.org \ --cc=iommu@lists.linux-foundation.org \ --cc=joro@8bytes.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mediatek@lists.infradead.org \ --cc=mka@chromium.org \ --cc=robh+dt@kernel.org \ --cc=robin.murphy@arm.com \ --cc=srv_heupstream@mediatek.com \ --cc=tfiga@google.com \ --cc=will.deacon@arm.com \ --cc=yingjoe.chen@mediatek.com \ --cc=yong.wu@mediatek.com \ --cc=youlin.pei@mediatek.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Linux-ARM-Kernel Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/linux-arm-kernel/0 linux-arm-kernel/git/0.git git clone --mirror https://lore.kernel.org/linux-arm-kernel/1 linux-arm-kernel/git/1.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 linux-arm-kernel linux-arm-kernel/ https://lore.kernel.org/linux-arm-kernel \ linux-arm-kernel@lists.infradead.org public-inbox-index linux-arm-kernel Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.infradead.lists.linux-arm-kernel AGPL code for this site: git clone https://public-inbox.org/public-inbox.git