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

Commit e98585fe authored by Prakash Gupta's avatar Prakash Gupta
Browse files

iommu/arm-smmu: add qcom,iommu-geometry DT property 



Add qcom,iommu-geometry DT property support.

Change-Id: Ic79316fb11b6317cee9ee4ed9742d9dd0635becf
Signed-off-by: default avatarPrakash Gupta <guptap@codeaurora.org>
parent 1e6853ca

drivers/iommu/arm-smmu.c

+37 −16
Original line number Diff line number Diff line
@@ -2939,6 +2939,8 @@ static int arm_smmu_setup_default_domain(struct device *dev, 
	const char *str;

	int attr = 1;

	u32 val;

	const __be32 *ranges;

	int naddr, nsize, len;



	np = arm_iommu_get_of_node(dev);

	if (!np)
@@ -3015,6 +3017,30 @@ static int arm_smmu_setup_default_domain(struct device *dev, 
	if (of_property_read_bool(np, "qcom,iommu-earlymap"))

		__arm_smmu_domain_set_attr(domain,

			DOMAIN_ATTR_EARLY_MAP, &attr);



	ranges = of_get_property(np, "qcom,iommu-geometry", &len);

	if (ranges) {

		struct iommu_domain_geometry geometry;



		len /= sizeof(u32);

		naddr = of_n_addr_cells(np);

		nsize = of_n_size_cells(np);

		if (len < naddr + nsize) {

			dev_err(dev, "Invalid length for qcom,iommu-geometry, expected %d cells\n",

				naddr + nsize);

			return -EINVAL;

		}

		if (naddr == 0 || nsize == 0) {

			dev_err(dev, "Invalid #address-cells %d or #size-cells %d\n",

				naddr, nsize);

			return -EINVAL;

		}



		geometry.aperture_start = of_read_number(ranges, naddr);

		geometry.aperture_end = of_read_number(ranges + naddr, nsize);

		__arm_smmu_domain_set_attr(domain, DOMAIN_ATTR_GEOMETRY,

					   &geometry);

	}

	return 0;

}
@@ -4036,8 +4062,7 @@ static int __arm_smmu_domain_set_attr2(struct iommu_domain *domain, 
			ret = -EINVAL;

			break;

		}

		if (smmu_domain->attributes

			  & (1 << DOMAIN_ATTR_GEOMETRY)) {



		if (geometry->aperture_start

		    < domain->geometry.aperture_start)

			domain->geometry.aperture_start =
@@ -4047,12 +4072,8 @@ static int __arm_smmu_domain_set_attr2(struct iommu_domain *domain, 
		    > domain->geometry.aperture_end)

			domain->geometry.aperture_end =

				geometry->aperture_end;

		} else {



		smmu_domain->attributes |= 1 << DOMAIN_ATTR_GEOMETRY;

			domain->geometry.aperture_start =

						geometry->aperture_start;

			domain->geometry.aperture_end = geometry->aperture_end;

		}

		ret = 0;

		break;

	}