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

Commit c90ce732 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "iommu: arm-smmu: Restore iommu context in case of hibernation"

parents d7939c3e 7b67798f

drivers/iommu/arm-smmu.c

+2 −1
Original line number Diff line number Diff line
@@ -4194,7 +4194,8 @@ static void arm_smmu_device_reset(struct arm_smmu_device *smmu) 
	 * Reset stream mapping groups: Initial values mark all SMRn as

	 * invalid and all S2CRn as bypass unless overridden.

	 */

	if (!(smmu->options & ARM_SMMU_OPT_SKIP_INIT)) {

	if (!(smmu->options & ARM_SMMU_OPT_SKIP_INIT) ||

			IS_ENABLED(CONFIG_HIBERNATION)) {

		for (i = 0; i < smmu->num_mapping_groups; ++i)

			arm_smmu_write_sme(smmu, i);