From 2c320baeafe3312798cea9db94e047eb1a42cbff Mon Sep 17 00:00:00 2001 From: Nilaan Gunabalachandran Date: Tue, 6 Jul 2021 16:17:23 -0400 Subject: [PATCH] Revert "disp: msm: sde: update smmu fault handler to print debug info" This reverts commit 0623a02a84c925f34eacd69b3630995de3732ecf. It leads to panic during smmu faults because we do not have any recovery. Reverting this will give the control to the client to dump if necessary. Change-Id: I85982e129cabc73b041e25c35e965117d60f3bfa Signed-off-by: Nilaan Gunabalachandran --- msm/msm_smmu.c | 5 +++-- rotator/sde_rotator_smmu.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/msm/msm_smmu.c b/msm/msm_smmu.c index b31edece69..579fb81dfa 100644 --- a/msm/msm_smmu.c +++ b/msm/msm_smmu.c @@ -431,10 +431,11 @@ static int msm_smmu_fault_handler(struct iommu_domain *domain, int flags, void *token) { struct msm_smmu_client *client; + int rc = -EINVAL; if (!token) { DRM_ERROR("Error: token is NULL\n"); - return -ENOSYS; + return -EINVAL; } client = (struct msm_smmu_client *)token; @@ -448,7 +449,7 @@ static int msm_smmu_fault_handler(struct iommu_domain *domain, * return -ENOSYS to allow smmu driver to dump out useful * debug info. */ - return -ENOSYS; + return rc; } /** diff --git a/rotator/sde_rotator_smmu.c b/rotator/sde_rotator_smmu.c index 7e27413a99..fafa1f28c3 100644 --- a/rotator/sde_rotator_smmu.c +++ b/rotator/sde_rotator_smmu.c @@ -459,10 +459,11 @@ static int sde_smmu_fault_handler(struct iommu_domain *domain, int flags, void *token) { struct sde_smmu_client *sde_smmu; + int rc = -EINVAL; if (!token) { SDEROT_ERR("Error: token is NULL\n"); - return -ENOSYS; + return -EINVAL; } sde_smmu = (struct sde_smmu_client *)token; @@ -479,7 +480,7 @@ static int sde_smmu_fault_handler(struct iommu_domain *domain, * return -ENOSYS to allow smmu driver to dump out useful * debug info. */ - return -ENOSYS; + return rc; } static struct sde_smmu_domain sde_rot_unsec = {