From: Nicolas Boichat <drinkcat@chromium.org> To: Yong Wu <yong.wu@mediatek.com> Cc: Joerg Roedel <joro@8bytes.org>, Matthias Brugger <matthias.bgg@gmail.com>, 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 08/20] iommu/mediatek: Add larb-id remapped support Date: Wed, 2 Jan 2019 14:15:15 +0800 [thread overview] Message-ID: <CANMq1KCz9mkrou2+C_FTKWsaa3+riofn5VXHdE==Ux3vLJf=zA@mail.gmail.com> (raw) In-Reply-To: <1546314952-15990-9-git-send-email-yong.wu@mediatek.com> On Tue, Jan 1, 2019 at 11:58 AM Yong Wu <yong.wu@mediatek.com> wrote: > > The larb-id may be remapped in the smi-common, this means the > larb-id reported in the mtk_iommu_isr isn't the real larb-id, > > Take mt8183 as a example: > M4U > | > --------------------------------------------- > | SMI common | > -0-----7-----5-----6-----1-----2------3-----4- <- Id remapped > | | | | | | | | > larb0 larb1 IPU0 IPU1 larb4 larb5 larb6 CCU > disp vdec img cam venc img cam > As above, larb0 connects with the id 0 in smi-common. > larb1 connects with the id 7 in smi-common. > ... > If the larb-id reported in the isr is 7, actually it's larb1(vdec). > In order to output the right larb-id in the isr, we add a larb-id > remapping relationship in this patch. > > If there is no this larb-id remapping in some SoCs, use the linear > mapping array instead. > > This also is a preparing patch for mt8183. > > Signed-off-by: Yong Wu <yong.wu@mediatek.com> I think it's a little cleaner this way, thanks. Reviewed-by: Nicolas Boichat <drinkcat@chromium.org> > --- > drivers/iommu/mtk_iommu.c | 4 ++++ > drivers/iommu/mtk_iommu.h | 2 ++ > 2 files changed, 6 insertions(+) > > diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c > index 847082c..eca1536 100644 > --- a/drivers/iommu/mtk_iommu.c > +++ b/drivers/iommu/mtk_iommu.c > @@ -220,6 +220,8 @@ static irqreturn_t mtk_iommu_isr(int irq, void *dev_id) > fault_larb = F_MMU0_INT_ID_LARB_ID(regval); > fault_port = F_MMU0_INT_ID_PORT_ID(regval); > > + fault_larb = data->plat_data->larbid_remap[fault_larb]; > + > if (report_iommu_fault(&dom->domain, data->dev, fault_iova, > write ? IOMMU_FAULT_WRITE : IOMMU_FAULT_READ)) { > dev_err_ratelimited( > @@ -742,12 +744,14 @@ static int __maybe_unused mtk_iommu_resume(struct device *dev) > .m4u_plat = M4U_MT2712, > .has_4gb_mode = true, > .has_bclk = true, > + .larbid_remap = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, > }; > > static const struct mtk_iommu_plat_data mt8173_data = { > .m4u_plat = M4U_MT8173, > .has_4gb_mode = true, > .has_bclk = true, > + .larbid_remap = {0, 1, 2, 3, 4, 5}, /* Linear mapping. */ > }; > > static const struct of_device_id mtk_iommu_of_ids[] = { > diff --git a/drivers/iommu/mtk_iommu.h b/drivers/iommu/mtk_iommu.h > index b8749ac..eec19a6 100644 > --- a/drivers/iommu/mtk_iommu.h > +++ b/drivers/iommu/mtk_iommu.h > @@ -47,6 +47,8 @@ struct mtk_iommu_plat_data { > > /* HW will use the EMI clock if there isn't the "bclk". */ > bool has_bclk; > + > + unsigned char larbid_remap[MTK_LARB_NR_MAX]; > }; > > struct mtk_iommu_domain; > -- > 1.9.1 >
WARNING: multiple messages have this Message-ID (diff)
From: Nicolas Boichat <drinkcat-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> To: Yong Wu <yong.wu-NuS5LvNUpcJWk0Htik3J/w@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, Matthias Brugger <matthias.bgg-Re5JQEeQqe8AvxtiuMwx3w@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 08/20] iommu/mediatek: Add larb-id remapped support Date: Wed, 2 Jan 2019 14:15:15 +0800 [thread overview] Message-ID: <CANMq1KCz9mkrou2+C_FTKWsaa3+riofn5VXHdE==Ux3vLJf=zA@mail.gmail.com> (raw) In-Reply-To: <1546314952-15990-9-git-send-email-yong.wu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org> On Tue, Jan 1, 2019 at 11:58 AM Yong Wu <yong.wu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org> wrote: > > The larb-id may be remapped in the smi-common, this means the > larb-id reported in the mtk_iommu_isr isn't the real larb-id, > > Take mt8183 as a example: > M4U > | > --------------------------------------------- > | SMI common | > -0-----7-----5-----6-----1-----2------3-----4- <- Id remapped > | | | | | | | | > larb0 larb1 IPU0 IPU1 larb4 larb5 larb6 CCU > disp vdec img cam venc img cam > As above, larb0 connects with the id 0 in smi-common. > larb1 connects with the id 7 in smi-common. > ... > If the larb-id reported in the isr is 7, actually it's larb1(vdec). > In order to output the right larb-id in the isr, we add a larb-id > remapping relationship in this patch. > > If there is no this larb-id remapping in some SoCs, use the linear > mapping array instead. > > This also is a preparing patch for mt8183. > > Signed-off-by: Yong Wu <yong.wu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org> I think it's a little cleaner this way, thanks. Reviewed-by: Nicolas Boichat <drinkcat-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> > --- > drivers/iommu/mtk_iommu.c | 4 ++++ > drivers/iommu/mtk_iommu.h | 2 ++ > 2 files changed, 6 insertions(+) > > diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c > index 847082c..eca1536 100644 > --- a/drivers/iommu/mtk_iommu.c > +++ b/drivers/iommu/mtk_iommu.c > @@ -220,6 +220,8 @@ static irqreturn_t mtk_iommu_isr(int irq, void *dev_id) > fault_larb = F_MMU0_INT_ID_LARB_ID(regval); > fault_port = F_MMU0_INT_ID_PORT_ID(regval); > > + fault_larb = data->plat_data->larbid_remap[fault_larb]; > + > if (report_iommu_fault(&dom->domain, data->dev, fault_iova, > write ? IOMMU_FAULT_WRITE : IOMMU_FAULT_READ)) { > dev_err_ratelimited( > @@ -742,12 +744,14 @@ static int __maybe_unused mtk_iommu_resume(struct device *dev) > .m4u_plat = M4U_MT2712, > .has_4gb_mode = true, > .has_bclk = true, > + .larbid_remap = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, > }; > > static const struct mtk_iommu_plat_data mt8173_data = { > .m4u_plat = M4U_MT8173, > .has_4gb_mode = true, > .has_bclk = true, > + .larbid_remap = {0, 1, 2, 3, 4, 5}, /* Linear mapping. */ > }; > > static const struct of_device_id mtk_iommu_of_ids[] = { > diff --git a/drivers/iommu/mtk_iommu.h b/drivers/iommu/mtk_iommu.h > index b8749ac..eec19a6 100644 > --- a/drivers/iommu/mtk_iommu.h > +++ b/drivers/iommu/mtk_iommu.h > @@ -47,6 +47,8 @@ struct mtk_iommu_plat_data { > > /* HW will use the EMI clock if there isn't the "bclk". */ > bool has_bclk; > + > + unsigned char larbid_remap[MTK_LARB_NR_MAX]; > }; > > struct mtk_iommu_domain; > -- > 1.9.1 >
next prev parent reply other threads:[~2019-01-02 6:15 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 [this message] 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 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='CANMq1KCz9mkrou2+C_FTKWsaa3+riofn5VXHdE==Ux3vLJf=zA@mail.gmail.com' \ --to=drinkcat@chromium.org \ --cc=arnd@arndb.de \ --cc=devicetree@vger.kernel.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=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: 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.