* [PATCH v3 0/7] iommu/mediatek: Improve safety from invalid dts input
@ 2022-07-01 5:39 Yong Wu
2022-07-01 5:39 ` [PATCH v3 1/7] iommu/mediatek: Use dev_err_probe to mute probe_defer err log Yong Wu
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: Yong Wu @ 2022-07-01 5:39 UTC (permalink / raw)
To: Joerg Roedel, Matthias Brugger, Will Deacon
Cc: iommu, iommu, linux-mediatek, linux-arm-kernel, linux-kernel,
Yong Wu, AngeloGioacchino Del Regno, mingyuan.ma, yf.wang,
libo.kang, chengci.xu, youlin.pei, anan.sun, xueqi.zhang,
Guenter Roeck, Dan Carpenter
This patchset contains misc improve patches. Mainly to improve safety from
invalid dts input.
Change notes:
v3: a) Add platform_device_put from Robin.
b) Use component_match_add instead component_match_add_release suggested from Robin.
v2: https://lore.kernel.org/linux-mediatek/20220616054203.11365-1-yong.wu@mediatek.com/
a) Rebase on v5.19-rc1.
b) Add a New patch [5/5] just remove a variable that only is for v1.
v1: https://lore.kernel.org/linux-mediatek/20220511064920.18455-1-yong.wu@mediatek.com/
Base on linux-next-20220510.
the improve safety from dts is base on:
https://lore.kernel.org/linux-mediatek/20211210205704.1664928-1-linux@roeck-us.net/
Guenter Roeck (1):
iommu/mediatek: Validate number of phandles associated with
"mediatek,larbs"
Yong Wu (6):
iommu/mediatek: Use dev_err_probe to mute probe_defer err log
iommu/mediatek: Remove unused "mapping" member from mtk_iommu_data
iommu/mediatek: Add platform_device_put for recovering the device
refcnt
iommu/mediatek: Use component_match_add
iommu/mediatek: Add error path for loop of mm_dts_parse
iommu/mediatek: Improve safety for mediatek,smi property in larb nodes
drivers/iommu/mtk_iommu.c | 117 +++++++++++++++++++++++++++-----------
1 file changed, 84 insertions(+), 33 deletions(-)
--
2.18.0
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v3 1/7] iommu/mediatek: Use dev_err_probe to mute probe_defer err log
2022-07-01 5:39 [PATCH v3 0/7] iommu/mediatek: Improve safety from invalid dts input Yong Wu
@ 2022-07-01 5:39 ` Yong Wu
2022-07-01 5:39 ` [PATCH v3 2/7] iommu/mediatek: Add platform_device_put for recovering the device refcnt Yong Wu
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Yong Wu @ 2022-07-01 5:39 UTC (permalink / raw)
To: Joerg Roedel, Matthias Brugger, Will Deacon
Cc: iommu, iommu, linux-mediatek, linux-arm-kernel, linux-kernel,
Yong Wu, AngeloGioacchino Del Regno, mingyuan.ma, yf.wang,
libo.kang, chengci.xu, youlin.pei, anan.sun, xueqi.zhang,
Guenter Roeck, Dan Carpenter
Mute the probe defer log:
[ 2.654806] mtk-iommu 14018000.iommu: mm dts parse fail(-517).
[ 2.656168] mtk-iommu 1c01f000.iommu: mm dts parse fail(-517).
Fixes: d2e9a1102cfc ("iommu/mediatek: Contain MM IOMMU flow with the MM TYPE")
Signed-off-by: Yong Wu <yong.wu@mediatek.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: Guenter Roeck <groeck@chromium.org>
Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
---
drivers/iommu/mtk_iommu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index bb9dd92c9898..3b2489e8a6dd 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -1204,7 +1204,7 @@ static int mtk_iommu_probe(struct platform_device *pdev)
if (MTK_IOMMU_IS_TYPE(data->plat_data, MTK_IOMMU_TYPE_MM)) {
ret = mtk_iommu_mm_dts_parse(dev, &match, data);
if (ret) {
- dev_err(dev, "mm dts parse fail(%d).", ret);
+ dev_err_probe(dev, ret, "mm dts parse fail.");
goto out_runtime_disable;
}
} else if (MTK_IOMMU_IS_TYPE(data->plat_data, MTK_IOMMU_TYPE_INFRA) &&
--
2.18.0
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v3 2/7] iommu/mediatek: Add platform_device_put for recovering the device refcnt
2022-07-01 5:39 [PATCH v3 0/7] iommu/mediatek: Improve safety from invalid dts input Yong Wu
2022-07-01 5:39 ` [PATCH v3 1/7] iommu/mediatek: Use dev_err_probe to mute probe_defer err log Yong Wu
@ 2022-07-01 5:39 ` Yong Wu
2022-07-01 5:39 ` [PATCH v3 3/7] iommu/mediatek: Use component_match_add Yong Wu
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Yong Wu @ 2022-07-01 5:39 UTC (permalink / raw)
To: Joerg Roedel, Matthias Brugger, Will Deacon
Cc: iommu, iommu, linux-mediatek, linux-arm-kernel, linux-kernel,
Yong Wu, AngeloGioacchino Del Regno, mingyuan.ma, yf.wang,
libo.kang, chengci.xu, youlin.pei, anan.sun, xueqi.zhang,
Guenter Roeck, Dan Carpenter
Add platform_device_put to match with of_find_device_by_node.
Meanwhile, I add a new variable "pcommdev" which is for smi common device.
Otherwise, "platform_device_put(plarbdev)" for smi-common dev may be not
readable. And add a checking for whether pcommdev is NULL.
Fixes: d2e9a1102cfc ("iommu/mediatek: Contain MM IOMMU flow with the MM TYPE")
Signed-off-by: Yong Wu <yong.wu@mediatek.com>
---
drivers/iommu/mtk_iommu.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index 3b2489e8a6dd..151ab46d4eac 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -1045,7 +1045,7 @@ static int mtk_iommu_mm_dts_parse(struct device *dev, struct component_match **m
struct mtk_iommu_data *data)
{
struct device_node *larbnode, *smicomm_node, *smi_subcomm_node;
- struct platform_device *plarbdev;
+ struct platform_device *plarbdev, *pcommdev;
struct device_link *link;
int i, larb_nr, ret;
@@ -1076,12 +1076,14 @@ static int mtk_iommu_mm_dts_parse(struct device *dev, struct component_match **m
}
if (!plarbdev->dev.driver) {
of_node_put(larbnode);
+ platform_device_put(plarbdev);
return -EPROBE_DEFER;
}
data->larb_imu[id].dev = &plarbdev->dev;
component_match_add_release(dev, match, component_release_of,
component_compare_of, larbnode);
+ platform_device_put(plarbdev);
}
/* Get smi-(sub)-common dev from the last larb. */
@@ -1099,12 +1101,15 @@ static int mtk_iommu_mm_dts_parse(struct device *dev, struct component_match **m
else
smicomm_node = smi_subcomm_node;
- plarbdev = of_find_device_by_node(smicomm_node);
+ pcommdev = of_find_device_by_node(smicomm_node);
of_node_put(smicomm_node);
- data->smicomm_dev = &plarbdev->dev;
+ if (!pcommdev)
+ return -EINVAL;
+ data->smicomm_dev = &pcommdev->dev;
link = device_link_add(data->smicomm_dev, dev,
DL_FLAG_STATELESS | DL_FLAG_PM_RUNTIME);
+ platform_device_put(pcommdev);
if (!link) {
dev_err(dev, "Unable to link %s.\n", dev_name(data->smicomm_dev));
return -EINVAL;
--
2.18.0
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v3 3/7] iommu/mediatek: Use component_match_add
2022-07-01 5:39 [PATCH v3 0/7] iommu/mediatek: Improve safety from invalid dts input Yong Wu
2022-07-01 5:39 ` [PATCH v3 1/7] iommu/mediatek: Use dev_err_probe to mute probe_defer err log Yong Wu
2022-07-01 5:39 ` [PATCH v3 2/7] iommu/mediatek: Add platform_device_put for recovering the device refcnt Yong Wu
@ 2022-07-01 5:39 ` Yong Wu
2022-07-01 5:39 ` [PATCH v3 4/7] iommu/mediatek: Add error path for loop of mm_dts_parse Yong Wu
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Yong Wu @ 2022-07-01 5:39 UTC (permalink / raw)
To: Joerg Roedel, Matthias Brugger, Will Deacon
Cc: iommu, iommu, linux-mediatek, linux-arm-kernel, linux-kernel,
Yong Wu, AngeloGioacchino Del Regno, mingyuan.ma, yf.wang,
libo.kang, chengci.xu, youlin.pei, anan.sun, xueqi.zhang,
Guenter Roeck, Dan Carpenter
In order to simplify the error patch(avoid call of_node_put), Use
component_match_add instead component_match_add_release since we are only
interested in the "device" here. Then we could always call of_node_put in
normal path.
Strictly this is not a fixes patch, but it is a prepare for adding the
error path, thus I add a Fixes tag too.
Fixes: d2e9a1102cfc ("iommu/mediatek: Contain MM IOMMU flow with the MM TYPE")
Suggested-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Yong Wu <yong.wu@mediatek.com>
---
drivers/iommu/mtk_iommu.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index 151ab46d4eac..3da8c6252c2c 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -1070,19 +1070,17 @@ static int mtk_iommu_mm_dts_parse(struct device *dev, struct component_match **m
id = i;
plarbdev = of_find_device_by_node(larbnode);
- if (!plarbdev) {
- of_node_put(larbnode);
+ of_node_put(larbnode);
+ if (!plarbdev)
return -ENODEV;
- }
+
if (!plarbdev->dev.driver) {
- of_node_put(larbnode);
platform_device_put(plarbdev);
return -EPROBE_DEFER;
}
data->larb_imu[id].dev = &plarbdev->dev;
- component_match_add_release(dev, match, component_release_of,
- component_compare_of, larbnode);
+ component_match_add(dev, match, component_compare_dev, &plarbdev->dev);
platform_device_put(plarbdev);
}
--
2.18.0
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v3 4/7] iommu/mediatek: Add error path for loop of mm_dts_parse
2022-07-01 5:39 [PATCH v3 0/7] iommu/mediatek: Improve safety from invalid dts input Yong Wu
` (2 preceding siblings ...)
2022-07-01 5:39 ` [PATCH v3 3/7] iommu/mediatek: Use component_match_add Yong Wu
@ 2022-07-01 5:39 ` Yong Wu
2022-07-01 5:39 ` [PATCH v3 5/7] iommu/mediatek: Validate number of phandles associated with "mediatek,larbs" Yong Wu
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Yong Wu @ 2022-07-01 5:39 UTC (permalink / raw)
To: Joerg Roedel, Matthias Brugger, Will Deacon
Cc: iommu, iommu, linux-mediatek, linux-arm-kernel, linux-kernel,
Yong Wu, AngeloGioacchino Del Regno, mingyuan.ma, yf.wang,
libo.kang, chengci.xu, youlin.pei, anan.sun, xueqi.zhang,
Guenter Roeck, Dan Carpenter
The mtk_iommu_mm_dts_parse will parse the smi larbs nodes. if the i+1
larb is parsed fail, we should put_device for the 0..i larbs.
There are two places need to comment:
1) The larbid may be not linear mapping, we should loop whole
the array in the error path.
2) I move this line position: "data->larb_imu[id].dev = &plarbdev->dev;"
That means set data->larb_imu[id].dev before the error path.
then we don't need "platform_device_put(plarbdev)" again while
probe_defer case. All depend on "put_device" in the error path in error
cases.
Fixes: d2e9a1102cfc ("iommu/mediatek: Contain MM IOMMU flow with the MM TYPE")
Signed-off-by: Yong Wu <yong.wu@mediatek.com>
---
drivers/iommu/mtk_iommu.c | 42 ++++++++++++++++++++++++++++-----------
1 file changed, 30 insertions(+), 12 deletions(-)
diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index 3da8c6252c2c..aa0973bafde1 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -1057,8 +1057,10 @@ static int mtk_iommu_mm_dts_parse(struct device *dev, struct component_match **m
u32 id;
larbnode = of_parse_phandle(dev->of_node, "mediatek,larbs", i);
- if (!larbnode)
- return -EINVAL;
+ if (!larbnode) {
+ ret = -EINVAL;
+ goto err_larbdev_put;
+ }
if (!of_device_is_available(larbnode)) {
of_node_put(larbnode);
@@ -1071,14 +1073,16 @@ static int mtk_iommu_mm_dts_parse(struct device *dev, struct component_match **m
plarbdev = of_find_device_by_node(larbnode);
of_node_put(larbnode);
- if (!plarbdev)
- return -ENODEV;
+ if (!plarbdev) {
+ ret = -ENODEV;
+ goto err_larbdev_put;
+ }
+ data->larb_imu[id].dev = &plarbdev->dev;
if (!plarbdev->dev.driver) {
- platform_device_put(plarbdev);
- return -EPROBE_DEFER;
+ ret = -EPROBE_DEFER;
+ goto err_larbdev_put;
}
- data->larb_imu[id].dev = &plarbdev->dev;
component_match_add(dev, match, component_compare_dev, &plarbdev->dev);
platform_device_put(plarbdev);
@@ -1086,8 +1090,10 @@ static int mtk_iommu_mm_dts_parse(struct device *dev, struct component_match **m
/* Get smi-(sub)-common dev from the last larb. */
smi_subcomm_node = of_parse_phandle(larbnode, "mediatek,smi", 0);
- if (!smi_subcomm_node)
- return -EINVAL;
+ if (!smi_subcomm_node) {
+ ret = -EINVAL;
+ goto err_larbdev_put;
+ }
/*
* It may have two level smi-common. the node is smi-sub-common if it
@@ -1101,8 +1107,10 @@ static int mtk_iommu_mm_dts_parse(struct device *dev, struct component_match **m
pcommdev = of_find_device_by_node(smicomm_node);
of_node_put(smicomm_node);
- if (!pcommdev)
- return -EINVAL;
+ if (!pcommdev) {
+ ret = -EINVAL;
+ goto err_larbdev_put;
+ }
data->smicomm_dev = &pcommdev->dev;
link = device_link_add(data->smicomm_dev, dev,
@@ -1110,9 +1118,19 @@ static int mtk_iommu_mm_dts_parse(struct device *dev, struct component_match **m
platform_device_put(pcommdev);
if (!link) {
dev_err(dev, "Unable to link %s.\n", dev_name(data->smicomm_dev));
- return -EINVAL;
+ ret = -EINVAL;
+ goto err_larbdev_put;
}
return 0;
+
+err_larbdev_put:
+ /* id may be not linear mapping, loop whole the array */
+ for (i = 0; i < MTK_LARB_NR_MAX; i++) {
+ if (!data->larb_imu[i].dev)
+ continue;
+ put_device(data->larb_imu[i].dev);
+ }
+ return ret;
}
static int mtk_iommu_probe(struct platform_device *pdev)
--
2.18.0
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v3 5/7] iommu/mediatek: Validate number of phandles associated with "mediatek,larbs"
2022-07-01 5:39 [PATCH v3 0/7] iommu/mediatek: Improve safety from invalid dts input Yong Wu
` (3 preceding siblings ...)
2022-07-01 5:39 ` [PATCH v3 4/7] iommu/mediatek: Add error path for loop of mm_dts_parse Yong Wu
@ 2022-07-01 5:39 ` Yong Wu
2022-07-01 5:39 ` [PATCH v3 6/7] iommu/mediatek: Improve safety for mediatek,smi property in larb nodes Yong Wu
2022-07-01 5:39 ` [PATCH v3 7/7] iommu/mediatek: Remove unused "mapping" member from mtk_iommu_data Yong Wu
6 siblings, 0 replies; 8+ messages in thread
From: Yong Wu @ 2022-07-01 5:39 UTC (permalink / raw)
To: Joerg Roedel, Matthias Brugger, Will Deacon
Cc: iommu, iommu, linux-mediatek, linux-arm-kernel, linux-kernel,
Yong Wu, AngeloGioacchino Del Regno, mingyuan.ma, yf.wang,
libo.kang, chengci.xu, youlin.pei, anan.sun, xueqi.zhang,
Guenter Roeck, Dan Carpenter
From: Guenter Roeck <groeck@chromium.org>
Fix the smatch warnings:
drivers/iommu/mtk_iommu.c:878 mtk_iommu_mm_dts_parse() error: uninitialized
symbol 'larbnode'.
If someone abuse the dtsi node(Don't follow the definition of dt-binding),
for example "mediatek,larbs" is provided as boolean property, "larb_nr"
will be zero and cause abnormal.
To fix this problem and improve the code safety, add some checking
for the invalid input from dtsi, e.g. checking the larb_nr/larbid valid
range, and avoid "mediatek,larb-id" property conflicts in the smi-larb
nodes.
Fixes: d2e9a1102cfc ("iommu/mediatek: Contain MM IOMMU flow with the MM TYPE")
Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Guenter Roeck <groeck@chromium.org>
Signed-off-by: Yong Wu <yong.wu@mediatek.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
---
drivers/iommu/mtk_iommu.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index aa0973bafde1..88d0dad36067 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -1052,6 +1052,8 @@ static int mtk_iommu_mm_dts_parse(struct device *dev, struct component_match **m
larb_nr = of_count_phandle_with_args(dev->of_node, "mediatek,larbs", NULL);
if (larb_nr < 0)
return larb_nr;
+ if (larb_nr == 0 || larb_nr > MTK_LARB_NR_MAX)
+ return -EINVAL;
for (i = 0; i < larb_nr; i++) {
u32 id;
@@ -1070,6 +1072,11 @@ static int mtk_iommu_mm_dts_parse(struct device *dev, struct component_match **m
ret = of_property_read_u32(larbnode, "mediatek,larb-id", &id);
if (ret)/* The id is consecutive if there is no this property */
id = i;
+ if (id >= MTK_LARB_NR_MAX) {
+ of_node_put(larbnode);
+ ret = -EINVAL;
+ goto err_larbdev_put;
+ }
plarbdev = of_find_device_by_node(larbnode);
of_node_put(larbnode);
@@ -1077,6 +1084,11 @@ static int mtk_iommu_mm_dts_parse(struct device *dev, struct component_match **m
ret = -ENODEV;
goto err_larbdev_put;
}
+ if (data->larb_imu[id].dev) {
+ platform_device_put(plarbdev);
+ ret = -EEXIST;
+ goto err_larbdev_put;
+ }
data->larb_imu[id].dev = &plarbdev->dev;
if (!plarbdev->dev.driver) {
--
2.18.0
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v3 6/7] iommu/mediatek: Improve safety for mediatek,smi property in larb nodes
2022-07-01 5:39 [PATCH v3 0/7] iommu/mediatek: Improve safety from invalid dts input Yong Wu
` (4 preceding siblings ...)
2022-07-01 5:39 ` [PATCH v3 5/7] iommu/mediatek: Validate number of phandles associated with "mediatek,larbs" Yong Wu
@ 2022-07-01 5:39 ` Yong Wu
2022-07-01 5:39 ` [PATCH v3 7/7] iommu/mediatek: Remove unused "mapping" member from mtk_iommu_data Yong Wu
6 siblings, 0 replies; 8+ messages in thread
From: Yong Wu @ 2022-07-01 5:39 UTC (permalink / raw)
To: Joerg Roedel, Matthias Brugger, Will Deacon
Cc: iommu, iommu, linux-mediatek, linux-arm-kernel, linux-kernel,
Yong Wu, AngeloGioacchino Del Regno, mingyuan.ma, yf.wang,
libo.kang, chengci.xu, youlin.pei, anan.sun, xueqi.zhang,
Guenter Roeck, Dan Carpenter
No functional change. Just improve safety from dts.
All the larbs that connect to one IOMMU must connect with the same
smi-common. This patch checks all the mediatek,smi property for each
larb, If their mediatek,smi are different, it will return fails.
Also avoid there is no available smi-larb nodes.
Suggested-by: Guenter Roeck <groeck@chromium.org>
Signed-off-by: Yong Wu <yong.wu@mediatek.com>
---
drivers/iommu/mtk_iommu.c | 53 +++++++++++++++++++++++++++------------
1 file changed, 37 insertions(+), 16 deletions(-)
diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index 88d0dad36067..573b8a7f76f7 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -1044,7 +1044,7 @@ static const struct component_master_ops mtk_iommu_com_ops = {
static int mtk_iommu_mm_dts_parse(struct device *dev, struct component_match **match,
struct mtk_iommu_data *data)
{
- struct device_node *larbnode, *smicomm_node, *smi_subcomm_node;
+ struct device_node *larbnode, *frst_avail_smicomm_node = NULL;
struct platform_device *plarbdev, *pcommdev;
struct device_link *link;
int i, larb_nr, ret;
@@ -1056,6 +1056,7 @@ static int mtk_iommu_mm_dts_parse(struct device *dev, struct component_match **m
return -EINVAL;
for (i = 0; i < larb_nr; i++) {
+ struct device_node *smicomm_node, *smi_subcomm_node;
u32 id;
larbnode = of_parse_phandle(dev->of_node, "mediatek,larbs", i);
@@ -1096,29 +1097,49 @@ static int mtk_iommu_mm_dts_parse(struct device *dev, struct component_match **m
goto err_larbdev_put;
}
+ /* Get smi-(sub)-common dev from the last larb. */
+ smi_subcomm_node = of_parse_phandle(larbnode, "mediatek,smi", 0);
+ if (!smi_subcomm_node) {
+ ret = -EINVAL;
+ goto err_larbdev_put;
+ }
+
+ /*
+ * It may have two level smi-common. the node is smi-sub-common if it
+ * has a new mediatek,smi property. otherwise it is smi-commmon.
+ */
+ smicomm_node = of_parse_phandle(smi_subcomm_node, "mediatek,smi", 0);
+ if (smicomm_node)
+ of_node_put(smi_subcomm_node);
+ else
+ smicomm_node = smi_subcomm_node;
+
+ /*
+ * All the larbs that connect to one IOMMU must connect with the same
+ * smi-common.
+ */
+ if (!frst_avail_smicomm_node) {
+ frst_avail_smicomm_node = smicomm_node;
+ } else if (frst_avail_smicomm_node != smicomm_node) {
+ dev_err(dev, "mediatek,smi property is not right @larb%d.", id);
+ of_node_put(smicomm_node);
+ ret = -EINVAL;
+ goto err_larbdev_put;
+ } else {
+ of_node_put(smicomm_node);
+ }
+
component_match_add(dev, match, component_compare_dev, &plarbdev->dev);
platform_device_put(plarbdev);
}
- /* Get smi-(sub)-common dev from the last larb. */
- smi_subcomm_node = of_parse_phandle(larbnode, "mediatek,smi", 0);
- if (!smi_subcomm_node) {
+ if (!frst_avail_smicomm_node) {
ret = -EINVAL;
goto err_larbdev_put;
}
- /*
- * It may have two level smi-common. the node is smi-sub-common if it
- * has a new mediatek,smi property. otherwise it is smi-commmon.
- */
- smicomm_node = of_parse_phandle(smi_subcomm_node, "mediatek,smi", 0);
- if (smicomm_node)
- of_node_put(smi_subcomm_node);
- else
- smicomm_node = smi_subcomm_node;
-
- pcommdev = of_find_device_by_node(smicomm_node);
- of_node_put(smicomm_node);
+ pcommdev = of_find_device_by_node(frst_avail_smicomm_node);
+ of_node_put(frst_avail_smicomm_node);
if (!pcommdev) {
ret = -EINVAL;
goto err_larbdev_put;
--
2.18.0
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v3 7/7] iommu/mediatek: Remove unused "mapping" member from mtk_iommu_data
2022-07-01 5:39 [PATCH v3 0/7] iommu/mediatek: Improve safety from invalid dts input Yong Wu
` (5 preceding siblings ...)
2022-07-01 5:39 ` [PATCH v3 6/7] iommu/mediatek: Improve safety for mediatek,smi property in larb nodes Yong Wu
@ 2022-07-01 5:39 ` Yong Wu
6 siblings, 0 replies; 8+ messages in thread
From: Yong Wu @ 2022-07-01 5:39 UTC (permalink / raw)
To: Joerg Roedel, Matthias Brugger, Will Deacon
Cc: iommu, iommu, linux-mediatek, linux-arm-kernel, linux-kernel,
Yong Wu, AngeloGioacchino Del Regno, mingyuan.ma, yf.wang,
libo.kang, chengci.xu, youlin.pei, anan.sun, xueqi.zhang,
Guenter Roeck, Dan Carpenter
Just remove a unused variable that only is for mtk_iommu_v1.
Signed-off-by: Yong Wu <yong.wu@mediatek.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
---
drivers/iommu/mtk_iommu.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index 573b8a7f76f7..df49d3907f36 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -221,10 +221,7 @@ struct mtk_iommu_data {
struct device *smicomm_dev;
struct mtk_iommu_bank_data *bank;
-
- struct dma_iommu_mapping *mapping; /* For mtk_iommu_v1.c */
struct regmap *pericfg;
-
struct mutex mutex; /* Protect m4u_group/m4u_dom above */
/*
--
2.18.0
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2022-07-01 5:41 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-01 5:39 [PATCH v3 0/7] iommu/mediatek: Improve safety from invalid dts input Yong Wu
2022-07-01 5:39 ` [PATCH v3 1/7] iommu/mediatek: Use dev_err_probe to mute probe_defer err log Yong Wu
2022-07-01 5:39 ` [PATCH v3 2/7] iommu/mediatek: Add platform_device_put for recovering the device refcnt Yong Wu
2022-07-01 5:39 ` [PATCH v3 3/7] iommu/mediatek: Use component_match_add Yong Wu
2022-07-01 5:39 ` [PATCH v3 4/7] iommu/mediatek: Add error path for loop of mm_dts_parse Yong Wu
2022-07-01 5:39 ` [PATCH v3 5/7] iommu/mediatek: Validate number of phandles associated with "mediatek,larbs" Yong Wu
2022-07-01 5:39 ` [PATCH v3 6/7] iommu/mediatek: Improve safety for mediatek,smi property in larb nodes Yong Wu
2022-07-01 5:39 ` [PATCH v3 7/7] iommu/mediatek: Remove unused "mapping" member from mtk_iommu_data Yong Wu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®