From: Yong Wu <yong.wu@mediatek.com>
To: Evan Green <evgreen@chromium.org>
Cc: <youlin.pei@mediatek.com>,
"open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS"
<devicetree@vger.kernel.org>,
Nicolas Boichat <drinkcat@chromium.org>,
<srv_heupstream@mediatek.com>, Joerg Roedel <joro@8bytes.org>,
Will Deacon <will.deacon@arm.com>,
LKML <linux-kernel@vger.kernel.org>,
Tomasz Figa <tfiga@google.com>,
<iommu@lists.linux-foundation.org>,
Rob Herring <robh+dt@kernel.org>,
<linux-mediatek@lists.infradead.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
<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 v6 21/22] iommu/mediatek: Fix iova_to_phys PA start for 4GB mode
Date: Wed, 20 Feb 2019 17:17:15 +0800 [thread overview]
Message-ID: <1550654235.26244.10.camel@mhfsdcap03> (raw)
In-Reply-To: <CAE=gft783rOUubODiFHxa9NKeUJxGk4FCeguDsyoqrUxsGDEsQ@mail.gmail.com>
On Tue, 2019-02-19 at 15:33 -0800, Evan Green wrote:
> On Sun, Feb 17, 2019 at 1:09 AM Yong Wu <yong.wu@mediatek.com> wrote:
> >
> > In the 4GB mode, the physical address is remapped,
> >
> > Here is the detailed remap relationship.
> > CPU PA -> HW PA
> > 0x4000_0000 0x1_4000_0000 (Add bit32)
> > 0x8000_0000 0x1_8000_0000 ...
> > 0xc000_0000 0x1_c000_0000 ...
> > 0x1_0000_0000 0x1_0000_0000 (No change)
> >
> > Thus, we always add bit32 for PA when entering mtk_iommu_map.
> > But in the iova_to_phys, the CPU don't need this bit32 if the
> > PA is from 0x1_4000_0000 to 0x1_ffff_ffff.
> > This patch discards the bit32 in this iova_to_phys in the 4GB mode.
> >
> > Signed-off-by: Yong Wu <yong.wu@mediatek.com>
> > ---
> > drivers/iommu/mtk_iommu.c | 18 ++++++++++++++++++
> > 1 file changed, 18 insertions(+)
> >
> > diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
> > index 0277396..076d333 100644
> > --- a/drivers/iommu/mtk_iommu.c
> > +++ b/drivers/iommu/mtk_iommu.c
> > @@ -119,6 +119,19 @@ struct mtk_iommu_domain {
> >
> > static const struct iommu_ops mtk_iommu_ops;
> >
> > +/*
> > + * In M4U 4GB mode, the physical address is remapped as below:
> > + * CPU PA -> M4U HW PA
> > + * 0x4000_0000 0x1_4000_0000 (Add bit32)
> > + * 0x8000_0000 0x1_8000_0000 ...
> > + * 0xc000_0000 0x1_c000_0000 ...
> > + * 0x1_0000_0000 0x1_0000_0000 (No change)
> > + *
> > + * Thus, We always add BIT32 in the iommu_map and disable BIT32 if PA is >=
> > + * 0x1_4000_0000 in the iova_to_phys.
> > + */
> > +#define MTK_IOMMU_4GB_MODE_PA_140000000 0x140000000UL
> > +
> > static LIST_HEAD(m4ulist); /* List all the M4U HWs */
> >
> > #define for_each_m4u(data) list_for_each_entry(data, &m4ulist, list)
> > @@ -415,6 +428,7 @@ static phys_addr_t mtk_iommu_iova_to_phys(struct iommu_domain *domain,
> > dma_addr_t iova)
> > {
> > struct mtk_iommu_domain *dom = to_mtk_domain(domain);
> > + struct mtk_iommu_data *data = mtk_iommu_get_m4u_data();
> > unsigned long flags;
> > phys_addr_t pa;
> >
> > @@ -422,6 +436,10 @@ static phys_addr_t mtk_iommu_iova_to_phys(struct iommu_domain *domain,
> > pa = dom->iop->iova_to_phys(dom->iop, iova);
> > spin_unlock_irqrestore(&dom->pgtlock, flags);
> >
> > + if (data->plat_data->has_4gb_mode && data->dram_is_4gb &&
> > + pa >= MTK_IOMMU_4GB_MODE_PA_140000000)
> > + pa &= ~BIT_ULL(32);
> > +
>
> The define doesn't really make it much better, but I guess it doesn't
> make it worse either. As I was reviewing this I was thinking that this
> should be rolled into patch 6 "iommu/io-pgtable-arm-v7s: Extend
> MediaTek 4GB Mode". But I guess this was returning bad PAs since
> before this series, right? So does this need a Fixes tag?
Thanks very much for your reviewing so many patches.
Yes. The issue exist before this series, It was introduced by this
commit:
30e2fccf9512 ("iommu/mediatek: Enlarge the validate PA range for 4GB
mode")
I will send a new version to add this tag.
> -Evan
>
> _______________________________________________
> Linux-mediatek mailing list
> Linux-mediatek@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-mediatek
next prev parent reply other threads:[~2019-02-20 9:17 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-17 9:04 [PATCH v6 00/22] MT8183 IOMMU SUPPORT Yong Wu
2019-02-17 9:04 ` [PATCH v6 01/22] dt-bindings: mediatek: Add binding for mt8183 IOMMU and SMI Yong Wu
2019-02-18 15:44 ` Rob Herring
2019-02-19 23:28 ` Evan Green
2019-02-17 9:04 ` [PATCH v6 02/22] iommu/mediatek: Use a struct as the platform data Yong Wu
2019-02-17 9:04 ` [PATCH v6 03/22] memory: mtk-smi: Use a general config_port interface Yong Wu
2019-02-17 9:04 ` [PATCH v6 04/22] memory: mtk-smi: Use a struct for the platform data for smi-common Yong Wu
2019-02-17 9:04 ` [PATCH v6 05/22] iommu/io-pgtable-arm-v7s: Add paddr_to_iopte and iopte_to_paddr helpers Yong Wu
2019-02-17 9:04 ` [PATCH v6 06/22] iommu/io-pgtable-arm-v7s: Extend MediaTek 4GB Mode Yong Wu
2019-02-19 23:29 ` Evan Green
2019-02-17 9:04 ` [PATCH v6 07/22] iommu/mediatek: Add bclk can be supported optionally Yong Wu
2019-02-17 9:04 ` [PATCH v6 08/22] iommu/mediatek: Add larb-id remapped support Yong Wu
2019-02-17 9:04 ` [PATCH v6 09/22] iommu/mediatek: Refine protect memory definition Yong Wu
2019-02-19 23:30 ` Evan Green
2019-02-17 9:04 ` [PATCH v6 10/22] iommu/mediatek: Move reset_axi into plat_data Yong Wu
2019-02-19 23:30 ` Evan Green
2019-02-17 9:04 ` [PATCH v6 11/22] iommu/mediatek: Move vld_pa_rng " Yong Wu
2019-02-19 23:31 ` Evan Green
2019-02-17 9:04 ` [PATCH v6 12/22] memory: mtk-smi: Add gals support Yong Wu
2019-03-13 9:25 ` Yong Wu
2019-02-17 9:04 ` [PATCH v6 13/22] iommu/mediatek: Add mt8183 IOMMU support Yong Wu
2019-02-19 23:31 ` Evan Green
2019-02-17 9:04 ` [PATCH v6 14/22] iommu/mediatek: Add mmu1 support Yong Wu
2019-02-17 9:04 ` [PATCH v6 15/22] memory: mtk-smi: Invoke pm runtime_callback to enable clocks Yong Wu
2019-02-17 9:04 ` [PATCH v6 16/22] memory: mtk-smi: Add bus_sel for mt8183 Yong Wu
2019-02-19 23:31 ` Evan Green
2019-02-17 9:04 ` [PATCH v6 17/22] memory: mtk-smi: Get rid of need_larbid Yong Wu
2019-02-19 23:32 ` Evan Green
2019-02-17 9:04 ` [PATCH v6 18/22] iommu/mediatek: Fix VLD_PA_RNG register backup when suspend Yong Wu
2019-02-17 9:04 ` [PATCH v6 19/22] iommu/mediatek: Add shutdown callback Yong Wu
2019-02-17 9:04 ` [PATCH v6 20/22] iommu/mediatek: Rename enable_4GB to dram_is_4gb Yong Wu
2019-02-19 23:32 ` Evan Green
2019-02-17 9:04 ` [PATCH v6 21/22] iommu/mediatek: Fix iova_to_phys PA start for 4GB mode Yong Wu
2019-02-19 23:33 ` Evan Green
2019-02-20 9:17 ` Yong Wu [this message]
2019-02-17 9:05 ` [PATCH v6 22/22] iommu/mediatek: Switch to SPDX license identifier Yong Wu
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=1550654235.26244.10.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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).