mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 09:59:32 +00:00
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 <robin.murphy@arm.com> Link: https://lore.kernel.org/r/8f217ef285bd0bb9456c27ef622d2efdbbca1ad8.1628682049.git.robin.murphy@arm.com Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
parent
6d59603939
commit
f9afa313ad
2 changed files with 3 additions and 1 deletions
|
@ -1972,6 +1972,7 @@ static struct iommu_domain *arm_smmu_domain_alloc(unsigned type)
|
||||||
|
|
||||||
if (type != IOMMU_DOMAIN_UNMANAGED &&
|
if (type != IOMMU_DOMAIN_UNMANAGED &&
|
||||||
type != IOMMU_DOMAIN_DMA &&
|
type != IOMMU_DOMAIN_DMA &&
|
||||||
|
type != IOMMU_DOMAIN_DMA_FQ &&
|
||||||
type != IOMMU_DOMAIN_IDENTITY)
|
type != IOMMU_DOMAIN_IDENTITY)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
|
|
|
@ -866,7 +866,8 @@ static struct iommu_domain *arm_smmu_domain_alloc(unsigned type)
|
||||||
struct arm_smmu_domain *smmu_domain;
|
struct arm_smmu_domain *smmu_domain;
|
||||||
|
|
||||||
if (type != IOMMU_DOMAIN_UNMANAGED && type != IOMMU_DOMAIN_IDENTITY) {
|
if (type != IOMMU_DOMAIN_UNMANAGED && type != IOMMU_DOMAIN_IDENTITY) {
|
||||||
if (using_legacy_binding || type != IOMMU_DOMAIN_DMA)
|
if (using_legacy_binding ||
|
||||||
|
(type != IOMMU_DOMAIN_DMA && type != IOMMU_DOMAIN_DMA_FQ))
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in a new issue