Skip to contentSkip to conversation

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

PATCH New Robin Murphy 2 participants 2 messages Sep 25, 2017 IOMMU

lore
Share & tools
lore

Robin Murphy

author reviewer
#0 lore raw

PATCH 1/1 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.

Reported-by Will Deacon <[email protected]>
Signed-off-by Robin Murphy <[email protected]>
---
 drivers/iommu/arm-smmu-v3.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iommu/arm-smmu-v3.c +1 -1
index 47f52b1ab838..4c63b3cf4eba 100644
@@ -2523,7 +2523,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) {
Signature · 1 line
2.13.4.dirty
#1 lore raw

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

Quoted 10 lines · Robin Murphy

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.

Reported-by Will Deacon <[email protected]>
Signed-off-by Robin Murphy <[email protected]>
---
 drivers/iommu/arm-smmu-v3.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Apologies - missed while reshuffling the probe path to enable ACPI probing:

Acked-by Lorenzo Pieralisi <[email protected]>
Quoted 20 lines
drivers/iommu/arm-smmu-v3.c +1 -1
index 47f52b1ab838..4c63b3cf4eba 100644
@@ -2523,7 +2523,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) {
Signature · 6 lines
2.13.4.dirty

_______________________________________________
iommu mailing list
iommu at lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu