Merge "coresight: tmc: Add SMMU S1 bypass support" (8da4f03b) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/hwtracing/coresight/coresight-tmc.c

+11 −0

Original line number	Diff line number	Diff line
		@@ -450,6 +450,7 @@ static DEVICE_ATTR_RW(block_size);
		static int tmc_iommu_init(struct tmc_drvdata *drvdata)
		{
		struct device_node *node = drvdata->dev->of_node;
		int s1_bypass;
		int ret = 0;

		if (!of_property_read_bool(node, "iommus"))
		@@ -463,6 +464,15 @@ static int tmc_iommu_init(struct tmc_drvdata *drvdata)
		goto iommu_map_err;
		}

		s1_bypass = of_property_read_bool(node, "qcom,smmu-s1-bypass");
		ret = iommu_domain_set_attr(drvdata->iommu_mapping->domain,
		DOMAIN_ATTR_S1_BYPASS, &s1_bypass);
		if (ret) {
		dev_err(drvdata->dev, "IOMMU set s1 bypass (%d) failed (%d)\n",
		s1_bypass, ret);
		goto iommu_attach_fail;
		}

		ret = arm_iommu_attach_device(drvdata->dev, drvdata->iommu_mapping);
		if (ret) {
		dev_err(drvdata->dev, "Attach device failed, err = %d\n", ret);
		@@ -474,6 +484,7 @@ static int tmc_iommu_init(struct tmc_drvdata *drvdata)
		iommu_attach_fail:
		arm_iommu_release_mapping(drvdata->iommu_mapping);
		iommu_map_err:
		drvdata->iommu_mapping = NULL;
		return ret;
		}