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

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

Merge "iommu: msm: Create secure page tables for SMMUv2 also"

parents af3d5096 52f75ed7

drivers/iommu/msm_iommu_sec.c

+9 −2
Original line number Diff line number Diff line
@@ -61,6 +61,12 @@ 


static struct iommu_access_ops *iommu_access_ops;



static const struct of_device_id msm_smmu_list[] = {

	{ .compatible = "qcom,msm-smmu-v1", },

	{ .compatible = "qcom,msm-smmu-v2", },

	{ }

};



struct msm_scm_paddr_list {

	unsigned int list;

	unsigned int list_size;
@@ -296,8 +302,9 @@ static int msm_iommu_sec_ptbl_init(void) 
	int ret, ptbl_ret = 0;

	int version;



	for_each_compatible_node(np, NULL, "qcom,msm-smmu-v1")

		if (of_find_property(np, "qcom,iommu-secure-id", NULL))

	for_each_matching_node(np, msm_smmu_list)

		if (of_find_property(np, "qcom,iommu-secure-id", NULL) &&

				of_device_is_available(np))

			break;



	if (!np)