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

Commit 2a22baa2 authored by Robin Murphy's avatar Robin Murphy Committed by Will Deacon
Browse files

iommu/arm-smmu-v3: Correct COHACC override message 



Slightly confusingly, when reporting a mismatch of the ID register
value, we still refer to the IORT COHACC override flag as the
"dma-coherent property" if we booted with ACPI. Update the message
to be firmware-agnostic in line with SMMUv2.

Acked-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Reported-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarRobin Murphy <robin.murphy@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 9cff86fd

drivers/iommu/arm-smmu-v3.c

+1 −1
Original line number Diff line number Diff line
@@ -2535,7 +2535,7 @@ static int arm_smmu_device_hw_probe(struct arm_smmu_device *smmu) 
	 * register, but warn on mismatch.

	 */

	if (!!(reg & IDR0_COHACC) != coherent)

		dev_warn(smmu->dev, "IDR0.COHACC overridden by dma-coherent property (%s)\n",

		dev_warn(smmu->dev, "IDR0.COHACC overridden by FW configuration (%s)\n",

			 coherent ? "true" : "false");



	switch (reg & IDR0_STALL_MODEL_MASK << IDR0_STALL_MODEL_SHIFT) {