Skip to contentSkip to conversation

xtensa: add missing isync to the cpu_reset TLB code

PATCH In review Max Filippov 1 participant 2 messages Aug 12, 2019 – Aug 13, 2019 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore

Max Filippov

author maintainer
#0 lore raw

PATCH 1/1 xtensa: add missing isync to the cpu_reset TLB code

ITLB entry modifications must be followed by the isync instruction before the new entries are possibly used. cpu_reset lacks one isync between ITLB way 6 initialization and jump to the identity mapping. Add missing isync to xtensa cpu_reset.

---
 arch/xtensa/kernel/setup.c | 1 +
 1 file changed, 1 insertion(+)
arch/xtensa/kernel/setup.c +1 -0
index 5cb8a62e091c..7c3106093c75 100644
@@ -511,6 +511,7 @@ void cpu_reset(void)
 				      "add	%2, %2, %7\n\t"
 				      "addi	%0, %0, -1\n\t"
 				      "bnez	%0, 1b\n\t"
+				      "isync\n\t"
 				      /* Jump to identity mapping */
 				      "jx	%3\n"
 				      "2:\n\t"
Signature · 1 line
2.11.0

A message that is not in the archive (sent off-list or not yet received): [email protected]

author maintainer
#2 lore raw

Hi Sasha,

Quoted 14 lines · Sasha Levin

This commit has been processed because it contains a -stable tag. The stable tag indicates that it's relevant for the following trees: all

The bot has tested the following trees: v5.2.8, v4.19.66, v4.14.138, v4.9.189, v4.4.189.

v5.2.8: Build OK!
v4.19.66: Build OK!
v4.14.138: Build OK!
v4.4.189: Failed to apply! Possible dependencies:
4f2056873ff0 ("xtensa: extract common CPU reset code into separate function") bf15f86b343e ("xtensa: initialize MMU before jumping to reset vector") ea951c34ea95 ("xtensa: fix icountlevel setting in cpu_reset")

Quoted 3 lines

NOTE: The patch will not be queued to stable trees until it is upstream.

How should we proceed with this patch?

It should be applied to stable trees for linux versions 4.10 and newer.

Signature · 2 lines
Thanks.
-- Max