From 296dd37fbf9f8f88d63d736d8c88b84cedff4726 Mon Sep 17 00:00:00 2001 From: Benjamin Chan Date: Wed, 15 Feb 2017 11:40:15 -0500 Subject: msm: sde: Remove panic from rotator smmu fault handler During SMMU fault for SDE rotator, it should return to SMMU driver after collecting dump data, so that SMMU driver can generate proper analysis info for the fault. CRs-Fixed: 2007472 Change-Id: I59b7b12e53524e40811f1237e4366b23a4933561 Signed-off-by: Benjamin Chan --- drivers/media/platform/msm/sde/rotator/sde_rotator_smmu.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'drivers/media') diff --git a/drivers/media/platform/msm/sde/rotator/sde_rotator_smmu.c b/drivers/media/platform/msm/sde/rotator/sde_rotator_smmu.c index 9b1175d8f4a6..43636b43eeb8 100644 --- a/drivers/media/platform/msm/sde/rotator/sde_rotator_smmu.c +++ b/drivers/media/platform/msm/sde/rotator/sde_rotator_smmu.c @@ -530,11 +530,18 @@ static int sde_smmu_fault_handler(struct iommu_domain *domain, sde_smmu = (struct sde_smmu_client *)token; - /* trigger rotator panic and dump */ - SDEROT_ERR("trigger rotator panic and dump, iova=0x%08lx\n", iova); + /* trigger rotator dump */ + SDEROT_ERR("trigger rotator dump, iova=0x%08lx, flags=0x%x\n", + iova, flags); + SDEROT_ERR("SMMU device:%s", sde_smmu->dev->kobj.name); - sde_rot_dump_panic(); + /* generate dump, but no panic */ + sde_rot_evtlog_tout_handler(false, __func__, "rot", "vbif_dbg_bus"); + /* + * return -ENOSYS to allow smmu driver to dump out useful + * debug info. + */ return rc; } -- cgit v1.2.3