Commit a91bcc2b authored by Will Deacon's avatar Will Deacon

Revert "iommu/arm-smmu-v3: Disable detection of ATS and PRI"

This reverts commit b5e86196.

Now that ATC invalidation is performed in the correct places and without
incurring a locking overhead for non-ATS systems, we can re-enable the
corresponding SMMU feature detection.
Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent cdb8a3c3
...@@ -3336,13 +3336,11 @@ static int arm_smmu_device_hw_probe(struct arm_smmu_device *smmu) ...@@ -3336,13 +3336,11 @@ static int arm_smmu_device_hw_probe(struct arm_smmu_device *smmu)
} }
/* Boolean feature flags */ /* Boolean feature flags */
#if 0 /* ATS invalidation is slow and broken */
if (IS_ENABLED(CONFIG_PCI_PRI) && reg & IDR0_PRI) if (IS_ENABLED(CONFIG_PCI_PRI) && reg & IDR0_PRI)
smmu->features |= ARM_SMMU_FEAT_PRI; smmu->features |= ARM_SMMU_FEAT_PRI;
if (IS_ENABLED(CONFIG_PCI_ATS) && reg & IDR0_ATS) if (IS_ENABLED(CONFIG_PCI_ATS) && reg & IDR0_ATS)
smmu->features |= ARM_SMMU_FEAT_ATS; smmu->features |= ARM_SMMU_FEAT_ATS;
#endif
if (reg & IDR0_SEV) if (reg & IDR0_SEV)
smmu->features |= ARM_SMMU_FEAT_SEV; smmu->features |= ARM_SMMU_FEAT_SEV;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment