Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'iommu-fixes-v5.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
Pull iommu fixes from Joerg Roedel:
- Follow-on fix for Renesas IPMMU to get rid of a redundant error
message.
- Quirk for AMD IOMMU to make it work on another Acer Laptop model with
a broken IVRS ACPI table.
- Fix for a panic at kdump in the Intel IOMMU driver.
* tag 'iommu-fixes-v5.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
iommu/vt-d: Fix panic after kexec -p for kdump
iommu/amd: Apply the same IVRS IOAPIC workaround to Acer Aspire A315-41
iommu/ipmmu-vmsa: Remove dev_err() on platform_get_irq() failure
+15
-4
+13
drivers/iommu/amd_iommu_quirks.c
+13
drivers/iommu/amd_iommu_quirks.c
···
74
74
.driver_data = (void *)&ivrs_ioapic_quirks[DELL_LATITUDE_5495],
75
75
},
76
76
{
77
+
/*
78
+
* Acer Aspire A315-41 requires the very same workaround as
79
+
* Dell Latitude 5495
80
+
*/
81
+
.callback = ivrs_ioapic_quirk_cb,
82
+
.ident = "Acer Aspire A315-41",
83
+
.matches = {
84
+
DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
85
+
DMI_MATCH(DMI_PRODUCT_NAME, "Aspire A315-41"),
86
+
},
87
+
.driver_data = (void *)&ivrs_ioapic_quirks[DELL_LATITUDE_5495],
88
+
},
89
+
{
77
90
.callback = ivrs_ioapic_quirk_cb,
78
91
.ident = "Lenovo ideapad 330S-15ARR",
79
92
.matches = {
+1
-1
drivers/iommu/intel-iommu.c
+1
-1
drivers/iommu/intel-iommu.c
···
2794
2794
struct device_domain_info *info;
2795
2795
2796
2796
info = dev->archdata.iommu;
2797
-
if (info && info != DUMMY_DEVICE_DOMAIN_INFO)
2797
+
if (info && info != DUMMY_DEVICE_DOMAIN_INFO && info != DEFER_DEVICE_DOMAIN_INFO)
2798
2798
return (info->domain == si_domain);
2799
2799
2800
2800
return 0;
+1
-3
drivers/iommu/ipmmu-vmsa.c
+1
-3
drivers/iommu/ipmmu-vmsa.c
···
1105
1105
/* Root devices have mandatory IRQs */
1106
1106
if (ipmmu_is_root(mmu)) {
1107
1107
irq = platform_get_irq(pdev, 0);
1108
-
if (irq < 0) {
1109
-
dev_err(&pdev->dev, "no IRQ found\n");
1108
+
if (irq < 0)
1110
1109
return irq;
1111
-
}
1112
1110
1113
1111
ret = devm_request_irq(&pdev->dev, irq, ipmmu_irq, 0,
1114
1112
dev_name(&pdev->dev), mmu);