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>,
	Rob Herring <robh+dt@kernel.org>, Will Deacon <will@kernel.org>,
	Robin Murphy <robin.murphy@arm.com>
Cc: Krzysztof Kozlowski <krzk@kernel.org>,
	Evan Green <evgreen@chromium.org>, Tomasz Figa <tfiga@google.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>, <yong.wu@mediatek.com>,
	<youlin.pei@mediatek.com>,
	Nicolas Boichat <drinkcat@chromium.org>, <anan.sun@mediatek.com>,
	<chao.hao@mediatek.com>, Greg Kroah-Hartman <gregkh@google.com>,
	<kernel-team@android.com>
Subject: [PATCH v4 15/24] iommu/mediatek: Add power-domain operation
Date: Wed, 11 Nov 2020 20:38:29 +0800	[thread overview]
Message-ID: <20201111123838.15682-16-yong.wu@mediatek.com> (raw)
In-Reply-To: <20201111123838.15682-1-yong.wu@mediatek.com>

In the previous SoC, the M4U HW is in the EMI power domain which is
always on. the latest M4U is in the display power domain which may be
turned on/off, thus we have to add pm_runtime interface for it.

When the engine work, the engine always enable the power and clocks for
smi-larb/smi-common, then the M4U's power will always be powered on
automatically via the device link with smi-common.

Note: we don't enable the M4U power in iommu_map/unmap for tlb flush.
If its power already is on, of course it is ok. if the power is off,
the main tlb will be reset while M4U power on, thus the tlb flush while
m4u power off is unnecessary, just skip it.

There will be one case that pm runctime status is not expected when tlb
flush. After boot, the display may call dma_alloc_attrs before it call
pm_runtime_get(disp-dev), then the m4u's pm status is not active inside
the dma_alloc_attrs. Since it only happens after boot, the tlb is clean
at that time, I also think this is ok.

Signed-off-by: Yong Wu <yong.wu@mediatek.com>
---
 drivers/iommu/mtk_iommu.c | 33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index fe16053eda48..90aae34f4da0 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -183,6 +183,8 @@ static void mtk_iommu_tlb_flush_all(void *cookie)
 	struct mtk_iommu_data *data = cookie;
 
 	for_each_m4u(data) {
+		if (!pm_runtime_active(data->dev))
+			continue;
 		writel_relaxed(F_INVLD_EN1 | F_INVLD_EN0,
 			       data->base + data->plat_data->inv_sel_reg);
 		writel_relaxed(F_ALL_INVLD, data->base + REG_MMU_INVALIDATE);
@@ -199,6 +201,10 @@ static void mtk_iommu_tlb_flush_range_sync(unsigned long iova, size_t size,
 	u32 tmp;
 
 	for_each_m4u(data) {
+		/* skip tlb flush when pm is not active. */
+		if (!pm_runtime_active(data->dev))
+			continue;
+
 		spin_lock_irqsave(&data->tlb_lock, flags);
 		writel_relaxed(F_INVLD_EN1 | F_INVLD_EN0,
 			       data->base + data->plat_data->inv_sel_reg);
@@ -383,6 +389,7 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,
 {
 	struct mtk_iommu_data *data = dev_iommu_priv_get(dev);
 	struct mtk_iommu_domain *dom = to_mtk_domain(domain);
+	struct device *m4udev = data->dev;
 	int ret;
 
 	if (!data)
@@ -390,12 +397,18 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,
 
 	/* Update the pgtable base address register of the M4U HW */
 	if (!data->m4u_dom) {
+		ret = pm_runtime_get_sync(m4udev);
+		if (ret < 0)
+			return ret;
 		ret = mtk_iommu_hw_init(data);
-		if (ret)
+		if (ret) {
+			pm_runtime_put(m4udev);
 			return ret;
+		}
 		data->m4u_dom = dom;
 		writel(dom->cfg.arm_v7s_cfg.ttbr & MMU_PT_ADDR_MASK,
 		       data->base + REG_MMU_PT_BASE_ADDR);
+		pm_runtime_put(m4udev);
 	}
 
 	mtk_iommu_config(data, dev, true);
@@ -746,10 +759,13 @@ static int mtk_iommu_probe(struct platform_device *pdev)
 	if (dev->pm_domain) {
 		struct device_link *link;
 
+		pm_runtime_enable(dev);
+
 		link = device_link_add(data->smicomm_dev, dev,
 				       DL_FLAG_STATELESS | DL_FLAG_PM_RUNTIME);
 		if (!link) {
 			dev_err(dev, "Unable link %s.\n", dev_name(data->smicomm_dev));
+			pm_runtime_disable(dev);
 			return -EINVAL;
 		}
 	}
@@ -779,8 +795,10 @@ static int mtk_iommu_probe(struct platform_device *pdev)
 out_sysfs_remove:
 	iommu_device_sysfs_remove(&data->iommu);
 out_link_remove:
-	if (dev->pm_domain)
+	if (dev->pm_domain) {
 		device_link_remove(data->smicomm_dev, dev);
+		pm_runtime_disable(dev);
+	}
 	return ret;
 }
 
@@ -795,8 +813,10 @@ static int mtk_iommu_remove(struct platform_device *pdev)
 		bus_set_iommu(&platform_bus_type, NULL);
 
 	clk_disable_unprepare(data->bclk);
-	if (pdev->dev.pm_domain)
+	if (pdev->dev.pm_domain) {
 		device_link_remove(data->smicomm_dev, &pdev->dev);
+		pm_runtime_disable(&pdev->dev);
+	}
 	devm_free_irq(&pdev->dev, data->irq, data);
 	component_master_del(&pdev->dev, &mtk_iommu_com_ops);
 	return 0;
@@ -828,6 +848,9 @@ static int __maybe_unused mtk_iommu_runtime_resume(struct device *dev)
 	void __iomem *base = data->base;
 	int ret;
 
+	/* Avoid first resume to affect the default value of registers below. */
+	if (!m4u_dom)
+		return 0;
 	ret = clk_prepare_enable(data->bclk);
 	if (ret) {
 		dev_err(data->dev, "Failed to enable clk(%d) in resume\n", ret);
@@ -841,9 +864,7 @@ static int __maybe_unused mtk_iommu_runtime_resume(struct device *dev)
 	writel_relaxed(reg->int_main_control, base + REG_MMU_INT_MAIN_CONTROL);
 	writel_relaxed(reg->ivrp_paddr, base + REG_MMU_IVRP_PADDR);
 	writel_relaxed(reg->vld_pa_rng, base + REG_MMU_VLD_PA_RNG);
-	if (m4u_dom)
-		writel(m4u_dom->cfg.arm_v7s_cfg.ttbr & MMU_PT_ADDR_MASK,
-		       base + REG_MMU_PT_BASE_ADDR);
+	writel(m4u_dom->cfg.arm_v7s_cfg.ttbr & MMU_PT_ADDR_MASK, base + REG_MMU_PT_BASE_ADDR);
 	return 0;
 }
 
-- 
2.18.0


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>,
	 Rob Herring <robh+dt@kernel.org>, Will Deacon <will@kernel.org>,
	Robin Murphy <robin.murphy@arm.com>
Cc: youlin.pei@mediatek.com, devicetree@vger.kernel.org,
	Nicolas Boichat <drinkcat@chromium.org>,
	srv_heupstream@mediatek.com, chao.hao@mediatek.com,
	kernel-team@android.com, linux-kernel@vger.kernel.org,
	Evan Green <evgreen@chromium.org>, Tomasz Figa <tfiga@google.com>,
	iommu@lists.linux-foundation.org,
	linux-mediatek@lists.infradead.org,
	Krzysztof Kozlowski <krzk@kernel.org>,
	anan.sun@mediatek.com, Greg Kroah-Hartman <gregkh@google.com>,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 15/24] iommu/mediatek: Add power-domain operation
Date: Wed, 11 Nov 2020 20:38:29 +0800	[thread overview]
Message-ID: <20201111123838.15682-16-yong.wu@mediatek.com> (raw)
In-Reply-To: <20201111123838.15682-1-yong.wu@mediatek.com>

In the previous SoC, the M4U HW is in the EMI power domain which is
always on. the latest M4U is in the display power domain which may be
turned on/off, thus we have to add pm_runtime interface for it.

When the engine work, the engine always enable the power and clocks for
smi-larb/smi-common, then the M4U's power will always be powered on
automatically via the device link with smi-common.

Note: we don't enable the M4U power in iommu_map/unmap for tlb flush.
If its power already is on, of course it is ok. if the power is off,
the main tlb will be reset while M4U power on, thus the tlb flush while
m4u power off is unnecessary, just skip it.

There will be one case that pm runctime status is not expected when tlb
flush. After boot, the display may call dma_alloc_attrs before it call
pm_runtime_get(disp-dev), then the m4u's pm status is not active inside
the dma_alloc_attrs. Since it only happens after boot, the tlb is clean
at that time, I also think this is ok.

Signed-off-by: Yong Wu <yong.wu@mediatek.com>
---
 drivers/iommu/mtk_iommu.c | 33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index fe16053eda48..90aae34f4da0 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -183,6 +183,8 @@ static void mtk_iommu_tlb_flush_all(void *cookie)
 	struct mtk_iommu_data *data = cookie;
 
 	for_each_m4u(data) {
+		if (!pm_runtime_active(data->dev))
+			continue;
 		writel_relaxed(F_INVLD_EN1 | F_INVLD_EN0,
 			       data->base + data->plat_data->inv_sel_reg);
 		writel_relaxed(F_ALL_INVLD, data->base + REG_MMU_INVALIDATE);
@@ -199,6 +201,10 @@ static void mtk_iommu_tlb_flush_range_sync(unsigned long iova, size_t size,
 	u32 tmp;
 
 	for_each_m4u(data) {
+		/* skip tlb flush when pm is not active. */
+		if (!pm_runtime_active(data->dev))
+			continue;
+
 		spin_lock_irqsave(&data->tlb_lock, flags);
 		writel_relaxed(F_INVLD_EN1 | F_INVLD_EN0,
 			       data->base + data->plat_data->inv_sel_reg);
@@ -383,6 +389,7 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,
 {
 	struct mtk_iommu_data *data = dev_iommu_priv_get(dev);
 	struct mtk_iommu_domain *dom = to_mtk_domain(domain);
+	struct device *m4udev = data->dev;
 	int ret;
 
 	if (!data)
@@ -390,12 +397,18 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,
 
 	/* Update the pgtable base address register of the M4U HW */
 	if (!data->m4u_dom) {
+		ret = pm_runtime_get_sync(m4udev);
+		if (ret < 0)
+			return ret;
 		ret = mtk_iommu_hw_init(data);
-		if (ret)
+		if (ret) {
+			pm_runtime_put(m4udev);
 			return ret;
+		}
 		data->m4u_dom = dom;
 		writel(dom->cfg.arm_v7s_cfg.ttbr & MMU_PT_ADDR_MASK,
 		       data->base + REG_MMU_PT_BASE_ADDR);
+		pm_runtime_put(m4udev);
 	}
 
 	mtk_iommu_config(data, dev, true);
@@ -746,10 +759,13 @@ static int mtk_iommu_probe(struct platform_device *pdev)
 	if (dev->pm_domain) {
 		struct device_link *link;
 
+		pm_runtime_enable(dev);
+
 		link = device_link_add(data->smicomm_dev, dev,
 				       DL_FLAG_STATELESS | DL_FLAG_PM_RUNTIME);
 		if (!link) {
 			dev_err(dev, "Unable link %s.\n", dev_name(data->smicomm_dev));
+			pm_runtime_disable(dev);
 			return -EINVAL;
 		}
 	}
@@ -779,8 +795,10 @@ static int mtk_iommu_probe(struct platform_device *pdev)
 out_sysfs_remove:
 	iommu_device_sysfs_remove(&data->iommu);
 out_link_remove:
-	if (dev->pm_domain)
+	if (dev->pm_domain) {
 		device_link_remove(data->smicomm_dev, dev);
+		pm_runtime_disable(dev);
+	}
 	return ret;
 }
 
@@ -795,8 +813,10 @@ static int mtk_iommu_remove(struct platform_device *pdev)
 		bus_set_iommu(&platform_bus_type, NULL);
 
 	clk_disable_unprepare(data->bclk);
-	if (pdev->dev.pm_domain)
+	if (pdev->dev.pm_domain) {
 		device_link_remove(data->smicomm_dev, &pdev->dev);
+		pm_runtime_disable(&pdev->dev);
+	}
 	devm_free_irq(&pdev->dev, data->irq, data);
 	component_master_del(&pdev->dev, &mtk_iommu_com_ops);
 	return 0;
@@ -828,6 +848,9 @@ static int __maybe_unused mtk_iommu_runtime_resume(struct device *dev)
 	void __iomem *base = data->base;
 	int ret;
 
+	/* Avoid first resume to affect the default value of registers below. */
+	if (!m4u_dom)
+		return 0;
 	ret = clk_prepare_enable(data->bclk);
 	if (ret) {
 		dev_err(data->dev, "Failed to enable clk(%d) in resume\n", ret);
@@ -841,9 +864,7 @@ static int __maybe_unused mtk_iommu_runtime_resume(struct device *dev)
 	writel_relaxed(reg->int_main_control, base + REG_MMU_INT_MAIN_CONTROL);
 	writel_relaxed(reg->ivrp_paddr, base + REG_MMU_IVRP_PADDR);
 	writel_relaxed(reg->vld_pa_rng, base + REG_MMU_VLD_PA_RNG);
-	if (m4u_dom)
-		writel(m4u_dom->cfg.arm_v7s_cfg.ttbr & MMU_PT_ADDR_MASK,
-		       base + REG_MMU_PT_BASE_ADDR);
+	writel(m4u_dom->cfg.arm_v7s_cfg.ttbr & MMU_PT_ADDR_MASK, base + REG_MMU_PT_BASE_ADDR);
 	return 0;
 }
 
-- 
2.18.0

_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

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>,
	 Rob Herring <robh+dt@kernel.org>, Will Deacon <will@kernel.org>,
	Robin Murphy <robin.murphy@arm.com>
Cc: youlin.pei@mediatek.com, devicetree@vger.kernel.org,
	Nicolas Boichat <drinkcat@chromium.org>,
	srv_heupstream@mediatek.com, chao.hao@mediatek.com,
	kernel-team@android.com, linux-kernel@vger.kernel.org,
	Evan Green <evgreen@chromium.org>,
	yong.wu@mediatek.com, Tomasz Figa <tfiga@google.com>,
	iommu@lists.linux-foundation.org,
	linux-mediatek@lists.infradead.org,
	Krzysztof Kozlowski <krzk@kernel.org>,
	anan.sun@mediatek.com, Greg Kroah-Hartman <gregkh@google.com>,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 15/24] iommu/mediatek: Add power-domain operation
Date: Wed, 11 Nov 2020 20:38:29 +0800	[thread overview]
Message-ID: <20201111123838.15682-16-yong.wu@mediatek.com> (raw)
In-Reply-To: <20201111123838.15682-1-yong.wu@mediatek.com>

In the previous SoC, the M4U HW is in the EMI power domain which is
always on. the latest M4U is in the display power domain which may be
turned on/off, thus we have to add pm_runtime interface for it.

When the engine work, the engine always enable the power and clocks for
smi-larb/smi-common, then the M4U's power will always be powered on
automatically via the device link with smi-common.

Note: we don't enable the M4U power in iommu_map/unmap for tlb flush.
If its power already is on, of course it is ok. if the power is off,
the main tlb will be reset while M4U power on, thus the tlb flush while
m4u power off is unnecessary, just skip it.

There will be one case that pm runctime status is not expected when tlb
flush. After boot, the display may call dma_alloc_attrs before it call
pm_runtime_get(disp-dev), then the m4u's pm status is not active inside
the dma_alloc_attrs. Since it only happens after boot, the tlb is clean
at that time, I also think this is ok.

Signed-off-by: Yong Wu <yong.wu@mediatek.com>
---
 drivers/iommu/mtk_iommu.c | 33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index fe16053eda48..90aae34f4da0 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -183,6 +183,8 @@ static void mtk_iommu_tlb_flush_all(void *cookie)
 	struct mtk_iommu_data *data = cookie;
 
 	for_each_m4u(data) {
+		if (!pm_runtime_active(data->dev))
+			continue;
 		writel_relaxed(F_INVLD_EN1 | F_INVLD_EN0,
 			       data->base + data->plat_data->inv_sel_reg);
 		writel_relaxed(F_ALL_INVLD, data->base + REG_MMU_INVALIDATE);
@@ -199,6 +201,10 @@ static void mtk_iommu_tlb_flush_range_sync(unsigned long iova, size_t size,
 	u32 tmp;
 
 	for_each_m4u(data) {
+		/* skip tlb flush when pm is not active. */
+		if (!pm_runtime_active(data->dev))
+			continue;
+
 		spin_lock_irqsave(&data->tlb_lock, flags);
 		writel_relaxed(F_INVLD_EN1 | F_INVLD_EN0,
 			       data->base + data->plat_data->inv_sel_reg);
@@ -383,6 +389,7 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,
 {
 	struct mtk_iommu_data *data = dev_iommu_priv_get(dev);
 	struct mtk_iommu_domain *dom = to_mtk_domain(domain);
+	struct device *m4udev = data->dev;
 	int ret;
 
 	if (!data)
@@ -390,12 +397,18 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,
 
 	/* Update the pgtable base address register of the M4U HW */
 	if (!data->m4u_dom) {
+		ret = pm_runtime_get_sync(m4udev);
+		if (ret < 0)
+			return ret;
 		ret = mtk_iommu_hw_init(data);
-		if (ret)
+		if (ret) {
+			pm_runtime_put(m4udev);
 			return ret;
+		}
 		data->m4u_dom = dom;
 		writel(dom->cfg.arm_v7s_cfg.ttbr & MMU_PT_ADDR_MASK,
 		       data->base + REG_MMU_PT_BASE_ADDR);
+		pm_runtime_put(m4udev);
 	}
 
 	mtk_iommu_config(data, dev, true);
@@ -746,10 +759,13 @@ static int mtk_iommu_probe(struct platform_device *pdev)
 	if (dev->pm_domain) {
 		struct device_link *link;
 
+		pm_runtime_enable(dev);
+
 		link = device_link_add(data->smicomm_dev, dev,
 				       DL_FLAG_STATELESS | DL_FLAG_PM_RUNTIME);
 		if (!link) {
 			dev_err(dev, "Unable link %s.\n", dev_name(data->smicomm_dev));
+			pm_runtime_disable(dev);
 			return -EINVAL;
 		}
 	}
@@ -779,8 +795,10 @@ static int mtk_iommu_probe(struct platform_device *pdev)
 out_sysfs_remove:
 	iommu_device_sysfs_remove(&data->iommu);
 out_link_remove:
-	if (dev->pm_domain)
+	if (dev->pm_domain) {
 		device_link_remove(data->smicomm_dev, dev);
+		pm_runtime_disable(dev);
+	}
 	return ret;
 }
 
@@ -795,8 +813,10 @@ static int mtk_iommu_remove(struct platform_device *pdev)
 		bus_set_iommu(&platform_bus_type, NULL);
 
 	clk_disable_unprepare(data->bclk);
-	if (pdev->dev.pm_domain)
+	if (pdev->dev.pm_domain) {
 		device_link_remove(data->smicomm_dev, &pdev->dev);
+		pm_runtime_disable(&pdev->dev);
+	}
 	devm_free_irq(&pdev->dev, data->irq, data);
 	component_master_del(&pdev->dev, &mtk_iommu_com_ops);
 	return 0;
@@ -828,6 +848,9 @@ static int __maybe_unused mtk_iommu_runtime_resume(struct device *dev)
 	void __iomem *base = data->base;
 	int ret;
 
+	/* Avoid first resume to affect the default value of registers below. */
+	if (!m4u_dom)
+		return 0;
 	ret = clk_prepare_enable(data->bclk);
 	if (ret) {
 		dev_err(data->dev, "Failed to enable clk(%d) in resume\n", ret);
@@ -841,9 +864,7 @@ static int __maybe_unused mtk_iommu_runtime_resume(struct device *dev)
 	writel_relaxed(reg->int_main_control, base + REG_MMU_INT_MAIN_CONTROL);
 	writel_relaxed(reg->ivrp_paddr, base + REG_MMU_IVRP_PADDR);
 	writel_relaxed(reg->vld_pa_rng, base + REG_MMU_VLD_PA_RNG);
-	if (m4u_dom)
-		writel(m4u_dom->cfg.arm_v7s_cfg.ttbr & MMU_PT_ADDR_MASK,
-		       base + REG_MMU_PT_BASE_ADDR);
+	writel(m4u_dom->cfg.arm_v7s_cfg.ttbr & MMU_PT_ADDR_MASK, base + REG_MMU_PT_BASE_ADDR);
 	return 0;
 }
 
-- 
2.18.0
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek

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>,
	 Rob Herring <robh+dt@kernel.org>, Will Deacon <will@kernel.org>,
	Robin Murphy <robin.murphy@arm.com>
Cc: youlin.pei@mediatek.com, devicetree@vger.kernel.org,
	Nicolas Boichat <drinkcat@chromium.org>,
	srv_heupstream@mediatek.com, chao.hao@mediatek.com,
	kernel-team@android.com, linux-kernel@vger.kernel.org,
	Evan Green <evgreen@chromium.org>,
	yong.wu@mediatek.com, Tomasz Figa <tfiga@google.com>,
	iommu@lists.linux-foundation.org,
	linux-mediatek@lists.infradead.org,
	Krzysztof Kozlowski <krzk@kernel.org>,
	anan.sun@mediatek.com, Greg Kroah-Hartman <gregkh@google.com>,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 15/24] iommu/mediatek: Add power-domain operation
Date: Wed, 11 Nov 2020 20:38:29 +0800	[thread overview]
Message-ID: <20201111123838.15682-16-yong.wu@mediatek.com> (raw)
In-Reply-To: <20201111123838.15682-1-yong.wu@mediatek.com>

In the previous SoC, the M4U HW is in the EMI power domain which is
always on. the latest M4U is in the display power domain which may be
turned on/off, thus we have to add pm_runtime interface for it.

When the engine work, the engine always enable the power and clocks for
smi-larb/smi-common, then the M4U's power will always be powered on
automatically via the device link with smi-common.

Note: we don't enable the M4U power in iommu_map/unmap for tlb flush.
If its power already is on, of course it is ok. if the power is off,
the main tlb will be reset while M4U power on, thus the tlb flush while
m4u power off is unnecessary, just skip it.

There will be one case that pm runctime status is not expected when tlb
flush. After boot, the display may call dma_alloc_attrs before it call
pm_runtime_get(disp-dev), then the m4u's pm status is not active inside
the dma_alloc_attrs. Since it only happens after boot, the tlb is clean
at that time, I also think this is ok.

Signed-off-by: Yong Wu <yong.wu@mediatek.com>
---
 drivers/iommu/mtk_iommu.c | 33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index fe16053eda48..90aae34f4da0 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -183,6 +183,8 @@ static void mtk_iommu_tlb_flush_all(void *cookie)
 	struct mtk_iommu_data *data = cookie;
 
 	for_each_m4u(data) {
+		if (!pm_runtime_active(data->dev))
+			continue;
 		writel_relaxed(F_INVLD_EN1 | F_INVLD_EN0,
 			       data->base + data->plat_data->inv_sel_reg);
 		writel_relaxed(F_ALL_INVLD, data->base + REG_MMU_INVALIDATE);
@@ -199,6 +201,10 @@ static void mtk_iommu_tlb_flush_range_sync(unsigned long iova, size_t size,
 	u32 tmp;
 
 	for_each_m4u(data) {
+		/* skip tlb flush when pm is not active. */
+		if (!pm_runtime_active(data->dev))
+			continue;
+
 		spin_lock_irqsave(&data->tlb_lock, flags);
 		writel_relaxed(F_INVLD_EN1 | F_INVLD_EN0,
 			       data->base + data->plat_data->inv_sel_reg);
@@ -383,6 +389,7 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,
 {
 	struct mtk_iommu_data *data = dev_iommu_priv_get(dev);
 	struct mtk_iommu_domain *dom = to_mtk_domain(domain);
+	struct device *m4udev = data->dev;
 	int ret;
 
 	if (!data)
@@ -390,12 +397,18 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,
 
 	/* Update the pgtable base address register of the M4U HW */
 	if (!data->m4u_dom) {
+		ret = pm_runtime_get_sync(m4udev);
+		if (ret < 0)
+			return ret;
 		ret = mtk_iommu_hw_init(data);
-		if (ret)
+		if (ret) {
+			pm_runtime_put(m4udev);
 			return ret;
+		}
 		data->m4u_dom = dom;
 		writel(dom->cfg.arm_v7s_cfg.ttbr & MMU_PT_ADDR_MASK,
 		       data->base + REG_MMU_PT_BASE_ADDR);
+		pm_runtime_put(m4udev);
 	}
 
 	mtk_iommu_config(data, dev, true);
@@ -746,10 +759,13 @@ static int mtk_iommu_probe(struct platform_device *pdev)
 	if (dev->pm_domain) {
 		struct device_link *link;
 
+		pm_runtime_enable(dev);
+
 		link = device_link_add(data->smicomm_dev, dev,
 				       DL_FLAG_STATELESS | DL_FLAG_PM_RUNTIME);
 		if (!link) {
 			dev_err(dev, "Unable link %s.\n", dev_name(data->smicomm_dev));
+			pm_runtime_disable(dev);
 			return -EINVAL;
 		}
 	}
@@ -779,8 +795,10 @@ static int mtk_iommu_probe(struct platform_device *pdev)
 out_sysfs_remove:
 	iommu_device_sysfs_remove(&data->iommu);
 out_link_remove:
-	if (dev->pm_domain)
+	if (dev->pm_domain) {
 		device_link_remove(data->smicomm_dev, dev);
+		pm_runtime_disable(dev);
+	}
 	return ret;
 }
 
@@ -795,8 +813,10 @@ static int mtk_iommu_remove(struct platform_device *pdev)
 		bus_set_iommu(&platform_bus_type, NULL);
 
 	clk_disable_unprepare(data->bclk);
-	if (pdev->dev.pm_domain)
+	if (pdev->dev.pm_domain) {
 		device_link_remove(data->smicomm_dev, &pdev->dev);
+		pm_runtime_disable(&pdev->dev);
+	}
 	devm_free_irq(&pdev->dev, data->irq, data);
 	component_master_del(&pdev->dev, &mtk_iommu_com_ops);
 	return 0;
@@ -828,6 +848,9 @@ static int __maybe_unused mtk_iommu_runtime_resume(struct device *dev)
 	void __iomem *base = data->base;
 	int ret;
 
+	/* Avoid first resume to affect the default value of registers below. */
+	if (!m4u_dom)
+		return 0;
 	ret = clk_prepare_enable(data->bclk);
 	if (ret) {
 		dev_err(data->dev, "Failed to enable clk(%d) in resume\n", ret);
@@ -841,9 +864,7 @@ static int __maybe_unused mtk_iommu_runtime_resume(struct device *dev)
 	writel_relaxed(reg->int_main_control, base + REG_MMU_INT_MAIN_CONTROL);
 	writel_relaxed(reg->ivrp_paddr, base + REG_MMU_IVRP_PADDR);
 	writel_relaxed(reg->vld_pa_rng, base + REG_MMU_VLD_PA_RNG);
-	if (m4u_dom)
-		writel(m4u_dom->cfg.arm_v7s_cfg.ttbr & MMU_PT_ADDR_MASK,
-		       base + REG_MMU_PT_BASE_ADDR);
+	writel(m4u_dom->cfg.arm_v7s_cfg.ttbr & MMU_PT_ADDR_MASK, base + REG_MMU_PT_BASE_ADDR);
 	return 0;
 }
 
-- 
2.18.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2020-11-11 12:41 UTC|newest]

Thread overview: 196+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-11 12:38 [PATCH v4 00/24] MT8192 IOMMU support Yong Wu
2020-11-11 12:38 ` Yong Wu
2020-11-11 12:38 ` Yong Wu
2020-11-11 12:38 ` Yong Wu
2020-11-11 12:38 ` [PATCH v4 01/24] dt-bindings: iommu: mediatek: Convert IOMMU to DT schema Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-16 17:43   ` Rob Herring
2020-11-16 17:43     ` Rob Herring
2020-11-16 17:43     ` Rob Herring
2020-11-16 17:43     ` Rob Herring
2020-11-11 12:38 ` [PATCH v4 02/24] dt-bindings: memory: mediatek: Add a common larb-port header file Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 21:30   ` Krzysztof Kozlowski
2020-11-11 21:30     ` Krzysztof Kozlowski
2020-11-11 21:30     ` Krzysztof Kozlowski
2020-11-11 21:30     ` Krzysztof Kozlowski
2020-11-11 12:38 ` [PATCH v4 03/24] dt-bindings: memory: mediatek: Extend LARB_NR_MAX to 32 Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 21:30   ` Krzysztof Kozlowski
2020-11-11 21:30     ` Krzysztof Kozlowski
2020-11-11 21:30     ` Krzysztof Kozlowski
2020-11-11 21:30     ` Krzysztof Kozlowski
2020-11-11 12:38 ` [PATCH v4 04/24] dt-bindings: memory: mediatek: Add domain definition Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 21:30   ` Krzysztof Kozlowski
2020-11-11 21:30     ` Krzysztof Kozlowski
2020-11-11 21:30     ` Krzysztof Kozlowski
2020-11-11 21:30     ` Krzysztof Kozlowski
2020-11-16 17:44   ` Rob Herring
2020-11-16 17:44     ` Rob Herring
2020-11-16 17:44     ` Rob Herring
2020-11-16 17:44     ` Rob Herring
2020-11-11 12:38 ` [PATCH v4 05/24] dt-bindings: mediatek: Add binding for mt8192 IOMMU Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 21:33   ` Krzysztof Kozlowski
2020-11-11 21:33     ` Krzysztof Kozlowski
2020-11-11 21:33     ` Krzysztof Kozlowski
2020-11-11 21:33     ` Krzysztof Kozlowski
2020-11-12  2:41     ` Yong Wu
2020-11-12  2:41       ` Yong Wu
2020-11-12  2:41       ` Yong Wu
2020-11-12  2:41       ` Yong Wu
2020-11-11 12:38 ` [PATCH v4 06/24] iommu/mediatek: Use the common mtk-smi-larb-port.h Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 21:33   ` Krzysztof Kozlowski
2020-11-11 21:33     ` Krzysztof Kozlowski
2020-11-11 21:33     ` Krzysztof Kozlowski
2020-11-11 21:33     ` Krzysztof Kozlowski
2020-11-11 12:38 ` [PATCH v4 07/24] iommu/io-pgtable-arm-v7s: Use ias to check the valid iova in unmap Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-26 15:41   ` Robin Murphy
2020-11-26 15:41     ` Robin Murphy
2020-11-26 15:41     ` Robin Murphy
2020-11-26 15:41     ` Robin Murphy
2020-11-11 12:38 ` [PATCH v4 08/24] iommu/io-pgtable-arm-v7s: Extend PA34 for MediaTek Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-26 15:49   ` Robin Murphy
2020-11-26 15:49     ` Robin Murphy
2020-11-26 15:49     ` Robin Murphy
2020-11-26 15:49     ` Robin Murphy
2020-11-11 12:38 ` [PATCH v4 09/24] iommu/io-pgtable-arm-v7s: Clear LVL_SHIFT/BITS macro instead of the formula Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-26 16:03   ` Robin Murphy
2020-11-26 16:03     ` Robin Murphy
2020-11-26 16:03     ` Robin Murphy
2020-11-26 16:03     ` Robin Murphy
2020-11-27  6:21     ` Yong Wu
2020-11-27  6:21       ` Yong Wu
2020-11-27  6:21       ` Yong Wu
2020-11-27  6:21       ` Yong Wu
2020-11-11 12:38 ` [PATCH v4 10/24] iommu/io-pgtable-arm-v7s: Add cfg as a param in some macros Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-26 16:09   ` Robin Murphy
2020-11-26 16:09     ` Robin Murphy
2020-11-26 16:09     ` Robin Murphy
2020-11-26 16:09     ` Robin Murphy
2020-11-11 12:38 ` [PATCH v4 11/24] iommu/io-pgtable-arm-v7s: Quad lvl1 pgtable for MediaTek Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-26 16:15   ` Robin Murphy
2020-11-26 16:15     ` Robin Murphy
2020-11-26 16:15     ` Robin Murphy
2020-11-26 16:15     ` Robin Murphy
2020-11-11 12:38 ` [PATCH v4 12/24] iommu/mediatek: Move hw_init into attach_device Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-26 16:43   ` Robin Murphy
2020-11-26 16:43     ` Robin Murphy
2020-11-26 16:43     ` Robin Murphy
2020-11-26 16:43     ` Robin Murphy
2020-11-27  6:23     ` Yong Wu
2020-11-27  6:23       ` Yong Wu
2020-11-27  6:23       ` Yong Wu
2020-11-27  6:23       ` Yong Wu
2020-11-11 12:38 ` [PATCH v4 13/24] iommu/mediatek: Add device link for smi-common and m4u Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-12  1:10   ` Nicolas Boichat
2020-11-12  1:10     ` Nicolas Boichat
2020-11-12  1:10     ` Nicolas Boichat
2020-11-12  1:10     ` Nicolas Boichat
2020-11-12  2:42     ` Yong Wu
2020-11-12  2:42       ` Yong Wu
2020-11-12  2:42       ` Yong Wu
2020-11-12  2:42       ` Yong Wu
2020-11-11 12:38 ` [PATCH v4 14/24] iommu/mediatek: Add pm runtime callback Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38 ` Yong Wu [this message]
2020-11-11 12:38   ` [PATCH v4 15/24] iommu/mediatek: Add power-domain operation Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38 ` [PATCH v4 16/24] iommu/mediatek: Add iova reserved function Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38 ` [PATCH v4 17/24] iommu/mediatek: Add single domain Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-26 17:11   ` Robin Murphy
2020-11-26 17:11     ` Robin Murphy
2020-11-26 17:11     ` Robin Murphy
2020-11-26 17:11     ` Robin Murphy
2020-11-27  6:21     ` Yong Wu
2020-11-27  6:21       ` Yong Wu
2020-11-27  6:21       ` Yong Wu
2020-11-27  6:21       ` Yong Wu
2020-11-11 12:38 ` [PATCH v4 18/24] iommu/mediatek: Support master use iova over 32bit Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 21:34   ` Krzysztof Kozlowski
2020-11-11 21:34     ` Krzysztof Kozlowski
2020-11-11 21:34     ` Krzysztof Kozlowski
2020-11-11 21:34     ` Krzysztof Kozlowski
2020-11-11 12:38 ` [PATCH v4 19/24] iommu/mediatek: Support up to 34bit iova in tlb flush Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38 ` [PATCH v4 20/24] iommu/mediatek: Support report iova 34bit translation fault in ISR Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-18  2:19   ` kernel test robot
2020-11-18  2:19     ` kernel test robot
2020-11-18  4:32   ` kernel test robot
2020-11-18  4:32     ` kernel test robot
2020-11-11 12:38 ` [PATCH v4 21/24] iommu/mediatek: Add support for multi domain Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38 ` [PATCH v4 22/24] iommu/mediatek: Adjust the structure Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38 ` [PATCH v4 23/24] iommu/mediatek: Add mt8192 support Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38 ` [PATCH v4 24/24] MAINTAINERS: Add entry for MediaTek IOMMU Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 12:38   ` Yong Wu
2020-11-11 16:52   ` Chun-Kuang Hu
2020-11-11 16:52     ` Chun-Kuang Hu
2020-11-11 16:52     ` Chun-Kuang Hu
2020-11-11 16:52     ` Chun-Kuang Hu
2020-11-25 12:23 ` [PATCH v4 00/24] MT8192 IOMMU support Will Deacon
2020-11-25 12:23   ` Will Deacon
2020-11-25 12:23   ` Will Deacon
2020-11-25 12:23   ` Will Deacon

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=20201111123838.15682-16-yong.wu@mediatek.com \
    --to=yong.wu@mediatek.com \
    --cc=anan.sun@mediatek.com \
    --cc=chao.hao@mediatek.com \
    --cc=devicetree@vger.kernel.org \
    --cc=drinkcat@chromium.org \
    --cc=evgreen@chromium.org \
    --cc=gregkh@google.com \
    --cc=iommu@lists.linux-foundation.org \
    --cc=joro@8bytes.org \
    --cc=kernel-team@android.com \
    --cc=krzk@kernel.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@kernel.org \
    --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.