aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHector Martin <[email protected]>2023-09-22 23:55:23 +0900
committerJoerg Roedel <[email protected]>2023-09-25 11:37:19 +0200
commitc7bd8a1f45bada7725d11266df7fd5cb549b3098 (patch)
treec630d205dc82bd1f09fe6b387982b05d9c92aeea
parent7accef5353746caf75a70e9d6f2ac257f247bd78 (diff)
iommu/apple-dart: Handle DMA_FQ domains in attach_dev()
Commit a4fdd9762272 ("iommu: Use flush queue capability") hid the IOMMU_DOMAIN_DMA_FQ domain type from domain allocation. A check was introduced in iommu_dma_init_domain() to fall back if not supported, but this check runs too late: by that point, devices have been attached to the IOMMU, and apple-dart's attach_dev() callback does not expect IOMMU_DOMAIN_DMA_FQ domains. Change the logic so the IOMMU_DOMAIN_DMA codepath is the default, instead of explicitly enumerating all types. Fixes an apple-dart regression in v6.5. Cc: [email protected] Cc: [email protected] Suggested-by: Robin Murphy <[email protected]> Fixes: a4fdd9762272 ("iommu: Use flush queue capability") Signed-off-by: Hector Martin <[email protected]> Reviewed-by: Neal Gompa <[email protected]> Reviewed-by: Jason Gunthorpe <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Joerg Roedel <[email protected]>
-rw-r--r--drivers/iommu/apple-dart.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/iommu/apple-dart.c b/drivers/iommu/apple-dart.c
index 2082081402d3..0b8927508427 100644
--- a/drivers/iommu/apple-dart.c
+++ b/drivers/iommu/apple-dart.c
@@ -671,8 +671,7 @@ static int apple_dart_attach_dev(struct iommu_domain *domain,
return ret;
switch (domain->type) {
- case IOMMU_DOMAIN_DMA:
- case IOMMU_DOMAIN_UNMANAGED:
+ default:
ret = apple_dart_domain_add_streams(dart_domain, cfg);
if (ret)
return ret;