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

Commit 3a8ab788 authored by Nate Watterson's avatar Nate Watterson Committed by Greg Kroah-Hartman
Browse files

iommu/arm-smmu-v3: Clear prior settings when updating STEs 




[ Upstream commit 810871c57011eb3e89e6768932757f169d666cd2 ]

To prevent corruption of the stage-1 context pointer field when
updating STEs, rebuild the entire containing dword instead of
clearing individual fields.

Signed-off-by: default avatarNate Watterson <nwatters@codeaurora.org>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6f51c8a5

drivers/iommu/arm-smmu-v3.c

+2 −8
Original line number Diff line number Diff line
@@ -1040,13 +1040,8 @@ static void arm_smmu_write_strtab_ent(struct arm_smmu_device *smmu, u32 sid, 
		}

	}



	/* Nuke the existing Config, as we're going to rewrite it */

	val &= ~(STRTAB_STE_0_CFG_MASK << STRTAB_STE_0_CFG_SHIFT);



	if (ste->valid)

		val |= STRTAB_STE_0_V;

	else

		val &= ~STRTAB_STE_0_V;

	/* Nuke the existing STE_0 value, as we're going to rewrite it */

	val = ste->valid ? STRTAB_STE_0_V : 0;



	if (ste->bypass) {

		val |= disable_bypass ? STRTAB_STE_0_CFG_ABORT
@@ -1081,7 +1076,6 @@ static void arm_smmu_write_strtab_ent(struct arm_smmu_device *smmu, u32 sid, 
		val |= (ste->s1_cfg->cdptr_dma & STRTAB_STE_0_S1CTXPTR_MASK

		        << STRTAB_STE_0_S1CTXPTR_SHIFT) |

			STRTAB_STE_0_CFG_S1_TRANS;



	}



	if (ste->s2_cfg) {