Skip to content

Commit 0dfe314

Browse files
rmurphy-armwilldeacon
authored andcommitted
iommu/arm-smmu: Clarify MMU-500 CPRE workaround
CPRE workarounds are implicated in at least 5 MMU-500 errata, some of which remain unfixed. The comment and warning message have proven to be unhelpfully misleading about this scope, so reword them to get the point across with less risk of going out of date or confusing users. Signed-off-by: Robin Murphy <[email protected]> Link: https://lore.kernel.org/r/dfa82171b5248ad7cf1f25592101a6eec36b8c9a.1728400877.git.robin.murphy@arm.com Signed-off-by: Will Deacon <[email protected]>
1 parent 8cf0b93 commit 0dfe314

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/iommu/arm/arm-smmu/arm-smmu-impl.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,15 +130,15 @@ int arm_mmu500_reset(struct arm_smmu_device *smmu)
130130

131131
/*
132132
* Disable MMU-500's not-particularly-beneficial next-page
133-
* prefetcher for the sake of errata #841119 and #826419.
133+
* prefetcher for the sake of at least 5 known errata.
134134
*/
135135
for (i = 0; i < smmu->num_context_banks; ++i) {
136136
reg = arm_smmu_cb_read(smmu, i, ARM_SMMU_CB_ACTLR);
137137
reg &= ~ARM_MMU500_ACTLR_CPRE;
138138
arm_smmu_cb_write(smmu, i, ARM_SMMU_CB_ACTLR, reg);
139139
reg = arm_smmu_cb_read(smmu, i, ARM_SMMU_CB_ACTLR);
140140
if (reg & ARM_MMU500_ACTLR_CPRE)
141-
dev_warn_once(smmu->dev, "Failed to disable prefetcher [errata #841119 and #826419], check ACR.CACHE_LOCK\n");
141+
dev_warn_once(smmu->dev, "Failed to disable prefetcher for errata workarounds, check SACR.CACHE_LOCK\n");
142142
}
143143

144144
return 0;

0 commit comments

Comments
 (0)