Commit 8f1b4600 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'iommu-fixes-v6.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu 

Pull iommu fixes from Joerg Roedel:

 - Arm SMMU fixes from Will Deacon:
     - Fix TLB range command encoding when TTL, Num and Scale are all zero
     - Fix soft lockup by limiting TLB invalidation ops issued by SVA
     - Fix clocks description for SDM630 platform in arm-smmu DT binding

 - Intel VT-d fix from Lu Baolu:
     - Fix a suspend/hibernation problem in iommu_suspend()

 - Mediatek driver: Fix page table sharing for addresses over 4GiB

 - Apple/Dart: DMA_FQ handling fix in attach_dev()

* tag 'iommu-fixes-v6.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  iommu/vt-d: Avoid memory allocation in iommu_suspend()
  iommu/apple-dart: Handle DMA_FQ domains in attach_dev()
  iommu/mediatek: Fix share pgtable for iova over 4GB
  iommu/arm-smmu-v3: Fix soft lockup triggered by arm_smmu_mm_invalidate_range
  dt-bindings: arm-smmu: Fix SDM630 clocks description
  iommu/arm-smmu-v3: Avoid constructing invalid range commands
parents 8a749fd1 59df44bf

Documentation/devicetree/bindings/iommu/arm,smmu.yaml

+1 −1
Original line number Diff line number Diff line
@@ -270,6 +270,7 @@ allOf: 
          contains:

            enum:

              - qcom,msm8998-smmu-v2

              - qcom,sdm630-smmu-v2

    then:

      anyOf:

        - properties:
@@ -311,7 +312,6 @@ allOf: 
        compatible:

          contains:

            enum:

              - qcom,sdm630-smmu-v2

              - qcom,sm6375-smmu-v2

    then:

      anyOf:

drivers/iommu/apple-dart.c

+1 −2
Original line number Diff line number Diff line
@@ -671,8 +671,7 @@ static int apple_dart_attach_dev(struct iommu_domain *domain, 
		return ret;



	switch (domain->type) {

	case IOMMU_DOMAIN_DMA:

	case IOMMU_DOMAIN_UNMANAGED:

	default:

		ret = apple_dart_domain_add_streams(dart_domain, cfg);

		if (ret)

			return ret;

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

+16 −2
Original line number Diff line number Diff line
@@ -186,6 +186,15 @@ static void arm_smmu_free_shared_cd(struct arm_smmu_ctx_desc *cd) 
	}

}



/*

 * Cloned from the MAX_TLBI_OPS in arch/arm64/include/asm/tlbflush.h, this

 * is used as a threshold to replace per-page TLBI commands to issue in the

 * command queue with an address-space TLBI command, when SMMU w/o a range

 * invalidation feature handles too many per-page TLBI commands, which will

 * otherwise result in a soft lockup.

 */

#define CMDQ_MAX_TLBI_OPS		(1 << (PAGE_SHIFT - 3))



static void arm_smmu_mm_arch_invalidate_secondary_tlbs(struct mmu_notifier *mn,

						struct mm_struct *mm,

						unsigned long start,
@@ -201,8 +210,13 @@ static void arm_smmu_mm_arch_invalidate_secondary_tlbs(struct mmu_notifier *mn, 
	 * range. So do a simple translation here by calculating size correctly.

	 */

	size = end - start;

	if (!(smmu_domain->smmu->features & ARM_SMMU_FEAT_RANGE_INV)) {

		if (size >= CMDQ_MAX_TLBI_OPS * PAGE_SIZE)

			size = 0;

	} else {

		if (size == ULONG_MAX)

			size = 0;

	}



	if (!(smmu_domain->smmu->features & ARM_SMMU_FEAT_BTM)) {

		if (!size)

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

+10 −5
Original line number Diff line number Diff line
@@ -1895,18 +1895,23 @@ static void __arm_smmu_tlb_inv_range(struct arm_smmu_cmdq_ent *cmd, 
		/* Get the leaf page size */

		tg = __ffs(smmu_domain->domain.pgsize_bitmap);



		num_pages = size >> tg;



		/* Convert page size of 12,14,16 (log2) to 1,2,3 */

		cmd->tlbi.tg = (tg - 10) / 2;



		/*

		 * Determine what level the granule is at. For non-leaf, io-pgtable

		 * assumes .tlb_flush_walk can invalidate multiple levels at once,

		 * so ignore the nominal last-level granule and leave TTL=0.

		 * Determine what level the granule is at. For non-leaf, both

		 * io-pgtable and SVA pass a nominal last-level granule because

		 * they don't know what level(s) actually apply, so ignore that

		 * and leave TTL=0. However for various errata reasons we still

		 * want to use a range command, so avoid the SVA corner case

		 * where both scale and num could be 0 as well.

		 */

		if (cmd->tlbi.leaf)

			cmd->tlbi.ttl = 4 - ((ilog2(granule) - 3) / (tg - 3));



		num_pages = size >> tg;

		else if ((num_pages & CMDQ_TLBI_RANGE_NUM_MAX) == 1)

			num_pages++;

	}



	cmds.num = 0;

drivers/iommu/intel/iommu.c

+0 −16
Original line number Diff line number Diff line
@@ -2998,13 +2998,6 @@ static int iommu_suspend(void) 
	struct intel_iommu *iommu = NULL;

	unsigned long flag;



	for_each_active_iommu(iommu, drhd) {

		iommu->iommu_state = kcalloc(MAX_SR_DMAR_REGS, sizeof(u32),

					     GFP_KERNEL);

		if (!iommu->iommu_state)

			goto nomem;

	}



	iommu_flush_all();



	for_each_active_iommu(iommu, drhd) {
@@ -3024,12 +3017,6 @@ static int iommu_suspend(void) 
		raw_spin_unlock_irqrestore(&iommu->register_lock, flag);

	}

	return 0;



nomem:

	for_each_active_iommu(iommu, drhd)

		kfree(iommu->iommu_state);



	return -ENOMEM;

}



static void iommu_resume(void)
@@ -3061,9 +3048,6 @@ static void iommu_resume(void) 


		raw_spin_unlock_irqrestore(&iommu->register_lock, flag);

	}



	for_each_active_iommu(iommu, drhd)

		kfree(iommu->iommu_state);

}



static struct syscore_ops iommu_syscore_ops = {