Commit 00597f9f authored by Sai Prakash Ranjan's avatar Sai Prakash Ranjan Committed by Will Deacon
Browse files

iommu: arm-smmu-impl: Use table to list QCOM implementations 



Use table and of_match_node() to match qcom implementation
instead of multiple of_device_compatible() calls for each
QCOM SMMU implementation.

Signed-off-by: default avatarSai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>
Acked-by: default avatarWill Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/4e11899bc02102a6e6155db215911e8b5aaba950.1606287059.git.saiprakash.ranjan@codeaurora.org


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 12bc3679

drivers/iommu/arm/arm-smmu/arm-smmu-impl.c

+1 −8
Original line number Diff line number Diff line
@@ -214,14 +214,7 @@ struct arm_smmu_device *arm_smmu_impl_init(struct arm_smmu_device *smmu) 
	if (of_device_is_compatible(np, "nvidia,tegra194-smmu"))

		return nvidia_smmu_impl_init(smmu);



	if (of_device_is_compatible(np, "qcom,sdm845-smmu-500") ||

	    of_device_is_compatible(np, "qcom,sc7180-smmu-500") ||

	    of_device_is_compatible(np, "qcom,sm8150-smmu-500") ||

	    of_device_is_compatible(np, "qcom,sm8250-smmu-500"))

		return qcom_smmu_impl_init(smmu);



	if (of_device_is_compatible(smmu->dev->of_node, "qcom,adreno-smmu"))

		return qcom_adreno_smmu_impl_init(smmu);

	smmu = qcom_smmu_impl_init(smmu);



	if (of_device_is_compatible(np, "marvell,ap806-smmu-500"))

		smmu->impl = &mrvl_mmu500_impl;

drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c

+16 −5
Original line number Diff line number Diff line
@@ -318,12 +318,23 @@ static struct arm_smmu_device *qcom_smmu_create(struct arm_smmu_device *smmu, 
	return &qsmmu->smmu;

}



static const struct of_device_id __maybe_unused qcom_smmu_impl_of_match[] = {

	{ .compatible = "qcom,sc7180-smmu-500" },

	{ .compatible = "qcom,sdm845-smmu-500" },

	{ .compatible = "qcom,sm8150-smmu-500" },

	{ .compatible = "qcom,sm8250-smmu-500" },

	{ }

};



struct arm_smmu_device *qcom_smmu_impl_init(struct arm_smmu_device *smmu)

{

	const struct device_node *np = smmu->dev->of_node;



	if (of_match_node(qcom_smmu_impl_of_match, np))

		return qcom_smmu_create(smmu, &qcom_smmu_impl);

}



struct arm_smmu_device *qcom_adreno_smmu_impl_init(struct arm_smmu_device *smmu)

{

	if (of_device_is_compatible(np, "qcom,adreno-smmu"))

		return qcom_smmu_create(smmu, &qcom_adreno_smmu_impl);



	return smmu;

}

drivers/iommu/arm/arm-smmu/arm-smmu.h

+0 −1
Original line number Diff line number Diff line
@@ -523,7 +523,6 @@ static inline void arm_smmu_writeq(struct arm_smmu_device *smmu, int page, 
struct arm_smmu_device *arm_smmu_impl_init(struct arm_smmu_device *smmu);

struct arm_smmu_device *nvidia_smmu_impl_init(struct arm_smmu_device *smmu);

struct arm_smmu_device *qcom_smmu_impl_init(struct arm_smmu_device *smmu);

struct arm_smmu_device *qcom_adreno_smmu_impl_init(struct arm_smmu_device *smmu);



void arm_smmu_write_context_bank(struct arm_smmu_device *smmu, int idx);

int arm_mmu500_reset(struct arm_smmu_device *smmu);

CRA Git | Maintained and supported by SUSTech CRA and CCSE