From: Yong Wu <yong.wu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
To: Joerg Roedel <joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org>,
Matthias Brugger
<matthias.bgg-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
Robin Murphy <robin.murphy-5wv7dgnIgG8@public.gmane.org>,
Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
Cc: youlin.pei-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org,
devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
Nicolas Boichat
<drinkcat-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>,
arnd-r2nGTMty4D4@public.gmane.org,
srv_heupstream-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org,
Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org>,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
Tomasz Figa <tfiga-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>,
iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org,
linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
Arvind Yadav
<arvind.yadav.cs-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
yingjoe.chen-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
Subject: [PATCH v4 08/18] iommu/mediatek: Add larb-id remapped support
Date: Sat, 8 Dec 2018 16:39:21 +0800 [thread overview]
Message-ID: <1544258371-4600-9-git-send-email-yong.wu@mediatek.com> (raw)
In-Reply-To: <1544258371-4600-1-git-send-email-yong.wu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
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.
This also is a preparing patch for mt8183.
Signed-off-by: Yong Wu <yong.wu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
---
drivers/iommu/mtk_iommu.c | 3 +++
drivers/iommu/mtk_iommu.h | 4 ++++
2 files changed, 7 insertions(+)
diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index eda062a..8ab3b69 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -220,6 +220,9 @@ 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);
+ if (data->plat_data->larbid_remap_enable)
+ fault_larb = data->plat_data->larbid_remapped[fault_larb];
+
if (report_iommu_fault(&dom->domain, data->dev, fault_iova,
write ? IOMMU_FAULT_WRITE : IOMMU_FAULT_READ)) {
dev_err_ratelimited(
diff --git a/drivers/iommu/mtk_iommu.h b/drivers/iommu/mtk_iommu.h
index b8749ac..3877050 100644
--- a/drivers/iommu/mtk_iommu.h
+++ b/drivers/iommu/mtk_iommu.h
@@ -47,6 +47,10 @@ struct mtk_iommu_plat_data {
/* HW will use the EMI clock if there isn't the "bclk". */
bool has_bclk;
+
+ /* The larb-id may be remapped in the smi-common. */
+ bool larbid_remap_enable;
+ unsigned int larbid_remapped[MTK_LARB_NR_MAX];
};
struct mtk_iommu_domain;
--
1.9.1
next prev parent reply other threads:[~2018-12-08 8:39 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-08 8:39 [PATCH v4 00/18] MT8183 IOMMU SUPPORT Yong Wu
2018-12-08 8:39 ` [PATCH v4 04/18] memory: mtk-smi: Use a struct for the platform data for smi-common Yong Wu
2018-12-21 17:49 ` Matthias Brugger
2018-12-08 8:39 ` [PATCH v4 05/18] iommu/io-pgtable-arm-v7s: Add paddr_to_iopte and iopte_to_paddr helpers Yong Wu
[not found] ` <1544258371-4600-1-git-send-email-yong.wu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
2018-12-08 8:39 ` [PATCH v4 01/18] dt-bindings: mediatek: Add binding for mt8183 IOMMU and SMI Yong Wu
2018-12-08 8:39 ` [PATCH v4 02/18] iommu/mediatek: Use a struct as the platform data Yong Wu
2018-12-21 17:44 ` Matthias Brugger
2018-12-08 8:39 ` [PATCH v4 03/18] memory: mtk-smi: Use a general config_port interface Yong Wu
2018-12-21 17:47 ` Matthias Brugger
[not found] ` <aa91ceb7-673b-7022-d718-f9f61d4b2f23-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-12-22 3:57 ` Yong Wu
2018-12-08 8:39 ` [PATCH v4 06/18] iommu/io-pgtable-arm-v7s: Extend MediaTek 4GB Mode Yong Wu
2018-12-08 8:39 ` [PATCH v4 07/18] iommu/mediatek: Add bclk can be supported optionally Yong Wu
2018-12-08 8:39 ` Yong Wu [this message]
2018-12-21 3:35 ` [PATCH v4 08/18] iommu/mediatek: Add larb-id remapped support Nicolas Boichat
2018-12-21 8:02 ` Yong Wu
2018-12-08 8:39 ` [PATCH v4 09/18] memory: mtk-smi: Add gals support Yong Wu
2018-12-08 8:39 ` [PATCH v4 10/18] iommu/mediatek: Add mt8183 IOMMU support Yong Wu
[not found] ` <1544258371-4600-11-git-send-email-yong.wu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
2018-12-21 4:43 ` Nicolas Boichat
[not found] ` <CANMq1KBMWM8BhMDJo1paVbToibsZGYVOCWBOua81w7fnTCO-bw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2018-12-21 8:02 ` Yong Wu
2018-12-22 0:31 ` Nicolas Boichat
2018-12-22 3:57 ` Yong Wu
2018-12-21 18:31 ` Matthias Brugger
[not found] ` <07f6276d-e7b5-ef82-9c38-1fa0af0cd9f3-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-12-22 3:58 ` Yong Wu
2018-12-08 8:39 ` [PATCH v4 11/18] iommu/mediatek: Add mmu1 support Yong Wu
2018-12-08 8:39 ` [PATCH v4 12/18] memory: mtk-smi: Invoke pm runtime_callback to enable clocks Yong Wu
2018-12-08 8:39 ` [PATCH v4 13/18] memory: mtk-smi: Add bus_sel for mt8183 Yong Wu
2018-12-21 4:47 ` Nicolas Boichat
2018-12-21 8:02 ` Yong Wu
2018-12-08 8:39 ` [PATCH v4 14/18] iommu/mediatek: Fix VLD_PA_RANGE register backup when suspend Yong Wu
2018-12-08 8:39 ` [PATCH v4 15/18] iommu/mediatek: Add shutdown callback Yong Wu
2018-12-08 8:39 ` [PATCH v4 16/18] memory: mtk-smi: Get rid of need_larbid Yong Wu
2018-12-08 8:39 ` [PATCH v4 17/18] iommu/mediatek: Constify iommu_ops Yong Wu
2018-12-08 8:39 ` [PATCH v4 18/18] iommu/mediatek: Switch to SPDX license identifier Yong Wu
2018-12-11 9:52 ` [PATCH v4 00/18] MT8183 IOMMU SUPPORT Joerg Roedel
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=1544258371-4600-9-git-send-email-yong.wu@mediatek.com \
--to=yong.wu-nus5lvnupcjwk0htik3j/w@public.gmane.org \
--cc=arnd-r2nGTMty4D4@public.gmane.org \
--cc=arvind.yadav.cs-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=drinkcat-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org \
--cc=iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org \
--cc=joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org \
--cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=matthias.bgg-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
--cc=robin.murphy-5wv7dgnIgG8@public.gmane.org \
--cc=srv_heupstream-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org \
--cc=tfiga-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org \
--cc=will.deacon-5wv7dgnIgG8@public.gmane.org \
--cc=yingjoe.chen-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org \
--cc=youlin.pei-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org \
/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).