From: Yong Wu <yong.wu@mediatek.com> To: Matthias Brugger <matthias.bgg@gmail.com> Cc: youlin.pei@mediatek.com, devicetree@vger.kernel.org, Nicolas Boichat <drinkcat@chromium.org>, srv_heupstream@mediatek.com, Joerg Roedel <joro@8bytes.org>, 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, Rob Herring <robh+dt@kernel.org>, linux-mediatek@lists.infradead.org, yingjoe.chen@mediatek.com, anan.sun@mediatek.com, Robin Murphy <robin.murphy@arm.com>, Matthias Kaehlcke <mka@chromium.org>, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH v7 17/21] memory: mtk-smi: Get rid of need_larbid Date: Thu, 20 Jun 2019 21:59:36 +0800 Message-ID: <1561039176.4021.21.camel@mhfsdcap03> (raw) In-Reply-To: <1af7b67a-b73a-efb9-e1f8-5701f05a4af0@gmail.com> On Tue, 2019-06-18 at 15:45 +0200, Matthias Brugger wrote: > > On 10/06/2019 14:17, Yong Wu wrote: > > The "mediatek,larb-id" has already been parsed in MTK IOMMU driver. > > It's no need to parse it again in SMI driver. Only clean some codes. > > This patch is fit for all the current mt2701, mt2712, mt7623, mt8173 > > and mt8183. > > > > After this patch, the "mediatek,larb-id" only be needed for mt2712 > > which have 2 M4Us. In the other SoCs, we can get the larb-id from M4U > > in which the larbs in the "mediatek,larbs" always are ordered. > > > > Correspondingly, the larb_nr in the "struct mtk_smi_iommu" could also > > be deleted. > > > > I think we can get rid of struct mtk_smi_iommu and just add the > struct mtk_smi_larb_iommu larb_imu[MTK_LARB_NR_MAX] directly to mtk_iommu_data, > passing just that array to the components bind function. Thanks. I will try this in a new patch. > > Never the less this patch looks fine: > Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com> Really appreciate for reviewing so many patches. > > > CC: Matthias Brugger <matthias.bgg@gmail.com> > > Signed-off-by: Yong Wu <yong.wu@mediatek.com> > > Reviewed-by: Evan Green <evgreen@chromium.org> > > --- > > drivers/iommu/mtk_iommu.c | 1 - > > drivers/iommu/mtk_iommu_v1.c | 2 -- > > drivers/memory/mtk-smi.c | 26 ++------------------------ > > include/soc/mediatek/smi.h | 1 - > > 4 files changed, 2 insertions(+), 28 deletions(-) > > > > diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c > > index ec4ce74..6053b8b 100644 > > --- a/drivers/iommu/mtk_iommu.c > > +++ b/drivers/iommu/mtk_iommu.c > > @@ -634,7 +634,6 @@ static int mtk_iommu_probe(struct platform_device *pdev) > > "mediatek,larbs", NULL); > > if (larb_nr < 0) > > return larb_nr; > > - data->smi_imu.larb_nr = larb_nr; > > > > for (i = 0; i < larb_nr; i++) { > > struct device_node *larbnode; > > diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c > > index 52b01e3..73308ad 100644 > > --- a/drivers/iommu/mtk_iommu_v1.c > > +++ b/drivers/iommu/mtk_iommu_v1.c > > @@ -624,8 +624,6 @@ static int mtk_iommu_probe(struct platform_device *pdev) > > larb_nr++; > > } > > > > - data->smi_imu.larb_nr = larb_nr; > > - > > platform_set_drvdata(pdev, data); > > > > ret = mtk_iommu_hw_init(data); > > diff --git a/drivers/memory/mtk-smi.c b/drivers/memory/mtk-smi.c > > index 08cf40d..10e6493 100644 > > --- a/drivers/memory/mtk-smi.c > > +++ b/drivers/memory/mtk-smi.c > > @@ -67,7 +67,6 @@ struct mtk_smi_common_plat { > > }; > > > > struct mtk_smi_larb_gen { > > - bool need_larbid; > > int port_in_larb[MTK_LARB_NR_MAX + 1]; > > void (*config_port)(struct device *); > > unsigned int larb_direct_to_common_mask; > > @@ -153,18 +152,9 @@ void mtk_smi_larb_put(struct device *larbdev) > > struct mtk_smi_iommu *smi_iommu = data; > > unsigned int i; > > > > - if (larb->larb_gen->need_larbid) { > > - larb->mmu = &smi_iommu->larb_imu[larb->larbid].mmu; > > - return 0; > > - } > > - > > - /* > > - * If there is no larbid property, Loop to find the corresponding > > - * iommu information. > > - */ > > - for (i = 0; i < smi_iommu->larb_nr; i++) { > > + for (i = 0; i < MTK_LARB_NR_MAX; i++) { > > if (dev == smi_iommu->larb_imu[i].dev) { > > - /* The 'mmu' may be updated in iommu-attach/detach. */ > > + larb->larbid = i; > > larb->mmu = &smi_iommu->larb_imu[i].mmu; > > return 0; > > } > > @@ -243,7 +233,6 @@ static void mtk_smi_larb_config_port_gen1(struct device *dev) > > }; > > > > static const struct mtk_smi_larb_gen mtk_smi_larb_mt2701 = { > > - .need_larbid = true, > > .port_in_larb = { > > LARB0_PORT_OFFSET, LARB1_PORT_OFFSET, > > LARB2_PORT_OFFSET, LARB3_PORT_OFFSET > > @@ -252,7 +241,6 @@ static void mtk_smi_larb_config_port_gen1(struct device *dev) > > }; > > > > static const struct mtk_smi_larb_gen mtk_smi_larb_mt2712 = { > > - .need_larbid = true, > > .config_port = mtk_smi_larb_config_port_gen2_general, > > .larb_direct_to_common_mask = BIT(8) | BIT(9), /* bdpsys */ > > }; > > @@ -291,7 +279,6 @@ static int mtk_smi_larb_probe(struct platform_device *pdev) > > struct device *dev = &pdev->dev; > > struct device_node *smi_node; > > struct platform_device *smi_pdev; > > - int err; > > > > larb = devm_kzalloc(dev, sizeof(*larb), GFP_KERNEL); > > if (!larb) > > @@ -321,15 +308,6 @@ static int mtk_smi_larb_probe(struct platform_device *pdev) > > } > > larb->smi.dev = dev; > > > > - if (larb->larb_gen->need_larbid) { > > - err = of_property_read_u32(dev->of_node, "mediatek,larb-id", > > - &larb->larbid); > > - if (err) { > > - dev_err(dev, "missing larbid property\n"); > > - return err; > > - } > > - } > > - > > smi_node = of_parse_phandle(dev->of_node, "mediatek,smi", 0); > > if (!smi_node) > > return -EINVAL; > > diff --git a/include/soc/mediatek/smi.h b/include/soc/mediatek/smi.h > > index 5201e90..a65324d 100644 > > --- a/include/soc/mediatek/smi.h > > +++ b/include/soc/mediatek/smi.h > > @@ -29,7 +29,6 @@ struct mtk_smi_larb_iommu { > > }; > > > > struct mtk_smi_iommu { > > - unsigned int larb_nr; > > struct mtk_smi_larb_iommu larb_imu[MTK_LARB_NR_MAX]; > > }; > > > > _______________________________________________ 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 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 [this message] 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=1561039176.4021.21.camel@mhfsdcap03 \ --to=yong.wu@mediatek.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=matthias.bgg@gmail.com \ --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=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