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

This commit is contained in:
qctecmdr 2020-04-17 20:34:46 -07:00 committed by Gerrit - the friendly Code Review server
commit 98f2923560

View file

@ -282,6 +282,7 @@ static int gmu_iommu_cb_probe(struct gmu_device *gmu,
struct platform_device *pdev = of_find_device_by_node(node);
struct device *dev;
int ret;
int no_stall = 1;
dev = &pdev->dev;
of_dma_configure(dev, node, true);
@ -294,6 +295,14 @@ static int gmu_iommu_cb_probe(struct 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, dev);
if (ret) {
dev_err(&gmu->pdev->dev, "gmu iommu fail to attach %s device\n",