Merge "iommu: arm-smmu: use correct SHCFG shift for sCR0" (14f2f0fa) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/iommu/arm-smmu.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3465,7 +3465,7 @@ static void arm_smmu_device_reset(struct arm_smmu_device *smmu)

		/* Force bypass transaction to be Non-Shareable & not io-coherent */
		reg &= ~(sCR0_SHCFG_MASK << sCR0_SHCFG_SHIFT);
		reg \|= sCR0_SHCFG_NSH;
		reg \|= sCR0_SHCFG_NSH << sCR0_SHCFG_SHIFT;

		/* Push the button */
		__arm_smmu_tlb_sync(smmu);