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

Commit b0516d22 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "iommu/arm-smmu: Do a local halt around impl def programming"

parents 7fe0d7cf ff0c98e2
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -1662,14 +1662,19 @@ static void arm_smmu_domain_remove_master(struct arm_smmu_domain *smmu_domain,
	arm_smmu_disable_clocks(smmu);
}

static int arm_smmu_halt(struct arm_smmu_device *smmu);
static void arm_smmu_resume(struct arm_smmu_device *smmu);

static void arm_smmu_impl_def_programming(struct arm_smmu_device *smmu)
{
	int i;
	struct arm_smmu_impl_def_reg *regs = smmu->impl_def_attach_registers;

	arm_smmu_halt(smmu);
	for (i = 0; i < smmu->num_impl_def_attach_registers; ++i)
		writel_relaxed(regs[i].value,
			ARM_SMMU_GR0(smmu) + regs[i].offset);
	arm_smmu_resume(smmu);
}

static void arm_smmu_device_reset(struct arm_smmu_device *smmu);