Skip to content

Commit 320000e

Browse files
committed
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
2 parents b66b449 + 160c63f commit 320000e

File tree

3 files changed

+15
-4
lines changed

3 files changed

+15
-4
lines changed

drivers/iommu/amd_iommu_quirks.c

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,19 @@ static const struct dmi_system_id ivrs_quirks[] __initconst = {
7373
},
7474
.driver_data = (void *)&ivrs_ioapic_quirks[DELL_LATITUDE_5495],
7575
},
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+
},
7689
{
7790
.callback = ivrs_ioapic_quirk_cb,
7891
.ident = "Lenovo ideapad 330S-15ARR",

drivers/iommu/intel-iommu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2794,7 +2794,7 @@ static int identity_mapping(struct device *dev)
27942794
struct device_domain_info *info;
27952795

27962796
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)
27982798
return (info->domain == si_domain);
27992799

28002800
return 0;

drivers/iommu/ipmmu-vmsa.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1105,10 +1105,8 @@ static int ipmmu_probe(struct platform_device *pdev)
11051105
/* Root devices have mandatory IRQs */
11061106
if (ipmmu_is_root(mmu)) {
11071107
irq = platform_get_irq(pdev, 0);
1108-
if (irq < 0) {
1109-
dev_err(&pdev->dev, "no IRQ found\n");
1108+
if (irq < 0)
11101109
return irq;
1111-
}
11121110

11131111
ret = devm_request_irq(&pdev->dev, irq, ipmmu_irq, 0,
11141112
dev_name(&pdev->dev), mmu);

0 commit comments

Comments
 (0)