Skip to contentSkip to conversation

iommu/vt-d: Restore IOMMU_CAP_CACHE_COHERENCY

PATCH Applied Alex Williamson 5 participants 5 messages Apr 8 – Apr 9

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 iommu/vt-d: Restore IOMMU_CAP_CACHE_COHERENCY

In removing IOMMU_CAP_DEFERRED_FLUSH, the below referenced commit was over-eager in removing the return, resulting in the test for IOMMU_CAP_CACHE_COHERENCY falling through to an irrelevant option.

Restore dropped return.

Fixes 1c18a1212c77 ("iommu/dma: Always allow DMA-FQ when iommupt provides the iommu_domain")
---
 drivers/iommu/intel/iommu.c | 1 +
 1 file changed, 1 insertion(+)
drivers/iommu/intel/iommu.c +1 -0
index 63cee27d6a5c..c3d18cd77d2f 100644
@@ -3212,6 +3212,7 @@ static bool intel_iommu_capable(struct device *dev, enum iommu_cap cap)
 
 	switch (cap) {
 	case IOMMU_CAP_CACHE_COHERENCY:
+		return true;
 	case IOMMU_CAP_PRE_BOOT_PROTECTION:
 		return dmar_platform_optin();
 	case IOMMU_CAP_ENFORCE_CACHE_COHERENCY:
Signature · 1 line
2.51.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Alex Williamson

In removing IOMMU_CAP_DEFERRED_FLUSH, the below referenced commit was over-eager in removing the return, resulting in the test for IOMMU_CAP_CACHE_COHERENCY falling through to an irrelevant option.

Restore dropped return.

Fixes 1c18a1212c77 ("iommu/dma: Always allow DMA-FQ when iommupt provides the iommu_domain")

I didn't think this was merged - I didn't get an email about it? Joerg I've noticed alot of silent merges from you lately is that deliberate or is something wrong?

But yes this is right:

Kevin and I both missed it!!

Thanks,
Jason

Reviewed-by
#2 lore raw
Quoted 18 lines

From: Jason Gunthorpe <[email protected]>
Sent: Thursday, April 9, 2026 7:50 AM

Quoted 7 lines · Alex Williamson

In removing IOMMU_CAP_DEFERRED_FLUSH, the below referenced commit was over-eager in removing the return, resulting in the test for IOMMU_CAP_CACHE_COHERENCY falling through to an irrelevant option.

Restore dropped return.

Fixes 1c18a1212c77 ("iommu/dma: Always allow DMA-FQ when iommupt

provides the iommu_domain")

Quoted 1 line

I didn't think this was merged - I didn't get an email about it? Joerg I've noticed alot of silent merges from you lately is that deliberate or is something wrong?

Quoted 6 lines

But yes this is right:

Kevin and I both missed it!!

yes it's missed.

maintainer Reviewed-by on v1 1/1
#3 lore raw
In reply to Alex Williamson
Quoted 11 lines · Alex Williamson

In removing IOMMU_CAP_DEFERRED_FLUSH, the below referenced commit was over-eager in removing the return, resulting in the test for IOMMU_CAP_CACHE_COHERENCY falling through to an irrelevant option.

Restore dropped return.

Fixes 1c18a1212c77 ("iommu/dma: Always allow DMA-FQ when iommupt provides the iommu_domain")
---
  drivers/iommu/intel/iommu.c | 1 +
  1 file changed, 1 insertion(+)
maintainer Applied
#4 lore raw
In reply to Alex Williamson
Quoted 8 lines · Alex Williamson

In removing IOMMU_CAP_DEFERRED_FLUSH, the below referenced commit was over-eager in removing the return, resulting in the test for IOMMU_CAP_CACHE_COHERENCY falling through to an irrelevant option.

Restore dropped return.

[...]

Applied to iommu (core), thanks!

[1/1] iommu/vt-d: Restore IOMMU_CAP_CACHE_COHERENCY

      https://git.kernel.org/iommu/c/ebfaf2bcc190

Cheers,

Signature · 5 lines
Will

https://fixes.arm64.dev
https://next.arm64.dev
https://will.arm64.dev