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

Commit 516747fd authored by Isaac J. Manjarres's avatar Isaac J. Manjarres
Browse files

iommu/arm-smmu: Fix DOMAIN_ATTR_PAGE_TABLE_FORCE_COHERENT enablement 



The functionality provided by DOMAIN_ATTR_PAGE_TABLE_FORCE_COHERENT
can be guaranteed, independent of CONFIG_QCOM_IOMMU_IO_PGTABLE_QUIRKS,
so do not guard its enablement with that config.

Change-Id: Ifae4280f256b99529ae5a074dbc91b37b5d87e21
Signed-off-by: default avatarIsaac J. Manjarres <isaacm@codeaurora.org>
parent b38b5109

drivers/iommu/arm-smmu.c

+11 −15
Original line number Original line Diff line number Diff line
@@ -3674,7 +3674,6 @@ static int __arm_smmu_domain_set_attr2(struct iommu_domain *domain, 
	case DOMAIN_ATTR_PAGE_TABLE_FORCE_COHERENT: {

	case DOMAIN_ATTR_PAGE_TABLE_FORCE_COHERENT: {

		int force_coherent = *((int *)data);

		int force_coherent = *((int *)data);





		if (IS_ENABLED(CONFIG_QCOM_IOMMU_IO_PGTABLE_QUIRKS)) {

		if (smmu_domain->smmu != NULL) {

		if (smmu_domain->smmu != NULL) {

			dev_err(smmu_domain->smmu->dev,

			dev_err(smmu_domain->smmu->dev,

			  "cannot change force coherent attribute while attached\n");

			  "cannot change force coherent attribute while attached\n");
@@ -3688,9 +3687,6 @@ static int __arm_smmu_domain_set_attr2(struct iommu_domain *domain, 
				  smmu_domain->attributes);

				  smmu_domain->attributes);

			ret = 0;

			ret = 0;

		}

		}

		} else {

			ret = -ENOTSUPP;

		}

		break;

		break;

	}

	}

	default:

	default: