Skip to contentSkip to conversation

m68knommu: fix overwriting of bits in ColdFire V3 cache control

PATCH In review Greg Ungerer 2 participants 3 messages Jun 15, 2020 m68k architecture

lore
Share & tools
lore
#0 lore raw

PATCH 1/5 m68knommu: fix overwriting of bits in ColdFire V3 cache control

The Cache Control Register (CACR) of the ColdFire V3 has bits that control high level caching functions, and also enable/disable the use of the alternate stack pointer register (the EUSP bit) to provide separate supervisor and user stack pointer registers. The code as it is today will blindly clear the EUSP bit on cache actions like invalidation. So it is broken for this case - and that will result in failed booting (interrupt entry and exit processing will be completely hosed).

This only affects ColdFire V3 parts that support the alternate stack register (like the 5329 for example) - generally speaking new parts do, older parts don't. It has no impact on ColdFire V3 parts with the single stack pointer, like the 5307 for example.

Fix the cache bit defines used, so they maintain the EUSP bit when carrying out cache actions through the CACR register.

---
 arch/m68k/include/asm/m53xxacr.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/m68k/include/asm/m53xxacr.h +3 -3
index 9138a624c5c8..25b144495234 100644
@@ -89,9 +89,9 @@
  * coherency though in all cases. And for copyback caches we will need
  * to push cached data as well.
  */
-#define CACHE_INIT	  CACR_CINVA
-#define CACHE_INVALIDATE  CACR_CINVA
-#define CACHE_INVALIDATED CACR_CINVA
+#define CACHE_INIT        (CACHE_MODE + CACR_CINVA)
+#define CACHE_INVALIDATE  (CACHE_MODE + CACR_CINVA)
+#define CACHE_INVALIDATED (CACHE_MODE + CACR_CINVA)
 
 #define ACR0_MODE	((CONFIG_RAMBASE & 0xff000000) + \
 			 (0x000f0000) + \
Signature · 1 line
2.25.1
#1 lore raw

Hi Greg,

Quoted 14 lines · Greg Ungerer

The Cache Control Register (CACR) of the ColdFire V3 has bits that control high level caching functions, and also enable/disable the use of the alternate stack pointer register (the EUSP bit) to provide separate supervisor and user stack pointer registers. The code as it is today will blindly clear the EUSP bit on cache actions like invalidation. So it is broken for this case - and that will result in failed booting (interrupt entry and exit processing will be completely hosed).

This only affects ColdFire V3 parts that support the alternate stack register (like the 5329 for example) - generally speaking new parts do, older parts don't. It has no impact on ColdFire V3 parts with the single stack pointer, like the 5307 for example.

Quoted 4 lines

Fix the cache bit defines used, so they maintain the EUSP bit when carrying out cache actions through the CACR register.

Thanks for your patch!

arch/m68k/include/asm/m53xxacr.h line 92

Quoted 10 lines
arch/m68k/include/asm/m53xxacr.h +1 -3
@@ -89,9 +89,9 @@
  * coherency though in all cases. And for copyback caches we will need
  * to push cached data as well.
  */
-#define CACHE_INIT       CACR_CINVA
-#define CACHE_INVALIDATE  CACR_CINVA
-#define CACHE_INVALIDATED CACR_CINVA
+#define CACHE_INIT        (CACHE_MODE + CACR_CINVA)

This line is different from the RFC v2 in
https://www.spinics.net/lists/linux-m68k/msg13973.html ?

arch/m68k/include/asm/m53xxacr.h line 94

Quoted 2 lines
arch/m68k/include/asm/m53xxacr.h +2 -0
+#define CACHE_INVALIDATE  (CACHE_MODE + CACR_CINVA)
+#define CACHE_INVALIDATED (CACHE_MODE + CACR_CINVA)

Gr{oetje,eeting}s,

Geert

Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
#2 lore raw

Hi Geert,

Quoted 22 lines · Geert Uytterhoeven
Quoted 14 lines · Greg Ungerer

The Cache Control Register (CACR) of the ColdFire V3 has bits that control high level caching functions, and also enable/disable the use of the alternate stack pointer register (the EUSP bit) to provide separate supervisor and user stack pointer registers. The code as it is today will blindly clear the EUSP bit on cache actions like invalidation. So it is broken for this case - and that will result in failed booting (interrupt entry and exit processing will be completely hosed).

This only affects ColdFire V3 parts that support the alternate stack register (like the 5329 for example) - generally speaking new parts do, older parts don't. It has no impact on ColdFire V3 parts with the single stack pointer, like the 5307 for example.

Quoted 4 lines

Fix the cache bit defines used, so they maintain the EUSP bit when carrying out cache actions through the CACR register.

Thanks for your patch!

Quoted 13 lines

arch/m68k/include/asm/m53xxacr.h line 92

Quoted 10 lines
arch/m68k/include/asm/m53xxacr.h +1 -3
@@ -89,9 +89,9 @@
   * coherency though in all cases. And for copyback caches we will need
   * to push cached data as well.
   */
-#define CACHE_INIT       CACR_CINVA
-#define CACHE_INVALIDATE  CACR_CINVA
-#define CACHE_INVALIDATED CACR_CINVA
+#define CACHE_INIT        (CACHE_MODE + CACR_CINVA)

This line is different from the RFC v2 in
https://www.spinics.net/lists/linux-m68k/msg13973.html ?

Thanks Geert, you are absolutely correct. I will generate a v2 with the correct change.

Regards
Greg