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

Merge tag 'iommu-fixes-v6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux 

Pull iommu fixes from Will Deacon:
 "We're still resolving a regression with the handling of unexpected
  page faults on SMMUv3, but we're not quite there with a fix yet.

   - Fix NULL dereference when freeing domain in Unisoc SPRD driver

   - Separate assignment statements with semicolons in AMD page-table
     code

   - Fix Tegra erratum workaround when the CPU is using 16KiB pages"

* tag 'iommu-fixes-v6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux:
  iommu: arm-smmu: Fix Tegra workaround for PAGE_SIZE mappings
  iommu/amd: Convert comma to semicolon
  iommu: sprd: Avoid NULL deref in sprd_iommu_hw_en
parents 04216211 726d4f52

drivers/iommu/amd/io_pgtable.c

+3 −3
Original line number Diff line number Diff line
@@ -588,9 +588,9 @@ static struct io_pgtable *v1_alloc_pgtable(struct io_pgtable_cfg *cfg, void *coo 
{

	struct amd_io_pgtable *pgtable = io_pgtable_cfg_to_data(cfg);



	cfg->pgsize_bitmap  = AMD_IOMMU_PGSIZES,

	cfg->ias            = IOMMU_IN_ADDR_BIT_SIZE,

	cfg->oas            = IOMMU_OUT_ADDR_BIT_SIZE,

	cfg->pgsize_bitmap  = AMD_IOMMU_PGSIZES;

	cfg->ias            = IOMMU_IN_ADDR_BIT_SIZE;

	cfg->oas            = IOMMU_OUT_ADDR_BIT_SIZE;

	cfg->tlb            = &v1_flush_ops;



	pgtable->iop.ops.map_pages    = iommu_v1_map_pages;

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

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ static int nvidia_smmu_init_context(struct arm_smmu_domain *smmu_domain, 
	 */

	if (of_device_is_compatible(np, "nvidia,tegra234-smmu") ||

	    of_device_is_compatible(np, "nvidia,tegra194-smmu")) {

		smmu->pgsize_bitmap = PAGE_SIZE;

		smmu->pgsize_bitmap &= GENMASK(PAGE_SHIFT, 0);

		pgtbl_cfg->pgsize_bitmap = smmu->pgsize_bitmap;

	}

drivers/iommu/sprd-iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -232,8 +232,8 @@ static void sprd_iommu_cleanup(struct sprd_iommu_domain *dom) 


	pgt_size = sprd_iommu_pgt_size(&dom->domain);

	dma_free_coherent(dom->sdev->dev, pgt_size, dom->pgt_va, dom->pgt_pa);

	dom->sdev = NULL;

	sprd_iommu_hw_en(dom->sdev, false);

	dom->sdev = NULL;

}



static void sprd_iommu_domain_free(struct iommu_domain *domain)