Merge "msm: kgsl: Disable stall on fault for GMU context bank"

This commit is contained in:
qctecmdr 2020-09-09 06:09:24 -07:00 • committed by Gerrit - the friendly Code Review server
commit e41274f413

View file

@ -2614,6 +2614,7 @@ static int a6xx_gmu_iommu_cb_probe(struct a6xx_gmu_device *gmu,
struct device_node *node = of_get_child_by_name(parent, ctx->name);
struct platform_device *pdev;
int ret;
int no_stall = 1;
if (!node)
return -ENODEV;
@ -2636,6 +2637,14 @@ static int a6xx_gmu_iommu_cb_probe(struct a6xx_gmu_device *gmu,
return -ENODEV;
}
/*
* Disable stall on fault for the GMU context bank.
* This sets SCTLR.CFCFG = 0.
* Also note that, the smmu driver sets SCTLR.HUPCF = 0 by default.
*/
iommu_domain_set_attr(ctx->domain,
DOMAIN_ATTR_FAULT_MODEL_NO_STALL, &no_stall);
ret = iommu_attach_device(ctx->domain, &pdev->dev);
if (!ret) {
iommu_set_fault_handler(ctx->domain, handler, ctx);