From eed034c55ce45858e1ca3bc3d0bbb203c0edc781 Mon Sep 17 00:00:00 2001 From: Charan Teja Reddy Date: Tue, 17 Aug 2021 14:59:37 +0530 Subject: [PATCH] iommu/arm-smmu: Remove 'qcom,power-always-on' property for SMMU The commit 8ffa6450ba0a ("iommu/arm-smmu: Add support for not removing SMMU power votes") add the support for not removing the power votes of smmu. It requires 'qcom,power-always-on' in smmu dt property to enable this support which is currently enabled only for gpu smmu. And this makes the clients of the SMMU to know If this dt property is enabled to make decissions in their drivers which is not directly available. Since there exists a device with atomic domain attached to apps smmu which will make power resources always on, this separate dt property to enable power resources for specific SMMU is not required. Thus remove the 'qcom,power-always-on' property which makes power resources of SMMU's as always ON when CONFIG_ARM_SMMU_POWER_ALWAYS_ON is enabled. Change-Id: I2ee1d330f5c1c65474fea7d6b2a9389ae3cf085d Signed-off-by: Charan Teja Reddy --- drivers/iommu/arm-smmu.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index ab1d9c5bc152..45522864d696 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -5115,9 +5115,9 @@ static int arm_smmu_device_dt_probe(struct platform_device *pdev) * management code in GKI results in slow unmap calls. To alleviate * that, we can remove the latency incurred by enabling/disabling the * power resources, by always keeping them on. + * */ - if (IS_ENABLED(CONFIG_ARM_SMMU_POWER_ALWAYS_ON) && - of_property_read_bool(dev->of_node, "qcom,power-always-on")) + if (IS_ENABLED(CONFIG_ARM_SMMU_POWER_ALWAYS_ON)) arm_smmu_power_on(smmu->pwr); /* @@ -5176,8 +5176,7 @@ static int arm_smmu_device_remove(struct platform_device *pdev) arm_smmu_power_off(smmu, smmu->pwr); /* Remove the extra reference that was taken in the probe function */ - if (IS_ENABLED(CONFIG_ARM_SMMU_POWER_ALWAYS_ON) && - of_property_read_bool(pdev->dev.of_node, "qcom,power-always-on")) + if (IS_ENABLED(CONFIG_ARM_SMMU_POWER_ALWAYS_ON)) arm_smmu_power_off(smmu, smmu->pwr); arm_smmu_exit_power_resources(smmu->pwr);