Commit 11cd3386 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

Merge branch 'for-joerg/arm-smmu/fixes' of... 

Merge branch 'for-joerg/arm-smmu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into iommu/fixes
parents 9d3a4de4 a03849e7

drivers/iommu/io-pgtable-arm-v7s.c

+5 −1
Original line number Diff line number Diff line
@@ -422,8 +422,12 @@ static int __arm_v7s_map(struct arm_v7s_io_pgtable *data, unsigned long iova, 
			pte |= ARM_V7S_ATTR_NS_TABLE;



		__arm_v7s_set_pte(ptep, pte, 1, cfg);

	} else {

	} else if (ARM_V7S_PTE_IS_TABLE(pte, lvl)) {

		cptep = iopte_deref(pte, lvl);

	} else {

		/* We require an unmap first */

		WARN_ON(!selftest_running);

		return -EEXIST;

	}



	/* Rinse, repeat */

drivers/iommu/io-pgtable-arm.c

+5 −1
Original line number Diff line number Diff line
@@ -335,8 +335,12 @@ static int __arm_lpae_map(struct arm_lpae_io_pgtable *data, unsigned long iova, 
		if (cfg->quirks & IO_PGTABLE_QUIRK_ARM_NS)

			pte |= ARM_LPAE_PTE_NSTABLE;

		__arm_lpae_set_pte(ptep, pte, cfg);

	} else {

	} else if (!iopte_leaf(pte, lvl)) {

		cptep = iopte_deref(pte, data);

	} else {

		/* We require an unmap first */

		WARN_ON(!selftest_running);

		return -EEXIST;

	}



	/* Rinse, repeat */

CRA Git | Maintained and supported by SUSTech CRA and CCSE