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

Commit 7e6d6e9f 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: Remove some duplicate macro definitions"

parents 7738323a dba49066

drivers/iommu/arm-smmu.c

+4 −9
Original line number Diff line number Diff line
@@ -293,13 +293,6 @@ 


#define FSYNR0_WNR			(1 << 4)



#define ARM_SMMU_IMPL_DEF0(smmu) \

	((smmu)->base + (2 * (1 << (smmu)->pgshift)))

#define ARM_SMMU_IMPL_DEF1(smmu) \

	((smmu)->base + (6 * (1 << (smmu)->pgshift)))

#define IMPL_DEF1_MICRO_MMU_CTRL	0

#define MICRO_MMU_CTRL_LOCAL_HALT_REQ	(1 << 2)



static int force_stage;

module_param_named(force_stage, force_stage, int, S_IRUGO | S_IWUSR);

MODULE_PARM_DESC(force_stage,
@@ -2243,10 +2236,12 @@ static int arm_smmu_wait_for_halt(struct arm_smmu_device *smmu) 


static int __arm_smmu_halt(struct arm_smmu_device *smmu, bool wait)

{

	u32 reg;

	void __iomem *impl_def1_base = ARM_SMMU_IMPL_DEF1(smmu);



	writel_relaxed(MICRO_MMU_CTRL_LOCAL_HALT_REQ,

		impl_def1_base + IMPL_DEF1_MICRO_MMU_CTRL);

	reg = readl_relaxed(impl_def1_base + IMPL_DEF1_MICRO_MMU_CTRL);

	reg |= MICRO_MMU_CTRL_LOCAL_HALT_REQ;

	writel_relaxed(reg, impl_def1_base + IMPL_DEF1_MICRO_MMU_CTRL);



	return wait ? arm_smmu_wait_for_halt(smmu) : 0;

}