diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2022-10-21 17:47:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-10-21 17:47:39 -0700 |
| commit | e97eace635a42da4644290179aea496178e64988 (patch) | |
| tree | 8f9fed17b6f2cbaa78fd4e7f8e77c78a9560cb22 /drivers/acpi/arm64/iort.c | |
| parent | Merge tag 'for-linus-2022102101' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid (diff) | |
| parent | iommu/vt-d: Clean up si_domain in the init_dmars() error path (diff) | |
| download | wireguard-linux-e97eace635a42da4644290179aea496178e64988.tar.xz wireguard-linux-e97eace635a42da4644290179aea496178e64988.zip | |
Merge tag 'iommu-fixes-v6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
Pull iommu fixes from Joerg Roedel:
"Intel VT-d fixes:
- Fix a lockdep splat issue in intel_iommu_init()
- Allow NVS regions to pass RMRR check
- Domain cleanup in error path"
* tag 'iommu-fixes-v6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
iommu/vt-d: Clean up si_domain in the init_dmars() error path
iommu/vt-d: Allow NVS regions in arch_rmrr_sanity_check()
iommu/vt-d: Use rcu_lock in get_resv_regions
iommu: Add gfp parameter to iommu_alloc_resv_region
Diffstat (limited to 'drivers/acpi/arm64/iort.c')
| -rw-r--r-- | drivers/acpi/arm64/iort.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c index ca2aed86b540..8059baf4ef27 100644 --- a/drivers/acpi/arm64/iort.c +++ b/drivers/acpi/arm64/iort.c @@ -1142,7 +1142,8 @@ static void iort_iommu_msi_get_resv_regions(struct device *dev, struct iommu_resv_region *region; region = iommu_alloc_resv_region(base + SZ_64K, SZ_64K, - prot, IOMMU_RESV_MSI); + prot, IOMMU_RESV_MSI, + GFP_KERNEL); if (region) list_add_tail(®ion->list, head); } |