From: Robin Murphy <robin.murphy@arm.com>
To: joro@8bytes.org, will@kernel.org
Cc: iommu@lists.linux-foundation.org, sven@svenpeter.dev,
robdclark@gmail.com, m.szyprowski@samsung.com,
baolu.lu@linux.intel.com, yong.wu@mediatek.com,
mjrosato@linux.ibm.com, gerald.schaefer@linux.ibm.com,
zhang.lyra@gmail.com, thierry.reding@gmail.com,
vdumpa@nvidia.com, jean-philippe@linaro.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 09/13] iommu/mtk: Clean up bus_set_iommu()
Date: Thu, 14 Apr 2022 13:42:38 +0100 [thread overview]
Message-ID: <cad5008c73c0d3ee1b31daa456f901ee9fbb8409.1649935679.git.robin.murphy@arm.com> (raw)
In-Reply-To: <cover.1649935679.git.robin.murphy@arm.com>
Stop calling bus_set_iommu() since it's now unnecessary, and simplify
the probe failure paths accordingly.
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
---
drivers/iommu/mtk_iommu.c | 13 +------------
drivers/iommu/mtk_iommu_v1.c | 13 +------------
2 files changed, 2 insertions(+), 24 deletions(-)
diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index 6fd75a60abd6..4278d9e032ad 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -920,19 +920,11 @@ static int mtk_iommu_probe(struct platform_device *pdev)
spin_lock_init(&data->tlb_lock);
list_add_tail(&data->list, &m4ulist);
- if (!iommu_present(&platform_bus_type)) {
- ret = bus_set_iommu(&platform_bus_type, &mtk_iommu_ops);
- if (ret)
- goto out_list_del;
- }
-
ret = component_master_add_with_match(dev, &mtk_iommu_com_ops, match);
if (ret)
- goto out_bus_set_null;
+ goto out_list_del;
return ret;
-out_bus_set_null:
- bus_set_iommu(&platform_bus_type, NULL);
out_list_del:
list_del(&data->list);
iommu_device_unregister(&data->iommu);
@@ -952,9 +944,6 @@ static int mtk_iommu_remove(struct platform_device *pdev)
iommu_device_sysfs_remove(&data->iommu);
iommu_device_unregister(&data->iommu);
- if (iommu_present(&platform_bus_type))
- bus_set_iommu(&platform_bus_type, NULL);
-
clk_disable_unprepare(data->bclk);
device_link_remove(data->smicomm_dev, &pdev->dev);
pm_runtime_disable(&pdev->dev);
diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c
index ecff800656e6..7d17d6a21803 100644
--- a/drivers/iommu/mtk_iommu_v1.c
+++ b/drivers/iommu/mtk_iommu_v1.c
@@ -660,19 +660,11 @@ static int mtk_iommu_probe(struct platform_device *pdev)
if (ret)
goto out_sysfs_remove;
- if (!iommu_present(&platform_bus_type)) {
- ret = bus_set_iommu(&platform_bus_type, &mtk_iommu_ops);
- if (ret)
- goto out_dev_unreg;
- }
-
ret = component_master_add_with_match(dev, &mtk_iommu_com_ops, match);
if (ret)
- goto out_bus_set_null;
+ goto out_dev_unreg;
return ret;
-out_bus_set_null:
- bus_set_iommu(&platform_bus_type, NULL);
out_dev_unreg:
iommu_device_unregister(&data->iommu);
out_sysfs_remove:
@@ -687,9 +679,6 @@ static int mtk_iommu_remove(struct platform_device *pdev)
iommu_device_sysfs_remove(&data->iommu);
iommu_device_unregister(&data->iommu);
- if (iommu_present(&platform_bus_type))
- bus_set_iommu(&platform_bus_type, NULL);
-
clk_disable_unprepare(data->bclk);
devm_free_irq(&pdev->dev, data->irq, data);
component_master_del(&pdev->dev, &mtk_iommu_com_ops);
--
2.28.0.dirty
WARNING: multiple messages have this Message-ID (diff)
From: Robin Murphy <robin.murphy@arm.com>
To: joro@8bytes.org, will@kernel.org
Cc: jean-philippe@linaro.org, zhang.lyra@gmail.com,
linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org,
thierry.reding@gmail.com, linux-arm-kernel@lists.infradead.org,
gerald.schaefer@linux.ibm.com
Subject: [PATCH 09/13] iommu/mtk: Clean up bus_set_iommu()
Date: Thu, 14 Apr 2022 13:42:38 +0100 [thread overview]
Message-ID: <cad5008c73c0d3ee1b31daa456f901ee9fbb8409.1649935679.git.robin.murphy@arm.com> (raw)
In-Reply-To: <cover.1649935679.git.robin.murphy@arm.com>
Stop calling bus_set_iommu() since it's now unnecessary, and simplify
the probe failure paths accordingly.
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
---
drivers/iommu/mtk_iommu.c | 13 +------------
drivers/iommu/mtk_iommu_v1.c | 13 +------------
2 files changed, 2 insertions(+), 24 deletions(-)
diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index 6fd75a60abd6..4278d9e032ad 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -920,19 +920,11 @@ static int mtk_iommu_probe(struct platform_device *pdev)
spin_lock_init(&data->tlb_lock);
list_add_tail(&data->list, &m4ulist);
- if (!iommu_present(&platform_bus_type)) {
- ret = bus_set_iommu(&platform_bus_type, &mtk_iommu_ops);
- if (ret)
- goto out_list_del;
- }
-
ret = component_master_add_with_match(dev, &mtk_iommu_com_ops, match);
if (ret)
- goto out_bus_set_null;
+ goto out_list_del;
return ret;
-out_bus_set_null:
- bus_set_iommu(&platform_bus_type, NULL);
out_list_del:
list_del(&data->list);
iommu_device_unregister(&data->iommu);
@@ -952,9 +944,6 @@ static int mtk_iommu_remove(struct platform_device *pdev)
iommu_device_sysfs_remove(&data->iommu);
iommu_device_unregister(&data->iommu);
- if (iommu_present(&platform_bus_type))
- bus_set_iommu(&platform_bus_type, NULL);
-
clk_disable_unprepare(data->bclk);
device_link_remove(data->smicomm_dev, &pdev->dev);
pm_runtime_disable(&pdev->dev);
diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c
index ecff800656e6..7d17d6a21803 100644
--- a/drivers/iommu/mtk_iommu_v1.c
+++ b/drivers/iommu/mtk_iommu_v1.c
@@ -660,19 +660,11 @@ static int mtk_iommu_probe(struct platform_device *pdev)
if (ret)
goto out_sysfs_remove;
- if (!iommu_present(&platform_bus_type)) {
- ret = bus_set_iommu(&platform_bus_type, &mtk_iommu_ops);
- if (ret)
- goto out_dev_unreg;
- }
-
ret = component_master_add_with_match(dev, &mtk_iommu_com_ops, match);
if (ret)
- goto out_bus_set_null;
+ goto out_dev_unreg;
return ret;
-out_bus_set_null:
- bus_set_iommu(&platform_bus_type, NULL);
out_dev_unreg:
iommu_device_unregister(&data->iommu);
out_sysfs_remove:
@@ -687,9 +679,6 @@ static int mtk_iommu_remove(struct platform_device *pdev)
iommu_device_sysfs_remove(&data->iommu);
iommu_device_unregister(&data->iommu);
- if (iommu_present(&platform_bus_type))
- bus_set_iommu(&platform_bus_type, NULL);
-
clk_disable_unprepare(data->bclk);
devm_free_irq(&pdev->dev, data->irq, data);
component_master_del(&pdev->dev, &mtk_iommu_com_ops);
--
2.28.0.dirty
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
WARNING: multiple messages have this Message-ID (diff)
From: Robin Murphy <robin.murphy@arm.com>
To: joro@8bytes.org, will@kernel.org
Cc: jean-philippe@linaro.org, mjrosato@linux.ibm.com,
sven@svenpeter.dev, zhang.lyra@gmail.com, robdclark@gmail.com,
linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org,
thierry.reding@gmail.com, linux-arm-kernel@lists.infradead.org,
gerald.schaefer@linux.ibm.com, baolu.lu@linux.intel.com,
yong.wu@mediatek.com, m.szyprowski@samsung.com
Subject: [PATCH 09/13] iommu/mtk: Clean up bus_set_iommu()
Date: Thu, 14 Apr 2022 13:42:38 +0100 [thread overview]
Message-ID: <cad5008c73c0d3ee1b31daa456f901ee9fbb8409.1649935679.git.robin.murphy@arm.com> (raw)
In-Reply-To: <cover.1649935679.git.robin.murphy@arm.com>
Stop calling bus_set_iommu() since it's now unnecessary, and simplify
the probe failure paths accordingly.
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
---
drivers/iommu/mtk_iommu.c | 13 +------------
drivers/iommu/mtk_iommu_v1.c | 13 +------------
2 files changed, 2 insertions(+), 24 deletions(-)
diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index 6fd75a60abd6..4278d9e032ad 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -920,19 +920,11 @@ static int mtk_iommu_probe(struct platform_device *pdev)
spin_lock_init(&data->tlb_lock);
list_add_tail(&data->list, &m4ulist);
- if (!iommu_present(&platform_bus_type)) {
- ret = bus_set_iommu(&platform_bus_type, &mtk_iommu_ops);
- if (ret)
- goto out_list_del;
- }
-
ret = component_master_add_with_match(dev, &mtk_iommu_com_ops, match);
if (ret)
- goto out_bus_set_null;
+ goto out_list_del;
return ret;
-out_bus_set_null:
- bus_set_iommu(&platform_bus_type, NULL);
out_list_del:
list_del(&data->list);
iommu_device_unregister(&data->iommu);
@@ -952,9 +944,6 @@ static int mtk_iommu_remove(struct platform_device *pdev)
iommu_device_sysfs_remove(&data->iommu);
iommu_device_unregister(&data->iommu);
- if (iommu_present(&platform_bus_type))
- bus_set_iommu(&platform_bus_type, NULL);
-
clk_disable_unprepare(data->bclk);
device_link_remove(data->smicomm_dev, &pdev->dev);
pm_runtime_disable(&pdev->dev);
diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c
index ecff800656e6..7d17d6a21803 100644
--- a/drivers/iommu/mtk_iommu_v1.c
+++ b/drivers/iommu/mtk_iommu_v1.c
@@ -660,19 +660,11 @@ static int mtk_iommu_probe(struct platform_device *pdev)
if (ret)
goto out_sysfs_remove;
- if (!iommu_present(&platform_bus_type)) {
- ret = bus_set_iommu(&platform_bus_type, &mtk_iommu_ops);
- if (ret)
- goto out_dev_unreg;
- }
-
ret = component_master_add_with_match(dev, &mtk_iommu_com_ops, match);
if (ret)
- goto out_bus_set_null;
+ goto out_dev_unreg;
return ret;
-out_bus_set_null:
- bus_set_iommu(&platform_bus_type, NULL);
out_dev_unreg:
iommu_device_unregister(&data->iommu);
out_sysfs_remove:
@@ -687,9 +679,6 @@ static int mtk_iommu_remove(struct platform_device *pdev)
iommu_device_sysfs_remove(&data->iommu);
iommu_device_unregister(&data->iommu);
- if (iommu_present(&platform_bus_type))
- bus_set_iommu(&platform_bus_type, NULL);
-
clk_disable_unprepare(data->bclk);
devm_free_irq(&pdev->dev, data->irq, data);
component_master_del(&pdev->dev, &mtk_iommu_com_ops);
--
2.28.0.dirty
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-04-14 12:43 UTC|newest]
Thread overview: 102+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20220414124252eucas1p1f2d8689ef5d281ea70d619888108d2fe@eucas1p1.samsung.com>
2022-04-14 12:42 ` [PATCH 00/13] iommu: Retire bus_set_iommu() Robin Murphy
2022-04-14 12:42 ` Robin Murphy
2022-04-14 12:42 ` Robin Murphy
2022-04-14 12:42 ` [PATCH 01/13] iommu: Always register bus notifiers Robin Murphy
2022-04-14 12:42 ` Robin Murphy
2022-04-14 12:42 ` Robin Murphy
2022-04-14 12:42 ` [PATCH 02/13] iommu: Move bus setup to IOMMU device registration Robin Murphy
2022-04-14 12:42 ` Robin Murphy
2022-04-14 12:42 ` Robin Murphy
2022-04-16 0:04 ` Lu Baolu
2022-04-16 0:04 ` Lu Baolu
2022-04-16 0:04 ` Lu Baolu
2022-04-18 22:09 ` Robin Murphy
2022-04-18 22:09 ` Robin Murphy
2022-04-18 22:09 ` Robin Murphy
2022-04-18 23:37 ` Lu Baolu
2022-04-18 23:37 ` Lu Baolu
2022-04-18 23:37 ` Lu Baolu
2022-04-19 7:20 ` Robin Murphy
2022-04-19 7:20 ` Robin Murphy
2022-04-19 7:20 ` Robin Murphy
2022-04-19 10:13 ` Lu Baolu
2022-04-19 10:13 ` Lu Baolu
2022-04-19 10:13 ` Lu Baolu
2022-04-23 8:01 ` Lu Baolu
2022-04-23 8:01 ` Lu Baolu
2022-04-23 8:01 ` Lu Baolu
2022-04-23 8:37 ` Robin Murphy
2022-04-23 8:37 ` Robin Murphy
2022-04-23 8:37 ` Robin Murphy
2022-04-23 8:51 ` Lu Baolu
2022-04-23 8:51 ` Lu Baolu
2022-04-23 8:51 ` Lu Baolu
2022-04-23 9:00 ` Lu Baolu
2022-04-23 9:00 ` Lu Baolu
2022-04-23 9:00 ` Lu Baolu
2022-04-23 9:41 ` Lu Baolu
2022-04-23 9:41 ` Lu Baolu
2022-04-23 9:41 ` Lu Baolu
2022-04-22 18:37 ` Krishna Reddy via iommu
2022-04-22 18:37 ` Krishna Reddy
2022-04-22 18:37 ` Krishna Reddy
2022-04-22 19:02 ` Robin Murphy
2022-04-22 19:02 ` Robin Murphy
2022-04-22 19:02 ` Robin Murphy
2022-04-14 12:42 ` [PATCH 03/13] iommu/amd: Clean up bus_set_iommu() Robin Murphy
2022-04-14 12:42 ` Robin Murphy
2022-04-14 12:42 ` Robin Murphy
2022-04-14 12:42 ` [PATCH 04/13] iommu/arm-smmu: " Robin Murphy
2022-04-14 12:42 ` Robin Murphy
2022-04-14 12:42 ` Robin Murphy
2022-04-19 14:40 ` Will Deacon
2022-04-19 14:40 ` Will Deacon
2022-04-19 14:40 ` Will Deacon
2022-04-20 16:05 ` Robin Murphy
2022-04-20 16:05 ` Robin Murphy
2022-04-20 16:05 ` Robin Murphy
2022-04-21 8:33 ` Will Deacon
2022-04-21 8:33 ` Will Deacon
2022-04-21 8:33 ` Will Deacon
2022-04-14 12:42 ` [PATCH 05/13] iommu/arm-smmu-v3: " Robin Murphy
2022-04-14 12:42 ` Robin Murphy
2022-04-14 12:42 ` Robin Murphy
2022-04-19 14:42 ` Will Deacon
2022-04-19 14:42 ` Will Deacon
2022-04-19 14:42 ` Will Deacon
2022-04-14 12:42 ` [PATCH 06/13] iommu/dart: " Robin Murphy
2022-04-14 12:42 ` Robin Murphy
2022-04-14 12:42 ` Robin Murphy
2022-04-15 14:28 ` Sven Peter
2022-04-15 14:28 ` Sven Peter via iommu
2022-04-15 14:28 ` Sven Peter
2022-04-14 12:42 ` [PATCH 07/13] iommu/exynos: " Robin Murphy
2022-04-14 12:42 ` Robin Murphy
2022-04-14 12:42 ` Robin Murphy
2022-04-14 12:42 ` [PATCH 08/13] iommu/ipmmu-vmsa: " Robin Murphy
2022-04-14 12:42 ` Robin Murphy
2022-04-14 12:42 ` Robin Murphy
2022-04-14 12:42 ` Robin Murphy [this message]
2022-04-14 12:42 ` [PATCH 09/13] iommu/mtk: " Robin Murphy
2022-04-14 12:42 ` Robin Murphy
2022-04-14 12:42 ` [PATCH 10/13] iommu/omap: " Robin Murphy
2022-04-14 12:42 ` Robin Murphy
2022-04-14 12:42 ` Robin Murphy
2022-04-14 12:42 ` [PATCH 11/13] iommu/tegra-smmu: " Robin Murphy
2022-04-14 12:42 ` Robin Murphy
2022-04-14 12:42 ` Robin Murphy
2022-04-14 12:42 ` [PATCH 12/13] iommu/virtio: " Robin Murphy
2022-04-14 12:42 ` Robin Murphy
2022-04-14 12:42 ` Robin Murphy
2022-04-21 17:12 ` Jean-Philippe Brucker
2022-04-21 17:12 ` Jean-Philippe Brucker
2022-04-21 17:12 ` Jean-Philippe Brucker
2022-04-21 19:44 ` Robin Murphy
2022-04-21 19:44 ` Robin Murphy
2022-04-21 19:44 ` Robin Murphy
2022-04-14 12:42 ` [PATCH 13/13] iommu: " Robin Murphy
2022-04-14 12:42 ` Robin Murphy
2022-04-14 12:42 ` Robin Murphy
2022-04-14 21:00 ` [PATCH 00/13] iommu: Retire bus_set_iommu() Marek Szyprowski
2022-04-14 21:00 ` Marek Szyprowski
2022-04-14 21:00 ` Marek Szyprowski
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=cad5008c73c0d3ee1b31daa456f901ee9fbb8409.1649935679.git.robin.murphy@arm.com \
--to=robin.murphy@arm.com \
--cc=baolu.lu@linux.intel.com \
--cc=gerald.schaefer@linux.ibm.com \
--cc=iommu@lists.linux-foundation.org \
--cc=jean-philippe@linaro.org \
--cc=joro@8bytes.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=mjrosato@linux.ibm.com \
--cc=robdclark@gmail.com \
--cc=sven@svenpeter.dev \
--cc=thierry.reding@gmail.com \
--cc=vdumpa@nvidia.com \
--cc=will@kernel.org \
--cc=yong.wu@mediatek.com \
--cc=zhang.lyra@gmail.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.