| Message ID | 20250401202731.2810474-1-m.szyprowski@samsung.com |
|---|---|
| State | New |
| Headers | show |
| Series | iommu/exynos: Fix suspend/resume with IDENTITY domain | expand |
On Tue, Apr 01, 2025 at 10:27:31PM +0200, Marek Szyprowski wrote: > Fixes: b3d14960e629 ("iommu/exynos: Implement an IDENTITY domain") > Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> > --- > This fixes random issues observed on various ARM 32bit Exynos SoC based > boards, like Odroid-XU3. Applied, thanks.
diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c index 69e23e017d9e..317266aca6e2 100644 --- a/drivers/iommu/exynos-iommu.c +++ b/drivers/iommu/exynos-iommu.c @@ -832,7 +832,7 @@ static int __maybe_unused exynos_sysmmu_suspend(struct device *dev) struct exynos_iommu_owner *owner = dev_iommu_priv_get(master); mutex_lock(&owner->rpm_lock); - if (&data->domain->domain != &exynos_identity_domain) { + if (data->domain) { dev_dbg(data->sysmmu, "saving state\n"); __sysmmu_disable(data); } @@ -850,7 +850,7 @@ static int __maybe_unused exynos_sysmmu_resume(struct device *dev) struct exynos_iommu_owner *owner = dev_iommu_priv_get(master); mutex_lock(&owner->rpm_lock); - if (&data->domain->domain != &exynos_identity_domain) { + if (data->domain) { dev_dbg(data->sysmmu, "restoring state\n"); __sysmmu_enable(data); }
Commit bcb81ac6ae3c ("iommu: Get DT/ACPI parsing into the proper probe path") changed the sequence of probing the SYSMMU controller devices and calls to arm_iommu_attach_device(), what results in resuming SYSMMU controller earlier, when it is still set to IDENTITY mapping. Such change revealed the bug in IDENTITY handling in the exynos-iommu driver. When SYSMMU controller is set to IDENTITY mapping, data->domain is NULL, so adjust checks in suspend & resume callbacks to handle this case correctly. Fixes: b3d14960e629 ("iommu/exynos: Implement an IDENTITY domain") Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> --- This fixes random issues observed on various ARM 32bit Exynos SoC based boards, like Odroid-XU3. Best regards Marek Szyprowski, PhD Samsung R&D Institute Poland --- drivers/iommu/exynos-iommu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)