Commit 64510ede authored by Sai Prakash Ranjan's avatar Sai Prakash Ranjan Committed by Will Deacon
Browse files

iommu: arm-smmu-impl: Convert to a generic reset implementation 



Currently the QCOM specific smmu reset implementation is very
specific to SDM845 SoC and has a wait-for-safe logic which
may not be required for other SoCs. So move the SDM845 specific
logic to its specific reset function. Also add SC7180 SMMU
compatible for calling into QCOM specific implementation.

Signed-off-by: default avatarSai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>
Reviewed-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Reviewed-by: default avatarStephen Boyd <swboyd@chromium.org>
Reviewed-by: default avatarRobin Murphy <robin.murphy@arm.com>
Link: https://lore.kernel.org/r/d24a0278021bc0b2732636c5728efe55e7318a8b.1587407458.git.saiprakash.ranjan@codeaurora.org


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

drivers/iommu/arm-smmu-impl.c

+5 −3
Original line number Diff line number Diff line
@@ -150,6 +150,8 @@ static const struct arm_smmu_impl arm_mmu500_impl = { 


struct arm_smmu_device *arm_smmu_impl_init(struct arm_smmu_device *smmu)

{

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



	/*

	 * We will inevitably have to combine model-specific implementation

	 * quirks with platform-specific integration quirks, but everything
@@ -166,11 +168,11 @@ struct arm_smmu_device *arm_smmu_impl_init(struct arm_smmu_device *smmu) 
		break;

	}



	if (of_property_read_bool(smmu->dev->of_node,

				  "calxeda,smmu-secure-config-access"))

	if (of_property_read_bool(np, "calxeda,smmu-secure-config-access"))

		smmu->impl = &calxeda_impl;



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

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

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

		return qcom_smmu_impl_init(smmu);



	return smmu;

drivers/iommu/arm-smmu-qcom.c

+13 −3
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ static int qcom_sdm845_smmu500_reset(struct arm_smmu_device *smmu) 
{

	int ret;



	arm_mmu500_reset(smmu);



	/*

	 * To address performance degradation in non-real time clients,

	 * such as USB and UFS, turn off wait-for-safe on sdm845 based boards,
@@ -30,8 +28,20 @@ static int qcom_sdm845_smmu500_reset(struct arm_smmu_device *smmu) 
	return ret;

}



static int qcom_smmu500_reset(struct arm_smmu_device *smmu)

{

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



	arm_mmu500_reset(smmu);



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

		return qcom_sdm845_smmu500_reset(smmu);



	return 0;

}



static const struct arm_smmu_impl qcom_smmu_impl = {

	.reset = qcom_sdm845_smmu500_reset,

	.reset = qcom_smmu500_reset,

};



struct arm_smmu_device *qcom_smmu_impl_init(struct arm_smmu_device *smmu)

CRA Git | Maintained and supported by SUSTech CRA and CCSE