Commit e97eace6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 334fe5d3 620bf9f9

arch/x86/include/asm/iommu.h

+3 −1
Original line number Diff line number Diff line
@@ -25,8 +25,10 @@ arch_rmrr_sanity_check(struct acpi_dmar_reserved_memory *rmrr) 
{

	u64 start = rmrr->base_address;

	u64 end = rmrr->end_address + 1;

	int entry_type;



	if (e820__mapped_all(start, end, E820_TYPE_RESERVED))

	entry_type = e820__get_entry_type(start, end);

	if (entry_type == E820_TYPE_RESERVED || entry_type == E820_TYPE_NVS)

		return 0;



	pr_err(FW_BUG "No firmware reserved region can cover this RMRR [%#018Lx-%#018Lx], contact BIOS vendor for fixes\n",

drivers/acpi/arm64/iort.c

+2 −1
Original line number Diff line number Diff line
@@ -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(&region->list, head);

		}

drivers/iommu/amd/iommu.c

+4 −3
Original line number Diff line number Diff line
@@ -2330,7 +2330,8 @@ static void amd_iommu_get_resv_regions(struct device *dev, 
			type = IOMMU_RESV_RESERVED;



		region = iommu_alloc_resv_region(entry->address_start,

						 length, prot, type);

						 length, prot, type,

						 GFP_KERNEL);

		if (!region) {

			dev_err(dev, "Out of memory allocating dm-regions\n");

			return;
@@ -2340,14 +2341,14 @@ static void amd_iommu_get_resv_regions(struct device *dev, 


	region = iommu_alloc_resv_region(MSI_RANGE_START,

					 MSI_RANGE_END - MSI_RANGE_START + 1,

					 0, IOMMU_RESV_MSI);

					 0, IOMMU_RESV_MSI, GFP_KERNEL);

	if (!region)

		return;

	list_add_tail(&region->list, head);



	region = iommu_alloc_resv_region(HT_RANGE_START,

					 HT_RANGE_END - HT_RANGE_START + 1,

					 0, IOMMU_RESV_RESERVED);

					 0, IOMMU_RESV_RESERVED, GFP_KERNEL);

	if (!region)

		return;

	list_add_tail(&region->list, head);

drivers/iommu/apple-dart.c

+1 −1
Original line number Diff line number Diff line
@@ -758,7 +758,7 @@ static void apple_dart_get_resv_regions(struct device *dev, 


		region = iommu_alloc_resv_region(DOORBELL_ADDR,

						 PAGE_SIZE, prot,

						 IOMMU_RESV_MSI);

						 IOMMU_RESV_MSI, GFP_KERNEL);

		if (!region)

			return;

drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c

+1 −1
Original line number Diff line number Diff line
@@ -2757,7 +2757,7 @@ static void arm_smmu_get_resv_regions(struct device *dev, 
	int prot = IOMMU_WRITE | IOMMU_NOEXEC | IOMMU_MMIO;



	region = iommu_alloc_resv_region(MSI_IOVA_BASE, MSI_IOVA_LENGTH,

					 prot, IOMMU_RESV_SW_MSI);

					 prot, IOMMU_RESV_SW_MSI, GFP_KERNEL);

	if (!region)

		return;