Skip to contentSkip to conversation

iommu/mediatek: Use correct fwspec in mtk_iommu_add_device()

PATCH In review Joerg Roedel 2 participants 2 messages Jan 23, 2019

Subsystems (3)
lore
Share & tools
lore

Joerg Roedel

author maintainer
#0 lore raw

PATCH 1/1 iommu/mediatek: Use correct fwspec in mtk_iommu_add_device()

From: Joerg Roedel <[email protected]>

The mtk_iommu_add_device() function keeps the fwspec in an on-stack pointer and calls mtk_iommu_create_mapping(), which might change its source, dev->iommu_fwspec. This causes the on-stack pointer to be obsoleted and the device initialization to fail. Update the on-stack fwspec pointer after mtk_iommu_create_mapping() has been called.

Fixes a9bf2eec5a6f ('iommu/mediatek: Use helper functions to access dev->iommu_fwspec')
---
 drivers/iommu/mtk_iommu_v1.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/iommu/mtk_iommu_v1.c +4 -0
index 6ede4286b835..f60bdb85c4c0 100644
@@ -442,6 +442,10 @@ static int mtk_iommu_add_device(struct device *dev)
 		iommu_spec.args_count = count;
 
 		mtk_iommu_create_mapping(dev, &iommu_spec);
+
+		/* dev->iommu_fwspec might have changed */
+		fwspec = dev_iommu_fwspec_get(dev);
+
 		of_node_put(iommu_spec.np);
 	}
 
Signature · 1 line
2.13.7