Re: [REGRESSION] applespi from 6.12 onwards
From: Baolu Lu <baolu.lu@linux.intel.com>
Date: 2025-05-13 01:42:12
Also in:
linux-iommu, linux-spi, regressions, stable
Subsystem:
intel iommu (vt-d), iommu subsystem, the rest · Maintainers:
David Woodhouse, Lu Baolu, Joerg Roedel, Will Deacon, Linus Torvalds
On 5/12/25 20:16, kobarity wrote:
Baolu Lu wrote:quoted
On 5/11/25 21:31, kobarity wrote:quoted
Hi I'm also experiencing this problem on my MacBookPro14,3. Aditya Garg wrote:quoted
Hi Jörg Can you test the kernel here to see if this fixes your issue: https://github.com/t2linux/T2-Debian-and-Ubuntu-Kernel/actions/runs/14944200356 Alternatively you can try compiling your own kernel with this patch: https://lore.kernel.org/all/0-v1-c26553717e90+65f-iommu_vtd_ss_wo_jgg@nvidia.com/ (local)As far as I have tried, this patch did not solve the problem. By bisecting, I found that this problem was introduced by commit 2031c469f816 ("iommu/vt-d: Add support for static identity domain"). In fact, since this commit, it will panic at startup. This panic was fixed by commit 6e02a277f1db ("iommu/vt-d: Fix incorrect pci_for_each_dma_alias() for non-PCI devices"). So I applied commit 6e02a277f1db on commit 2031c469f816 and confirmed that the keyboard and touchpad is not working.Have you tried to apply commit 64f792981e35 ("iommu/vt-d: Remove device comparison in context_setup_pass_through_cb")?Yes, I tried it on yesterday's master branch, including commit 64f792981e35. - Keyboard/Touchpad NOT working: - No patches - With patch in https://lore.kernel.org/all/0-v1-c26553717e90+65f-iommu_vtd_ss_wo_jgg@nvidia.com/ (local) - Keyboard/Touchpad working: - With my workaround patch
Okay, thanks! Can you please try below change? I also attached a diff file in the attachment for your convenience.
diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
index 49530d5d8c85..9a86ead8377d 100644
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c@@ -1832,6 +1832,8 @@ static int dmar_domain_attach_device(struct dmar_domain *domain,
if (ret)
goto out_block_translation;
+ info->domain_attached = true;
+
return 0;
out_block_translation:@@ -3206,6 +3208,10 @@ void device_block_translation(struct device *dev) struct intel_iommu *iommu = info->iommu; unsigned long flags; + /* Device in DMA blocking state. Noting to do. */ + if (!info->domain_attached) + return; + if (info->domain) cache_tag_unassign_domain(info->domain, dev,
IOMMU_NO_PASID);
@@ -4302,6 +4308,9 @@ static int identity_domain_attach_dev(struct iommu_domain *domain, struct device
else
ret = device_setup_pass_through(dev);
+ if (!ret)
+ info->domain_attached = true;
+
return ret;
}
diff --git a/drivers/iommu/intel/iommu.h b/drivers/iommu/intel/iommu.h
index cbfb8bb4c94a..3ddbcc603de2 100644
--- a/drivers/iommu/intel/iommu.h
+++ b/drivers/iommu/intel/iommu.h@@ -774,6 +774,7 @@ struct device_domain_info { u8 ats_supported:1; u8 ats_enabled:1; u8 dtlb_extra_inval:1; /* Quirk for devices need extra flush */ + u8 domain_attached:1; /* Device has domain attached */ u8 ats_qdep; unsigned int iopf_refcount; struct device *dev; /* it's NULL for PCIe-to-PCI bridge */
Thanks, baolu
Attachments
- diff.patch [text/x-patch] 1422 bytes · preview