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

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

Merge "Revert "msm_11ad: set geometry attr when SMMU stage1 is enabled""

parents 8d89a4cb ae806905
Loading
Loading
Loading
Loading
+0 −14
Original line number Diff line number Diff line
@@ -747,9 +747,6 @@ static int msm_11ad_smmu_init(struct msm11ad_ctx *ctx)
	int rc;
	int force_pt_coherent = 1;
	int smmu_bypass = !ctx->smmu_s1_en;
	dma_addr_t iova_base = 0;
	dma_addr_t iova_end =  ctx->smmu_base + ctx->smmu_size - 1;
	struct iommu_domain_geometry geometry;

	if (!ctx->use_smmu)
		return 0;
@@ -807,17 +804,6 @@ static int msm_11ad_smmu_init(struct msm11ad_ctx *ctx)
					rc);
				goto release_mapping;
			}
			memset(&geometry, 0, sizeof(geometry));
			geometry.aperture_start = iova_base;
			geometry.aperture_end = iova_end;
			rc = iommu_domain_set_attr(ctx->mapping->domain,
						   DOMAIN_ATTR_GEOMETRY,
						   &geometry);
			if (rc) {
				dev_err(ctx->dev, "Set geometry attribute to SMMU failed (%d)\n",
					rc);
				goto release_mapping;
			}
		}
	}