Skip to content

Commit 2a22baa

Browse files
rmurphy-armwildea01
authored andcommitted
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: Lorenzo Pieralisi <[email protected]> Reported-by: Will Deacon <[email protected]> Signed-off-by: Robin Murphy <[email protected]> Signed-off-by: Will Deacon <[email protected]>
1 parent 9cff86f commit 2a22baa

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/iommu/arm-smmu-v3.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2535,7 +2535,7 @@ static int arm_smmu_device_hw_probe(struct arm_smmu_device *smmu)
25352535
* register, but warn on mismatch.
25362536
*/
25372537
if (!!(reg & IDR0_COHACC) != coherent)
2538-
dev_warn(smmu->dev, "IDR0.COHACC overridden by dma-coherent property (%s)\n",
2538+
dev_warn(smmu->dev, "IDR0.COHACC overridden by FW configuration (%s)\n",
25392539
coherent ? "true" : "false");
25402540

25412541
switch (reg & IDR0_STALL_MODEL_MASK << IDR0_STALL_MODEL_SHIFT) {

0 commit comments

Comments
 (0)