Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5822da10 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "icnss: Set iommu attribute DOMAIN_ATTR_CB_STALL_DISABLE"

parents f5aa9c9f dfb92858
Loading
Loading
Loading
Loading
+11 −0
Original line number Diff line number Diff line
@@ -3525,6 +3525,7 @@ static int icnss_smmu_init(struct icnss_priv *priv)
	int atomic_ctx = 1;
	int s1_bypass = 1;
	int fast = 1;
	int stall_disable = 1;
	int ret = 0;

	icnss_pr_dbg("Initializing SMMU\n");
@@ -3568,6 +3569,16 @@ static int icnss_smmu_init(struct icnss_priv *priv)
			goto set_attr_fail;
		}
		icnss_pr_dbg("SMMU FAST map set\n");

		ret = iommu_domain_set_attr(mapping->domain,
					    DOMAIN_ATTR_CB_STALL_DISABLE,
					    &stall_disable);
		if (ret < 0) {
			icnss_pr_err("Set stall disable map attribute failed, err = %d\n",
				     ret);
			goto set_attr_fail;
		}
		icnss_pr_dbg("SMMU STALL DISABLE map set\n");
	}

	ret = arm_iommu_attach_device(&priv->pdev->dev, mapping);