All of lore.kernel.org
 help / color / mirror / Atom feed
From: Yong Wu <yong.wu@mediatek.com>
To: Joerg Roedel <joro@8bytes.org>,
	Matthias Brugger <matthias.bgg@gmail.com>,
	Robin Murphy <robin.murphy@arm.com>,
	Rob Herring <robh+dt@kernel.org>
Cc: Tomasz Figa <tfiga@google.com>, Will Deacon <will.deacon@arm.com>,
	<linux-mediatek@lists.infradead.org>,
	<srv_heupstream@mediatek.com>, <devicetree@vger.kernel.org>,
	<linux-kernel@vger.kernel.org>,
	<linux-arm-kernel@lists.infradead.org>,
	<iommu@lists.linux-foundation.org>, <arnd@arndb.de>,
	<yingjoe.chen@mediatek.com>, <yong.wu@mediatek.com>,
	<youlin.pei@mediatek.com>,
	Nicolas Boichat <drinkcat@chromium.org>,
	Arvind Yadav <arvind.yadav.cs@gmail.com>
Subject: [PATCH v3 03/15] memory: mtk-smi: Use a general config_port interface
Date: Sat, 17 Nov 2018 10:35:30 +0800	[thread overview]
Message-ID: <1542422142-30688-4-git-send-email-yong.wu@mediatek.com> (raw)
In-Reply-To: <1542422142-30688-1-git-send-email-yong.wu@mediatek.com>

The config_port of mt2712 and mt8183 are the same. Use a general
config_port interface instead.

In addition, in mt2712, larb8 and larb9 are the bdpsys larbs which
are not the normal larb, their register space are different from the
normal one. thus, we can not call the general config_port. In mt8183,
IPU0/1 and CCU connect with smi-common directly, they also are not
the normal larb. Hence, we add a "larb_special_mask" for these special
larbs.

This is also a prepare patch for adding mt8183 SMI support.

Signed-off-by: Yong Wu <yong.wu@mediatek.com>
---
 drivers/memory/mtk-smi.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/drivers/memory/mtk-smi.c b/drivers/memory/mtk-smi.c
index 8f2d152..e37e54b 100644
--- a/drivers/memory/mtk-smi.c
+++ b/drivers/memory/mtk-smi.c
@@ -53,6 +53,7 @@ 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_special_mask; /* The special larbs mask. */
 };
 
 struct mtk_smi {
@@ -176,17 +177,13 @@ void mtk_smi_larb_put(struct device *larbdev)
 	return -ENODEV;
 }
 
-static void mtk_smi_larb_config_port_mt2712(struct device *dev)
+static void mtk_smi_larb_config_port_gen2_general(struct device *dev)
 {
 	struct mtk_smi_larb *larb = dev_get_drvdata(dev);
 	u32 reg;
 	int i;
 
-	/*
-	 * larb 8/9 is the bdpsys larb, the iommu_en is enabled defaultly.
-	 * Don't need to set it again.
-	 */
-	if (larb->larbid == 8 || larb->larbid == 9)
+	if (BIT(larb->larbid) & larb->larb_gen->larb_special_mask)
 		return;
 
 	for_each_set_bit(i, (unsigned long *)larb->mmu, 32) {
@@ -261,7 +258,8 @@ 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_mt2712,
+	.config_port = mtk_smi_larb_config_port_gen2_general,
+	.larb_special_mask = BIT(8) | BIT(9), /* bdpsys */
 };
 
 static const struct of_device_id mtk_smi_larb_of_ids[] = {
-- 
1.9.1


WARNING: multiple messages have this Message-ID (diff)
From: Yong Wu <yong.wu@mediatek.com>
To: Joerg Roedel <joro@8bytes.org>,
	Matthias Brugger <matthias.bgg@gmail.com>,
	Robin Murphy <robin.murphy@arm.com>,
	Rob Herring <robh+dt@kernel.org>
Cc: Tomasz Figa <tfiga@google.com>, Will Deacon <will.deacon@arm.com>,
	linux-mediatek@lists.infradead.org, srv_heupstream@mediatek.com,
	devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	iommu@lists.linux-foundation.org, arnd@arndb.de,
	yingjoe.chen@mediatek.com, yong.wu@mediatek.com,
	youlin.pei@mediatek.com, Nicolas Boichat <drinkcat@chromium.org>,
	Arvind Yadav <arvind.yadav.cs@gmail.com>
Subject: [PATCH v3 03/15] memory: mtk-smi: Use a general config_port interface
Date: Sat, 17 Nov 2018 10:35:30 +0800	[thread overview]
Message-ID: <1542422142-30688-4-git-send-email-yong.wu@mediatek.com> (raw)
In-Reply-To: <1542422142-30688-1-git-send-email-yong.wu@mediatek.com>

The config_port of mt2712 and mt8183 are the same. Use a general
config_port interface instead.

In addition, in mt2712, larb8 and larb9 are the bdpsys larbs which
are not the normal larb, their register space are different from the
normal one. thus, we can not call the general config_port. In mt8183,
IPU0/1 and CCU connect with smi-common directly, they also are not
the normal larb. Hence, we add a "larb_special_mask" for these special
larbs.

This is also a prepare patch for adding mt8183 SMI support.

Signed-off-by: Yong Wu <yong.wu@mediatek.com>
---
 drivers/memory/mtk-smi.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/drivers/memory/mtk-smi.c b/drivers/memory/mtk-smi.c
index 8f2d152..e37e54b 100644
--- a/drivers/memory/mtk-smi.c
+++ b/drivers/memory/mtk-smi.c
@@ -53,6 +53,7 @@ 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_special_mask; /* The special larbs mask. */
 };
 
 struct mtk_smi {
@@ -176,17 +177,13 @@ void mtk_smi_larb_put(struct device *larbdev)
 	return -ENODEV;
 }
 
-static void mtk_smi_larb_config_port_mt2712(struct device *dev)
+static void mtk_smi_larb_config_port_gen2_general(struct device *dev)
 {
 	struct mtk_smi_larb *larb = dev_get_drvdata(dev);
 	u32 reg;
 	int i;
 
-	/*
-	 * larb 8/9 is the bdpsys larb, the iommu_en is enabled defaultly.
-	 * Don't need to set it again.
-	 */
-	if (larb->larbid == 8 || larb->larbid == 9)
+	if (BIT(larb->larbid) & larb->larb_gen->larb_special_mask)
 		return;
 
 	for_each_set_bit(i, (unsigned long *)larb->mmu, 32) {
@@ -261,7 +258,8 @@ 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_mt2712,
+	.config_port = mtk_smi_larb_config_port_gen2_general,
+	.larb_special_mask = BIT(8) | BIT(9), /* bdpsys */
 };
 
 static const struct of_device_id mtk_smi_larb_of_ids[] = {
-- 
1.9.1

WARNING: multiple messages have this Message-ID (diff)
From: yong.wu@mediatek.com (Yong Wu)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 03/15] memory: mtk-smi: Use a general config_port interface
Date: Sat, 17 Nov 2018 10:35:30 +0800	[thread overview]
Message-ID: <1542422142-30688-4-git-send-email-yong.wu@mediatek.com> (raw)
In-Reply-To: <1542422142-30688-1-git-send-email-yong.wu@mediatek.com>

The config_port of mt2712 and mt8183 are the same. Use a general
config_port interface instead.

In addition, in mt2712, larb8 and larb9 are the bdpsys larbs which
are not the normal larb, their register space are different from the
normal one. thus, we can not call the general config_port. In mt8183,
IPU0/1 and CCU connect with smi-common directly, they also are not
the normal larb. Hence, we add a "larb_special_mask" for these special
larbs.

This is also a prepare patch for adding mt8183 SMI support.

Signed-off-by: Yong Wu <yong.wu@mediatek.com>
---
 drivers/memory/mtk-smi.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/drivers/memory/mtk-smi.c b/drivers/memory/mtk-smi.c
index 8f2d152..e37e54b 100644
--- a/drivers/memory/mtk-smi.c
+++ b/drivers/memory/mtk-smi.c
@@ -53,6 +53,7 @@ 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_special_mask; /* The special larbs mask. */
 };
 
 struct mtk_smi {
@@ -176,17 +177,13 @@ void mtk_smi_larb_put(struct device *larbdev)
 	return -ENODEV;
 }
 
-static void mtk_smi_larb_config_port_mt2712(struct device *dev)
+static void mtk_smi_larb_config_port_gen2_general(struct device *dev)
 {
 	struct mtk_smi_larb *larb = dev_get_drvdata(dev);
 	u32 reg;
 	int i;
 
-	/*
-	 * larb 8/9 is the bdpsys larb, the iommu_en is enabled defaultly.
-	 * Don't need to set it again.
-	 */
-	if (larb->larbid == 8 || larb->larbid == 9)
+	if (BIT(larb->larbid) & larb->larb_gen->larb_special_mask)
 		return;
 
 	for_each_set_bit(i, (unsigned long *)larb->mmu, 32) {
@@ -261,7 +258,8 @@ 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_mt2712,
+	.config_port = mtk_smi_larb_config_port_gen2_general,
+	.larb_special_mask = BIT(8) | BIT(9), /* bdpsys */
 };
 
 static const struct of_device_id mtk_smi_larb_of_ids[] = {
-- 
1.9.1

  parent reply	other threads:[~2018-11-17  2:37 UTC|newest]

Thread overview: 72+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-17  2:35 [PATCH v3 00/15] MT8183 IOMMU SUPPORT Yong Wu
2018-11-17  2:35 ` Yong Wu
2018-11-17  2:35 ` Yong Wu
2018-11-17  2:35 ` [PATCH v3 01/15] dt-bindings: mediatek: Add binding for mt8183 IOMMU and SMI Yong Wu
2018-11-17  2:35   ` Yong Wu
2018-11-17  2:35   ` Yong Wu
2018-11-17  2:35 ` [PATCH v3 02/15] iommu/mediatek: Use a struct as the platform data Yong Wu
2018-11-17  2:35   ` Yong Wu
2018-11-17  2:35   ` Yong Wu
2018-11-17  2:35 ` Yong Wu [this message]
2018-11-17  2:35   ` [PATCH v3 03/15] memory: mtk-smi: Use a general config_port interface Yong Wu
2018-11-17  2:35   ` Yong Wu
2018-11-17  2:35 ` [PATCH v3 04/15] iommu/io-pgtable-arm-v7s: Add paddr_to_iopte and iopte_to_paddr helpers Yong Wu
2018-11-17  2:35   ` Yong Wu
2018-11-17  2:35   ` Yong Wu
2018-11-17  2:35 ` [PATCH v3 05/15] iommu/io-pgtable-arm-v7s: Extend MediaTek 4GB Mode Yong Wu
2018-11-17  2:35   ` Yong Wu
2018-11-17  2:35   ` Yong Wu
2018-11-17  2:35 ` [PATCH v3 06/15] iommu/mediatek: Add mt8183 IOMMU support Yong Wu
2018-11-17  2:35   ` Yong Wu
2018-11-17  2:35   ` Yong Wu
2018-12-02 23:56   ` Matthias Brugger
2018-12-02 23:56     ` Matthias Brugger
2018-12-02 23:56     ` Matthias Brugger
2018-12-03  8:40     ` Yong Wu
2018-12-03  8:40       ` Yong Wu
2018-12-03  8:40       ` Yong Wu
2018-11-17  2:35 ` [PATCH v3 07/15] iommu/mediatek: Add mmu1 support Yong Wu
2018-11-17  2:35   ` Yong Wu
2018-11-17  2:35   ` Yong Wu
2018-11-17  2:35 ` [PATCH v3 08/15] memory: mtk-smi: Invoke pm runtime_callback to enable clocks Yong Wu
2018-11-17  2:35   ` Yong Wu
2018-11-17  2:35   ` Yong Wu
2018-11-17  2:35 ` [PATCH v3 09/15] memory: mtk-smi: Use a struct for the platform data for smi-common Yong Wu
2018-11-17  2:35   ` Yong Wu
2018-11-17  2:35   ` Yong Wu
2018-11-17  2:35 ` [PATCH v3 10/15] memory: mtk-smi: Add bus_sel for mt8183 Yong Wu
2018-11-17  2:35   ` Yong Wu
2018-11-17  2:35   ` Yong Wu
2018-11-23  2:59   ` Yong Wu
2018-11-23  2:59     ` Yong Wu
2018-11-23  2:59     ` Yong Wu
2018-11-17  2:35 ` [PATCH v3 11/15] iommu/mediatek: Add VLD_PA_RANGE register backup when suspend Yong Wu
2018-11-17  2:35   ` Yong Wu
2018-11-17  2:35   ` Yong Wu
2018-11-17  2:35 ` [PATCH v3 12/15] iommu/mediatek: Add shutdown callback Yong Wu
2018-11-17  2:35   ` Yong Wu
2018-11-17  2:35   ` Yong Wu
2018-11-17  2:35 ` [PATCH v3 13/15] memory: mtk-smi: Get rid of need_larbid Yong Wu
2018-11-17  2:35   ` Yong Wu
2018-11-17  2:35   ` Yong Wu
2018-12-02 23:04   ` Matthias Brugger
2018-12-02 23:04     ` Matthias Brugger
2018-12-03  8:40     ` Yong Wu
2018-12-03  8:40       ` Yong Wu
2018-12-03  8:40       ` Yong Wu
2018-11-17  2:35 ` [PATCH v3 14/15] iommu/mediatek: Constify iommu_ops Yong Wu
2018-11-17  2:35   ` Yong Wu
2018-11-17  2:35   ` Yong Wu
2018-11-17  2:35 ` [PATCH v3 15/15] iommu/mediatek: Switch to SPDX license identifier Yong Wu
2018-11-17  2:35   ` Yong Wu
2018-11-17  2:35   ` Yong Wu
2018-11-22 12:59 ` [PATCH v3 00/15] MT8183 IOMMU SUPPORT Joerg Roedel
2018-11-22 12:59   ` Joerg Roedel
2018-11-22 13:35   ` Will Deacon
2018-11-22 13:35     ` Will Deacon
2018-11-22 13:35     ` Will Deacon
2018-11-22 13:42     ` Joerg Roedel
2018-11-22 13:42       ` Joerg Roedel
2018-11-23  2:55     ` Yong Wu
2018-11-23  2:55       ` Yong Wu
2018-11-23  2:55       ` 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=1542422142-30688-4-git-send-email-yong.wu@mediatek.com \
    --to=yong.wu@mediatek.com \
    --cc=arnd@arndb.de \
    --cc=arvind.yadav.cs@gmail.com \
    --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: link
Be 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.