From: Yong Wu <yong.wu@mediatek.com> To: Nicolas Boichat <drinkcat@chromium.org>, Matthias Brugger <matthias.bgg@gmail.com> Cc: Joerg Roedel <joro@8bytes.org>, Robin Murphy <robin.murphy@arm.com>, "Rob Herring" <robh+dt@kernel.org>, Tomasz Figa <tfiga@google.com>, Will Deacon <will.deacon@arm.com>, <linux-mediatek@lists.infradead.org>, <srv_heupstream@mediatek.com>, <devicetree@vger.kernel.org>, lkml <linux-kernel@vger.kernel.org>, linux-arm Mailing List <linux-arm-kernel@lists.infradead.org>, <iommu@lists.linux-foundation.org>, Arnd Bergmann <arnd@arndb.de>, Yingjoe Chen <yingjoe.chen@mediatek.com>, <youlin.pei@mediatek.com> Subject: Re: [PATCH v5 09/20] iommu/mediatek: Refine protect memory definition Date: Wed, 2 Jan 2019 17:33:35 +0800 [thread overview] Message-ID: <1546421615.32203.14.camel@mhfsdcap03> (raw) In-Reply-To: <CANMq1KC0zciUAtvcYoxfBOOMbGFu_Un031QemtuDopjWvwk3cw@mail.gmail.com> On Wed, 2019-01-02 at 14:23 +0800, Nicolas Boichat wrote: > On Tue, Jan 1, 2019 at 11:58 AM Yong Wu <yong.wu@mediatek.com> wrote: > > > > The protect memory setting is a little different in the different SoCs. > > In the register REG_MMU_CTRL_REG(0x110), the TF_PROT(translation fault > > protect) shift bit is normally 4 while it shift 5 bits only in the > > mt8173. This patch delete the complex MACRO and use a common if-else > > instead. > > > > Also, use "F_MMU_TF_PROT_TO_PROGRAM_ADDR" instead of the hard code(2) > > which means the M4U will output the dirty data to the programmed > > address that we allocated dynamically when translation fault occurs. > > > > Signed-off-by: Yong Wu <yong.wu@mediatek.com> > > --- > > @Nicalos, I don't put it in the plat_data since only the previous mt8173 > > shift 5. As I know, the latest SoC always use the new setting like mt2712 > > and mt8183. Thus, I think it is unnecessary to put it in plat_data and > > let all the latest SoC set it. Hence, I still keep "== mt8173" for this > > like the reg REG_MMU_CTRL_REG. > > Should be ok this way. But maybe one way to avoid hard-coding 4/5 > below is to have 2 macros: > > #define F_MMU_TF_PROT_TO_PROGRAM_ADDR (2 << 4) > #define F_MMU_TF_PROT_TO_PROGRAM_ADDR_MT8173 (2 << 5) > > And still use the if below? Thanks for your quick review. OK for me. I will wait Matthias's review for memory/ part. then send the next version. > > > --- > > drivers/iommu/mtk_iommu.c | 12 +++++------- > > 1 file changed, 5 insertions(+), 7 deletions(-) > > > > diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c > > index eca1536..35a1263 100644 > > --- a/drivers/iommu/mtk_iommu.c > > +++ b/drivers/iommu/mtk_iommu.c > > @@ -53,11 +53,7 @@ > > > > #define REG_MMU_CTRL_REG 0x110 > > #define F_MMU_PREFETCH_RT_REPLACE_MOD BIT(4) > > -#define F_MMU_TF_PROTECT_SEL_SHIFT(data) \ > > - ((data)->plat_data->m4u_plat == M4U_MT2712 ? 4 : 5) > > -/* It's named by F_MMU_TF_PROT_SEL in mt2712. */ > > -#define F_MMU_TF_PROTECT_SEL(prot, data) \ > > - (((prot) & 0x3) << F_MMU_TF_PROTECT_SEL_SHIFT(data)) > > +#define F_MMU_TF_PROT_TO_PROGRAM_ADDR 2 > > > > #define REG_MMU_IVRP_PADDR 0x114 > > > > @@ -521,9 +517,11 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data) > > return ret; > > } > > > > - regval = F_MMU_TF_PROTECT_SEL(2, data); > > if (data->plat_data->m4u_plat == M4U_MT8173) > > - regval |= F_MMU_PREFETCH_RT_REPLACE_MOD; > > + regval = F_MMU_PREFETCH_RT_REPLACE_MOD | > > + (F_MMU_TF_PROT_TO_PROGRAM_ADDR << 5); > > + else > > + regval = F_MMU_TF_PROT_TO_PROGRAM_ADDR << 4; > > writel_relaxed(regval, data->base + REG_MMU_CTRL_REG); > > > > regval = F_L2_MULIT_HIT_EN | > > -- > > 1.9.1 > >
WARNING: multiple messages have this Message-ID (diff)
From: Yong Wu <yong.wu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org> To: Nicolas Boichat <drinkcat-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>, Matthias Brugger <matthias.bgg-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Cc: youlin.pei-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org>, srv_heupstream-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org, Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org>, lkml <linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>, Tomasz Figa <tfiga-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>, iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org, Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>, linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, Yingjoe Chen <yingjoe.chen-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>, Robin Murphy <robin.murphy-5wv7dgnIgG8@public.gmane.org>, linux-arm Mailing List <linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org> Subject: Re: [PATCH v5 09/20] iommu/mediatek: Refine protect memory definition Date: Wed, 2 Jan 2019 17:33:35 +0800 [thread overview] Message-ID: <1546421615.32203.14.camel@mhfsdcap03> (raw) In-Reply-To: <CANMq1KC0zciUAtvcYoxfBOOMbGFu_Un031QemtuDopjWvwk3cw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> On Wed, 2019-01-02 at 14:23 +0800, Nicolas Boichat wrote: > On Tue, Jan 1, 2019 at 11:58 AM Yong Wu <yong.wu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org> wrote: > > > > The protect memory setting is a little different in the different SoCs. > > In the register REG_MMU_CTRL_REG(0x110), the TF_PROT(translation fault > > protect) shift bit is normally 4 while it shift 5 bits only in the > > mt8173. This patch delete the complex MACRO and use a common if-else > > instead. > > > > Also, use "F_MMU_TF_PROT_TO_PROGRAM_ADDR" instead of the hard code(2) > > which means the M4U will output the dirty data to the programmed > > address that we allocated dynamically when translation fault occurs. > > > > Signed-off-by: Yong Wu <yong.wu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org> > > --- > > @Nicalos, I don't put it in the plat_data since only the previous mt8173 > > shift 5. As I know, the latest SoC always use the new setting like mt2712 > > and mt8183. Thus, I think it is unnecessary to put it in plat_data and > > let all the latest SoC set it. Hence, I still keep "== mt8173" for this > > like the reg REG_MMU_CTRL_REG. > > Should be ok this way. But maybe one way to avoid hard-coding 4/5 > below is to have 2 macros: > > #define F_MMU_TF_PROT_TO_PROGRAM_ADDR (2 << 4) > #define F_MMU_TF_PROT_TO_PROGRAM_ADDR_MT8173 (2 << 5) > > And still use the if below? Thanks for your quick review. OK for me. I will wait Matthias's review for memory/ part. then send the next version. > > > --- > > drivers/iommu/mtk_iommu.c | 12 +++++------- > > 1 file changed, 5 insertions(+), 7 deletions(-) > > > > diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c > > index eca1536..35a1263 100644 > > --- a/drivers/iommu/mtk_iommu.c > > +++ b/drivers/iommu/mtk_iommu.c > > @@ -53,11 +53,7 @@ > > > > #define REG_MMU_CTRL_REG 0x110 > > #define F_MMU_PREFETCH_RT_REPLACE_MOD BIT(4) > > -#define F_MMU_TF_PROTECT_SEL_SHIFT(data) \ > > - ((data)->plat_data->m4u_plat == M4U_MT2712 ? 4 : 5) > > -/* It's named by F_MMU_TF_PROT_SEL in mt2712. */ > > -#define F_MMU_TF_PROTECT_SEL(prot, data) \ > > - (((prot) & 0x3) << F_MMU_TF_PROTECT_SEL_SHIFT(data)) > > +#define F_MMU_TF_PROT_TO_PROGRAM_ADDR 2 > > > > #define REG_MMU_IVRP_PADDR 0x114 > > > > @@ -521,9 +517,11 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data) > > return ret; > > } > > > > - regval = F_MMU_TF_PROTECT_SEL(2, data); > > if (data->plat_data->m4u_plat == M4U_MT8173) > > - regval |= F_MMU_PREFETCH_RT_REPLACE_MOD; > > + regval = F_MMU_PREFETCH_RT_REPLACE_MOD | > > + (F_MMU_TF_PROT_TO_PROGRAM_ADDR << 5); > > + else > > + regval = F_MMU_TF_PROT_TO_PROGRAM_ADDR << 4; > > writel_relaxed(regval, data->base + REG_MMU_CTRL_REG); > > > > regval = F_L2_MULIT_HIT_EN | > > -- > > 1.9.1 > >
next prev parent reply other threads:[~2019-01-02 9:33 UTC|newest] Thread overview: 193+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-01-01 3:55 [PATCH v5 00/18] MT8183 IOMMU SUPPORT Yong Wu 2019-01-01 3:55 ` Yong Wu 2019-01-01 3:55 ` Yong Wu 2019-01-01 3:55 ` [PATCH v5 01/20] dt-bindings: mediatek: Add binding for mt8183 IOMMU and SMI Yong Wu 2019-01-01 3:55 ` Yong Wu 2019-01-01 3:55 ` Yong Wu 2019-01-30 18:27 ` Evan Green 2019-01-30 18:27 ` Evan Green 2019-01-30 18:27 ` Evan Green 2019-01-31 3:19 ` Yong Wu 2019-01-31 3:19 ` Yong Wu 2019-01-31 3:19 ` Yong Wu 2019-01-01 3:55 ` [PATCH v5 02/20] iommu/mediatek: Use a struct as the platform data Yong Wu 2019-01-01 3:55 ` Yong Wu 2019-01-01 3:55 ` Yong Wu 2019-01-30 18:27 ` Evan Green 2019-01-30 18:27 ` Evan Green 2019-01-30 18:27 ` Evan Green 2019-01-01 3:55 ` [PATCH v5 03/20] memory: mtk-smi: Use a general config_port interface Yong Wu 2019-01-01 3:55 ` Yong Wu 2019-01-01 3:55 ` Yong Wu 2019-01-30 18:27 ` Evan Green 2019-01-30 18:27 ` Evan Green 2019-01-30 18:27 ` Evan Green 2019-01-01 3:55 ` [PATCH v5 04/20] memory: mtk-smi: Use a struct for the platform data for smi-common Yong Wu 2019-01-01 3:55 ` Yong Wu 2019-01-01 3:55 ` Yong Wu 2019-01-30 18:28 ` Evan Green 2019-01-30 18:28 ` Evan Green 2019-01-30 18:28 ` Evan Green 2019-01-01 3:55 ` [PATCH v5 05/20] iommu/io-pgtable-arm-v7s: Add paddr_to_iopte and iopte_to_paddr helpers Yong Wu 2019-01-01 3:55 ` Yong Wu 2019-01-01 3:55 ` Yong Wu 2019-01-30 18:28 ` Evan Green 2019-01-30 18:28 ` Evan Green 2019-01-30 18:28 ` Evan Green 2019-01-01 3:55 ` [PATCH v6 06/20] iommu/io-pgtable-arm-v7s: Extend MediaTek 4GB Mode Yong Wu 2019-01-01 3:55 ` Yong Wu 2019-01-01 3:55 ` Yong Wu 2019-01-30 18:28 ` Evan Green 2019-01-30 18:28 ` Evan Green 2019-01-30 18:28 ` Evan Green 2019-01-31 6:58 ` Yong Wu 2019-01-31 6:58 ` Yong Wu 2019-01-31 6:58 ` Yong Wu 2019-01-31 19:23 ` Evan Green 2019-01-31 19:23 ` Evan Green 2019-01-31 19:23 ` Evan Green 2019-02-01 9:42 ` Yong Wu 2019-02-01 9:42 ` Yong Wu 2019-02-01 9:42 ` Yong Wu 2019-02-05 23:11 ` Evan Green 2019-02-05 23:11 ` Evan Green 2019-02-05 23:11 ` Evan Green 2019-02-17 10:01 ` Yong Wu 2019-02-17 10:01 ` Yong Wu 2019-02-17 10:01 ` Yong Wu 2019-01-01 3:55 ` [PATCH v5 07/20] iommu/mediatek: Add bclk can be supported optionally Yong Wu 2019-01-01 3:55 ` Yong Wu 2019-01-01 3:55 ` Yong Wu 2019-01-30 18:29 ` Evan Green 2019-01-30 18:29 ` Evan Green 2019-01-30 18:29 ` Evan Green 2019-01-01 3:55 ` [PATCH v5 08/20] iommu/mediatek: Add larb-id remapped support Yong Wu 2019-01-01 3:55 ` Yong Wu 2019-01-01 3:55 ` Yong Wu 2019-01-02 6:15 ` Nicolas Boichat 2019-01-02 6:15 ` Nicolas Boichat 2019-01-30 18:29 ` Evan Green 2019-01-30 18:29 ` Evan Green 2019-01-30 18:29 ` Evan Green 2019-01-01 3:55 ` [PATCH v5 09/20] iommu/mediatek: Refine protect memory definition Yong Wu 2019-01-01 3:55 ` Yong Wu 2019-01-01 3:55 ` Yong Wu 2019-01-02 6:23 ` Nicolas Boichat 2019-01-02 6:23 ` Nicolas Boichat 2019-01-02 9:33 ` Yong Wu [this message] 2019-01-02 9:33 ` Yong Wu 2019-01-30 18:30 ` Evan Green 2019-01-30 18:30 ` Evan Green 2019-01-30 18:30 ` Evan Green 2019-01-01 3:55 ` [PATCH v5 10/20] iommu/mediatek: Move reset_axi into plat_data Yong Wu 2019-01-01 3:55 ` Yong Wu 2019-01-01 3:55 ` Yong Wu 2019-01-02 6:43 ` Nicolas Boichat 2019-01-02 6:43 ` Nicolas Boichat 2019-01-30 18:30 ` Evan Green 2019-01-30 18:30 ` Evan Green 2019-01-30 18:30 ` Evan Green 2019-01-31 3:22 ` Yong Wu 2019-01-31 3:22 ` Yong Wu 2019-01-31 3:22 ` Yong Wu 2019-01-01 3:55 ` [PATCH v5 11/20] iommu/mediatek: Move vld_pa_rng " Yong Wu 2019-01-01 3:55 ` Yong Wu 2019-01-01 3:55 ` Yong Wu 2019-01-02 6:45 ` Nicolas Boichat 2019-01-02 6:45 ` Nicolas Boichat 2019-01-02 9:32 ` Yong Wu 2019-01-02 9:32 ` Yong Wu 2019-01-30 18:30 ` Evan Green 2019-01-30 18:30 ` Evan Green 2019-01-30 18:30 ` Evan Green 2019-01-31 3:20 ` Yong Wu 2019-01-31 3:20 ` Yong Wu 2019-01-31 3:20 ` Yong Wu 2019-01-31 16:36 ` Evan Green 2019-01-31 16:36 ` Evan Green 2019-01-31 16:36 ` Evan Green 2019-01-01 3:55 ` [PATCH v5 12/20] memory: mtk-smi: Add gals support Yong Wu 2019-01-01 3:55 ` Yong Wu 2019-01-01 3:55 ` Yong Wu 2019-01-14 6:57 ` Yong Wu 2019-01-14 6:57 ` Yong Wu 2019-01-14 6:57 ` Yong Wu 2019-01-30 18:30 ` Evan Green 2019-01-30 18:30 ` Evan Green 2019-01-30 18:30 ` Evan Green 2019-01-01 3:55 ` [PATCH v5 13/20] iommu/mediatek: Add mt8183 IOMMU support Yong Wu 2019-01-01 3:55 ` Yong Wu 2019-01-01 3:55 ` Yong Wu 2019-01-30 18:31 ` Evan Green 2019-01-30 18:31 ` Evan Green 2019-01-30 18:31 ` Evan Green 2019-01-31 3:19 ` Yong Wu 2019-01-31 3:19 ` Yong Wu 2019-01-31 3:19 ` Yong Wu 2019-01-01 3:55 ` [PATCH v5 14/20] iommu/mediatek: Add mmu1 support Yong Wu 2019-01-01 3:55 ` Yong Wu 2019-01-01 3:55 ` Yong Wu 2019-01-30 18:55 ` Evan Green 2019-01-30 18:55 ` Evan Green 2019-01-30 18:55 ` Evan Green 2019-01-31 3:22 ` Yong Wu 2019-01-31 3:22 ` Yong Wu 2019-01-31 3:22 ` Yong Wu 2019-01-01 3:55 ` [PATCH v5 15/20] memory: mtk-smi: Invoke pm runtime_callback to enable clocks Yong Wu 2019-01-01 3:55 ` Yong Wu 2019-01-01 3:55 ` Yong Wu 2019-01-30 19:05 ` Evan Green 2019-01-30 19:05 ` Evan Green 2019-01-30 19:05 ` Evan Green 2019-01-31 3:42 ` Yong Wu 2019-01-31 3:42 ` Yong Wu 2019-01-31 3:42 ` Yong Wu 2019-01-01 3:55 ` [PATCH v5 16/20] memory: mtk-smi: Add bus_sel for mt8183 Yong Wu 2019-01-01 3:55 ` Yong Wu 2019-01-01 3:55 ` Yong Wu 2019-01-30 19:07 ` Evan Green 2019-01-30 19:07 ` Evan Green 2019-01-30 19:07 ` Evan Green 2019-01-31 3:20 ` Yong Wu 2019-01-31 3:20 ` Yong Wu 2019-01-31 3:20 ` Yong Wu 2019-01-01 3:55 ` [PATCH v5 17/20] memory: mtk-smi: Get rid of need_larbid Yong Wu 2019-01-01 3:55 ` Yong Wu 2019-01-01 3:55 ` Yong Wu 2019-01-30 19:11 ` Evan Green 2019-01-30 19:11 ` Evan Green 2019-01-30 19:11 ` Evan Green 2019-01-31 3:22 ` Yong Wu 2019-01-31 3:22 ` Yong Wu 2019-01-31 3:22 ` Yong Wu 2019-01-31 17:45 ` Evan Green 2019-01-31 17:45 ` Evan Green 2019-01-31 17:45 ` Evan Green 2019-02-01 9:42 ` Yong Wu 2019-02-01 9:42 ` Yong Wu 2019-02-01 9:42 ` Yong Wu 2019-01-01 3:55 ` [PATCH v5 18/20] iommu/mediatek: Fix VLD_PA_RANGE register backup when suspend Yong Wu 2019-01-01 3:55 ` Yong Wu 2019-01-01 3:55 ` Yong Wu 2019-01-02 6:54 ` Nicolas Boichat 2019-01-02 6:54 ` Nicolas Boichat 2019-01-02 9:31 ` Yong Wu 2019-01-02 9:31 ` Yong Wu 2019-01-30 19:11 ` Evan Green 2019-01-30 19:11 ` Evan Green 2019-01-30 19:11 ` Evan Green 2019-01-01 3:55 ` [PATCH v5 19/20] iommu/mediatek: Add shutdown callback Yong Wu 2019-01-01 3:55 ` Yong Wu 2019-01-01 3:55 ` Yong Wu 2019-01-30 19:12 ` Evan Green 2019-01-30 19:12 ` Evan Green 2019-01-30 19:12 ` Evan Green 2019-01-31 3:21 ` Yong Wu 2019-01-31 3:21 ` Yong Wu 2019-01-31 3:21 ` Yong Wu 2019-01-01 3:55 ` [PATCH v5 20/20] iommu/mediatek: Switch to SPDX license identifier Yong Wu 2019-01-01 3:55 ` Yong Wu 2019-01-01 3:55 ` Yong Wu 2019-01-30 19:13 ` Evan Green 2019-01-30 19:13 ` Evan Green 2019-01-30 19:13 ` Evan Green
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=1546421615.32203.14.camel@mhfsdcap03 \ --to=yong.wu@mediatek.com \ --cc=arnd@arndb.de \ --cc=devicetree@vger.kernel.org \ --cc=drinkcat@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=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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.