Skip to content

Commit f9afa31

Browse files
rmurphy-armjoergroedel
authored andcommitted
iommu/arm-smmu: Prepare for multiple DMA domain types
In preparation for the strict vs. non-strict decision for DMA domains to be expressed in the domain type, make sure we expose our flush queue awareness by accepting the new domain type. Signed-off-by: Robin Murphy <[email protected]> Link: https://lore.kernel.org/r/8f217ef285bd0bb9456c27ef622d2efdbbca1ad8.1628682049.git.robin.murphy@arm.com Signed-off-by: Joerg Roedel <[email protected]>
1 parent 6d59603 commit f9afa31

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1972,6 +1972,7 @@ static struct iommu_domain *arm_smmu_domain_alloc(unsigned type)
19721972

19731973
if (type != IOMMU_DOMAIN_UNMANAGED &&
19741974
type != IOMMU_DOMAIN_DMA &&
1975+
type != IOMMU_DOMAIN_DMA_FQ &&
19751976
type != IOMMU_DOMAIN_IDENTITY)
19761977
return NULL;
19771978

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -866,7 +866,8 @@ static struct iommu_domain *arm_smmu_domain_alloc(unsigned type)
866866
struct arm_smmu_domain *smmu_domain;
867867

868868
if (type != IOMMU_DOMAIN_UNMANAGED && type != IOMMU_DOMAIN_IDENTITY) {
869-
if (using_legacy_binding || type != IOMMU_DOMAIN_DMA)
869+
if (using_legacy_binding ||
870+
(type != IOMMU_DOMAIN_DMA && type != IOMMU_DOMAIN_DMA_FQ))
870871
return NULL;
871872
}
872873
/*

0 commit comments

Comments
 (0)