Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9b691de authored by Hector Martin's avatar Hector Martin Committed by Greg Kroah-Hartman
Browse files

iommu/io-pgtable-arm: Fix table descriptor paddr formatting 



[ Upstream commit 9abe2ac834851a7d0b0756e295cf7a292c45ca53 ]

Table descriptors were being installed without properly formatting the
address using paddr_to_iopte, which does not match up with the
iopte_deref in __arm_lpae_map. This is incorrect for the LPAE pte
format, as it does not handle the high bits properly.

This was found on Apple T6000 DARTs, which require a new pte format
(different shift); adding support for that to
paddr_to_iopte/iopte_to_paddr caused it to break badly, as even <48-bit
addresses would end up incorrect in that case.

Fixes: 6c89928f ("iommu/io-pgtable-arm: Support 52-bit physical address")
Acked-by: default avatarRobin Murphy <robin.murphy@arm.com>
Signed-off-by: default avatarHector Martin <marcan@marcan.st>
Link: https://lore.kernel.org/r/20211120031343.88034-1-marcan@marcan.st


Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 48fc8eeb

drivers/iommu/io-pgtable-arm.c

+5 −4
Original line number Diff line number Diff line
@@ -351,11 +351,12 @@ static int arm_lpae_init_pte(struct arm_lpae_io_pgtable *data, 
static arm_lpae_iopte arm_lpae_install_table(arm_lpae_iopte *table,

					     arm_lpae_iopte *ptep,

					     arm_lpae_iopte curr,

					     struct io_pgtable_cfg *cfg)

					     struct arm_lpae_io_pgtable *data)

{

	arm_lpae_iopte old, new;

	struct io_pgtable_cfg *cfg = &data->iop.cfg;



	new = __pa(table) | ARM_LPAE_PTE_TYPE_TABLE;

	new = paddr_to_iopte(__pa(table), data) | ARM_LPAE_PTE_TYPE_TABLE;

	if (cfg->quirks & IO_PGTABLE_QUIRK_ARM_NS)

		new |= ARM_LPAE_PTE_NSTABLE;
@@ -406,7 +407,7 @@ static int __arm_lpae_map(struct arm_lpae_io_pgtable *data, unsigned long iova, 
		if (!cptep)

			return -ENOMEM;



		pte = arm_lpae_install_table(cptep, ptep, 0, cfg);

		pte = arm_lpae_install_table(cptep, ptep, 0, data);

		if (pte)

			__arm_lpae_free_pages(cptep, tblsz, cfg);

	} else if (!cfg->coherent_walk && !(pte & ARM_LPAE_PTE_SW_SYNC)) {
@@ -575,7 +576,7 @@ static size_t arm_lpae_split_blk_unmap(struct arm_lpae_io_pgtable *data, 
		__arm_lpae_init_pte(data, blk_paddr, pte, lvl, &tablep[i]);

	}



	pte = arm_lpae_install_table(tablep, ptep, blk_pte, cfg);

	pte = arm_lpae_install_table(tablep, ptep, blk_pte, data);

	if (pte != blk_pte) {

		__arm_lpae_free_pages(tablep, tablesz, cfg);

		/*