diff options
| author |   Robin Murphy <robin.murphy@arm.com> | 2017-09-25 14:55:40 +0100 |
|---|---|---|
| committer |   Will Deacon <will.deacon@arm.com> | 2017-10-20 16:55:05 +0100 |
| commit | 2a22baa2d17f37f9bd86febcb69f10dbe6792b58 (patch) | |
| tree | 67c1d82c3920b65a7e53125bc847cc1d01c8a23e /drivers/iommu/arm-smmu-v3.c | |
| parent | iommu/arm-smmu-v3: Avoid ILLEGAL setting of STE.S1STALLD and CD.S (diff) | |
| download | linux-dev-2a22baa2d17f37f9bd86febcb69f10dbe6792b58.tar.xz linux-dev-2a22baa2d17f37f9bd86febcb69f10dbe6792b58.zip | |
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 <lorenzo.pieralisi@arm.com>
Reported-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'drivers/iommu/arm-smmu-v3.c')
| -rw-r--r-- | drivers/iommu/arm-smmu-v3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c index 159117e2c5ad..d81d5dbffbe2 100644 --- a/drivers/iommu/arm-smmu-v3.c +++ b/drivers/iommu/arm-smmu-v3.c @@ -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) { |