OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

IOMMU Fixes for Linux v5.4-rc5 

Including:
 
 	- 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.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEr9jSbILcajRFYWYyK/BELZcBGuMFAl25hsUACgkQK/BELZcB
 GuNl8hAAid3MRnf1p/k2W/a3OX6u3hAM0URTqKra5b6Dle8qWfJkcxyrRlcj9NBM
 0IgRgHXrSCn9srIXhMuseZyasK88Kqao2ZzesUihCWPT4WRFXDL2SRhPSYiUAwLV
 07H04VbVxzjJKDJeuyPyLhuUsYHEApYXVJcM/pBX1fXCPfuYquM9orIVIkY1N6iK
 ncDiJDEP2sm///J5OvMFKfWKC5ZEAjUjKDvXMUTw3/VfIyUKsPQT5Jc8VdsOKJOx
 DkadXp991IHfGnB4ZYGx7HBkaudTI5Fs6kPFvffQmGYKQBFnNzbcL1XKJe46ZvF9
 PrfE3n3zgTAPjYynSGwpM6y2JsinX1iCTlzTkd9p7YY+0g/sVEKiMVkFocmgUmGU
 fYzxBiigi1L6WWe/tKs8/gnBC/tuzZiAJzlSuZhLjLxbEhOZJunRze6hdH7401CN
 JY4JtVgKijgzxqVhV3KOO0cOnzPR6uEfyIsPvs66scyYyjihooOOc+90MaOWPjNb
 DfIoLkFyLM+50qViI3RJlkNpkhTqL+qCLZIkdcutIUdPP/xQxQ/TG+R0GNnAW9uc
 +BxiAkDwNjDCBsTWe1mVR7cyxBIv17lZkh8nyi34oTTa4JvKL9sbxDkWNj2OV9Sg
 ybq5Zuq9UyEVI86kCx8k3Ul4Nd4O726jOv0JPQ+1CmxeVVNuTEM=
 =Sce8
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2019-10-30 14:17:18 +01:00
parent b66b449872 160c63f909
commit 320000e72e
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/iommu/amd_iommu_quirks.c
View File

@ -73,6 +73,19 @@ static const struct dmi_system_id ivrs_quirks[] __initconst = {
},
.driver_data = (void *)&ivrs_ioapic_quirks[DELL_LATITUDE_5495],
},
{
/*
* Acer Aspire A315-41 requires the very same workaround as
* Dell Latitude 5495
*/
.callback = ivrs_ioapic_quirk_cb,
.ident = "Acer Aspire A315-41",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
DMI_MATCH(DMI_PRODUCT_NAME, "Aspire A315-41"),
},
.driver_data = (void *)&ivrs_ioapic_quirks[DELL_LATITUDE_5495],
},
{
.callback = ivrs_ioapic_quirk_cb,
.ident = "Lenovo ideapad 330S-15ARR",

2
drivers/iommu/intel-iommu.c
View File

@ -2794,7 +2794,7 @@ static int identity_mapping(struct device *dev)
struct device_domain_info *info;
info = dev->archdata.iommu;
if (info && info != DUMMY_DEVICE_DOMAIN_INFO)
if (info && info != DUMMY_DEVICE_DOMAIN_INFO && info != DEFER_DEVICE_DOMAIN_INFO)
return (info->domain == si_domain);
return 0;

4
drivers/iommu/ipmmu-vmsa.c
View File

@ -1105,10 +1105,8 @@ static int ipmmu_probe(struct platform_device *pdev)
/* Root devices have mandatory IRQs */
if (ipmmu_is_root(mmu)) {
irq = platform_get_irq(pdev, 0);
if (irq < 0) {
dev_err(&pdev->dev, "no IRQ found\n");
if (irq < 0)
return irq;
}
ret = devm_request_irq(&pdev->dev, irq, ipmmu_irq, 0,
dev_name(&pdev->dev), mmu);