MIPS: refactor and cleanup start.S (part 1)
cover MIPS: refactor and cleanup start.S (part 1)
This is the first part of upcoming refactorings in start.S to cleanup the multiple and hard-to-follow code flows as well as adding more extension points required for modern and complex multi-core SoC's. The first parts concentrates on caches.
Daniel Schwierzeck (4):
mips: start.S: remove dead code
mips: add KSEG1 wrapper for change_k0_cca
mips: refactor disabling of caches
mips: add config options for generic cache setup code
arch/mips/Kconfig | 24 ++++++++++++++++++++++++ arch/mips/cpu/start.S | 24 +++++++++--------------- arch/mips/lib/cache_init.S | 38 ++++++++++++++++++++++++-------------- 3 files changed, 57 insertions(+), 29 deletions(-)
Signature · 1 line
2.27.0
PATCH 1/4 mips: start.S: remove dead code
Since commit 703ec9ddf965 ("MIPS: Stop building position independent code") the relocation code was completely reworked and removed from start.S. Remove some left-overs of the old code.
---
arch/mips/cpu/start.S | 9 --------- 1 file changed, 9 deletions(-)
arch/mips/cpu/start.S +0 -9
@@ -17,19 +17,10 @@ #endif #ifdef CONFIG_32BIT -# define MIPS_RELOC 3 # define STATUS_SET 0 #endif #ifdef CONFIG_64BIT -# ifdef CONFIG_SYS_LITTLE_ENDIAN -# define MIPS64_R_INFO(ssym, r_type3, r_type2, r_type) \ - (((r_type) << 24) | ((r_type2) << 16) | ((r_type3) << 8) | (ssym)) -# else -# define MIPS64_R_INFO(ssym, r_type3, r_type2, r_type) \ - ((r_type) | ((r_type2) << 8) | ((r_type3) << 16) | (ssym) << 24) -# endif -# define MIPS_RELOC MIPS64_R_INFO(0x00, 0x00, 0x12, 0x03) # define STATUS_SET ST0_KX #endif
Signature · 1 line
2.27.0
PATCH 1/4 mips: start.S: remove dead code
Quoted 5 lines · Daniel Schwierzeck
Since commit
703ec9ddf965("MIPS: Stop building position independent code") the relocation code was completely reworked and removed fromstart.S. Remove some left-overs of the old code.Signed-off-by Daniel Schwierzeck <[email protected]>
Thanks,
Stefan
Quoted 20 lines
---
arch/mips/cpu/start.S | 9 --------- 1 file changed, 9 deletions(-)arch/mips/cpu/start.S +0
-2@@ -17,19 +17,10 @@ #endif #ifdef CONFIG_32BIT -# define MIPS_RELOC 3 # define STATUS_SET 0 #endif #ifdef CONFIG_64BIT -# ifdef CONFIG_SYS_LITTLE_ENDIAN
arch/mips/cpu/start.S line 26
Quoted 10 lines
arch/mips/cpu/start.S +0
-7-# define MIPS64_R_INFO(ssym, r_type3, r_type2, r_type) \ - (((r_type) << 24) | ((r_type2) << 16) | ((r_type3) << 8) | (ssym)) -# else -# define MIPS64_R_INFO(ssym, r_type3, r_type2, r_type) \ - ((r_type) | ((r_type2) << 8) | ((r_type3) << 16) | (ssym) << 24) -# endif -# define MIPS_RELOC MIPS64_R_INFO(0x00, 0x00, 0x12, 0x03) # define STATUS_SET ST0_KX #endif
Viele Gr??e,
Stefan
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de
PATCH 2/4 mips: add KSEG1 wrapper for change_k0_cca
In reply to Daniel Schwierzeckchange_k0_cca() is called multiple times. Move the code for changing to KSEG1 to a macro to avoid code duplication.
Also fix missing change to KSEG1 when changing to CONF_CM_CACHABLE_COW.
---
arch/mips/lib/cache_init.S | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-)
arch/mips/lib/cache_init.S +18 -14
@@ -79,6 +79,21 @@ .set pop .endm + /* + * The changing of Kernel mode cacheability must be done from KSEG1. + * If the code is executing from KSEG0, jump to KSEG1 during the execution + * of change_k0_cca. change_k0_cca itself clears all hazards when returning. + */ + .macro change_k0_cca_kseg1 mode + PTR_LA t0, change_k0_cca + li t1, CPHYSADDR(~0) + and t0, t0, t1 + PTR_LI t1, CKSEG1 + or t0, t0, t1 + li a0, \mode + jalr t0 + .endm + /* * mips_cache_reset - low level initialisation of the primary caches *
@@ -317,18 +332,9 @@ l1_init: sync /* - * Enable use of the I-cache by setting Config.K0. The code for this - * must be executed from KSEG1. Jump from KSEG0 to KSEG1 to do this. - * Jump back to KSEG0 after caches are enabled and insert an - * instruction hazard barrier. + * Enable use of the I-cache by setting Config.K0. */ - PTR_LA t0, change_k0_cca - li t1, CPHYSADDR(~0) - and t0, t0, t1 - PTR_LI t1, CKSEG1 - or t0, t0, t1 - li a0, CONF_CM_CACHABLE_NONCOHERENT - jalr.hb t0 + change_k0_cca_kseg1 CONF_CM_CACHABLE_NONCOHERENT /* * then initialize D-cache.
@@ -388,9 +394,7 @@ l2_unbypass: beqz t0, 2f /* Change Config.K0 to a coherent CCA */ - PTR_LA t0, change_k0_cca - li a0, CONF_CM_CACHABLE_COW - jalr t0 + change_k0_cca_kseg1 CONF_CM_CACHABLE_COW /* * Join the coherent domain such that the caches of this core are kept
Signature · 1 line
2.27.0
PATCH 2/4 mips: add KSEG1 wrapper for change_k0_cca
Quoted 6 lines · Daniel Schwierzeck
change_k0_cca()is called multiple times. Move the code for changing to KSEG1 to a macro to avoid code duplication.Also fix missing change to KSEG1 when changing to
CONF_CM_CACHABLE_COW.Signed-off-by Daniel Schwierzeck <[email protected]>
Thanks,
Stefan
Quoted 54 lines
---
arch/mips/lib/cache_init.S | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-)arch/mips/lib/cache_init.S +17
-11@@ -79,6 +79,21 @@ .set pop .endm + /* + * The changing of Kernel mode cacheability must be done from KSEG1. + * If the code is executing from KSEG0, jump to KSEG1 during the execution + * of change_k0_cca. change_k0_cca itself clears all hazards when returning. + */ + .macro change_k0_cca_kseg1 mode + PTR_LA t0, change_k0_cca + li t1, CPHYSADDR(~0) + and t0, t0, t1 + PTR_LI t1, CKSEG1 + or t0, t0, t1 + li a0, \mode + jalr t0 + .endm + /* * mips_cache_reset - low level initialisation of the primary caches *@@ -317,18 +332,9 @@ l1_init: sync /* - * Enable use of the I-cache by setting Config.K0. The code for this - * must be executed from KSEG1. Jump from KSEG0 to KSEG1 to do this. - * Jump back to KSEG0 after caches are enabled and insert an - * instruction hazard barrier. + * Enable use of the I-cache by setting Config.K0. */ - PTR_LA t0, change_k0_cca - li t1, CPHYSADDR(~0) - and t0, t0, t1 - PTR_LI t1, CKSEG1 - or t0, t0, t1 - li a0, CONF_CM_CACHABLE_NONCOHERENT - jalr.hb t0 + change_k0_cca_kseg1 CONF_CM_CACHABLE_NONCOHERENT /* * then initialize D-cache.
arch/mips/lib/cache_init.S l2_unbypass: · line 400
Quoted 10 lines
arch/mips/lib/cache_init.S +1
-3@@ -388,9 +394,7 @@ l2_unbypass: beqz t0, 2f /* Change Config.K0 to a coherent CCA */ - PTR_LA t0, change_k0_cca - li a0, CONF_CM_CACHABLE_COW - jalr t0 + change_k0_cca_kseg1 CONF_CM_CACHABLE_COW /* * Join the coherent domain such that the caches of this core are kept
Viele Gr??e,
Stefan
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de
PATCH 3/4 mips: refactor disabling of caches
In reply to Daniel SchwierzeckLogically this code belongs to cache_init.S.
If a complex SoC needs to replace the generic cache init, mips_cache_disable() can now be called from custom start.S files.
---
arch/mips/cpu/start.S | 9 ++++----- arch/mips/lib/cache_init.S | 6 ++++++ 2 files changed, 10 insertions(+), 5 deletions(-)
arch/mips/cpu/start.S +4 -5
@@ -196,11 +196,10 @@ wr_done: mtc0 zero, CP0_COMPARE #ifndef CONFIG_SKIP_LOWLEVEL_INIT - mfc0 t0, CP0_CONFIG - and t0, t0, MIPS_CONF_IMPL - or t0, t0, CONF_CM_UNCACHED - mtc0 t0, CP0_CONFIG - ehb + /* Disable caches */ + PTR_LA t9, mips_cache_disable + jalr t9 + nop #endif #ifdef CONFIG_MIPS_CM
arch/mips/lib/cache_init.S +6 -0
@@ -418,6 +418,12 @@ return: jr R_RETURN END(mips_cache_reset) +LEAF(mips_cache_disable) + move R_RETURN, ra + change_k0_cca_kseg1 CONF_CM_UNCACHED + jr R_RETURN + END(mips_cache_disable) + LEAF(change_k0_cca) mfc0 t0, CP0_CONFIG #if __mips_isa_rev >= 2
Signature · 1 line
2.27.0
PATCH 3/4 mips: refactor disabling of caches
Quoted 6 lines · Daniel Schwierzeck
Logically this code belongs to
cache_init.S.If a complex SoC needs to replace the generic cache init,
mips_cache_disable()can now be called from customstart.Sfiles.Signed-off-by Daniel Schwierzeck <[email protected]>
Thanks,
Stefan
Quoted 34 lines
---
arch/mips/cpu/start.S | 9 ++++----- arch/mips/lib/cache_init.S | 6 ++++++ 2 files changed, 10 insertions(+), 5 deletions(-)arch/mips/cpu/start.S +4
-5@@ -196,11 +196,10 @@ wr_done: mtc0 zero, CP0_COMPARE #ifndef CONFIG_SKIP_LOWLEVEL_INIT - mfc0 t0, CP0_CONFIG - and t0, t0, MIPS_CONF_IMPL - or t0, t0, CONF_CM_UNCACHED - mtc0 t0, CP0_CONFIG - ehb + /* Disable caches */ + PTR_LA t9, mips_cache_disable + jalr t9 + nop #endif #ifdef CONFIG_MIPS_CMarch/mips/lib/cache_init.S +0
-0@@ -418,6 +418,12 @@ return: jr R_RETURN END(mips_cache_reset)
arch/mips/lib/cache_init.S return: · line 429
Quoted 10 lines
arch/mips/lib/cache_init.S +6
-0+LEAF(mips_cache_disable) + move R_RETURN, ra + change_k0_cca_kseg1 CONF_CM_UNCACHED + jr R_RETURN + END(mips_cache_disable) + LEAF(change_k0_cca) mfc0 t0, CP0_CONFIG #if __mips_isa_rev >= 2
Viele Gr??e,
Stefan
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de
PATCH 4/4 mips: add config options for generic cache setup code
In reply to Daniel SchwierzeckAdd an own Kconfig symbol for the initial disabling of caches invoked from generic start code.
Also add an own Kconfig symbols for the initialization of caches invoked from generic start code.
Until now both code paths could only be disabled with CONFIG_SKIP_LOWLEVEL_INIT. But this is not flexible enough for RAM boot scenarios like EJTAG or SPL payload or for machines which don't require cache initialization or which want to provide their own cache implementation.
---
arch/mips/Kconfig | 24 ++++++++++++++++++++++++ arch/mips/cpu/start.S | 6 +++++- 2 files changed, 29 insertions(+), 1 deletion(-)
arch/mips/Kconfig +24 -0
@@ -270,6 +270,30 @@ config MIPS_CACHE_INDEX_BASE Normally this is CKSEG0. If the MIPS system needs to move this block to some SRAM or ScratchPad RAM, adapt this option accordingly. +config MIPS_CACHE_SETUP + bool "Allow generic start code to initialize and setup caches" + default n if SKIP_LOWLEVEL_INIT + default y + help + This allows the generic start code to invoke the generic initialization + of the CPU caches. Disabling this can be useful for RAM boot scenarios + (EJTAG, SPL payload) or for machines which don't need cache initialization + or which want to provide their own cache implementation. + + If unsure, say yes. + +config MIPS_CACHE_DISABLE + bool "Allow generic start code to initially disable caches" + default n if SKIP_LOWLEVEL_INIT + default y + help + This allows the generic start code to initially disable the CPU caches + and run uncached until the caches are initialized and enabled. Disabling + this can be useful on machines which don't need cache initialization or + which want to provide their own cache implementation. + + If unsure, say yes. + config MIPS_RELOCATION_TABLE_SIZE hex "Relocation table size" range 0x100 0x10000
arch/mips/cpu/start.S +5 -1
@@ -195,7 +195,7 @@ wr_done: /* Clear timer interrupt (CP0_COUNT cleared on branch to 'reset') */ mtc0 zero, CP0_COMPARE -#ifndef CONFIG_SKIP_LOWLEVEL_INIT +#ifdef CONFIG_MIPS_CACHE_DISABLE /* Disable caches */ PTR_LA t9, mips_cache_disable jalr t9
@@ -234,12 +234,16 @@ wr_done: jalr t9 nop # endif +#endif +#ifdef CONFIG_MIPS_CACHE_SETUP /* Initialize caches... */ PTR_LA t9, mips_cache_reset jalr t9 nop +#endif +#ifndef CONFIG_SKIP_LOWLEVEL_INIT # ifndef CONFIG_SYS_MIPS_CACHE_INIT_RAM_LOAD /* Initialize any external memory */ PTR_LA t9, lowlevel_init
Signature · 1 line
2.27.0
PATCH 4/4 mips: add config options for generic cache setup code
Quoted 6 lines · Daniel Schwierzeck
Add an own
Kconfigsymbol for the initial disabling of caches invoked from generic start code.Also add an own
Kconfigsymbols for the initialization of caches invoked from generic start code.
Quoted 7 lines
Until now both code paths could only be disabled with
CONFIG_SKIP_LOWLEVEL_INIT. But this is not flexible enough for RAM boot scenarios like EJTAG or SPL payload or for machines which don't require cache initialization or which want to provide their own cache implementation.Signed-off-by Daniel Schwierzeck <[email protected]>
Thanks,
Stefan
Quoted 62 lines
---
arch/mips/Kconfig | 24 ++++++++++++++++++++++++ arch/mips/cpu/start.S | 6 +++++- 2 files changed, 29 insertions(+), 1 deletion(-)arch/mips/Kconfig +24
-0@@ -270,6 +270,30 @@ config MIPS_CACHE_INDEX_BASE Normally this is CKSEG0. If the MIPS system needs to move this block to some SRAM or ScratchPad RAM, adapt this option accordingly. +config MIPS_CACHE_SETUP + bool "Allow generic start code to initialize and setup caches" + default n if SKIP_LOWLEVEL_INIT + default y + help + This allows the generic start code to invoke the generic initialization + of the CPU caches. Disabling this can be useful for RAM boot scenarios + (EJTAG, SPL payload) or for machines which don't need cache initialization + or which want to provide their own cache implementation. + + If unsure, say yes. + +config MIPS_CACHE_DISABLE + bool "Allow generic start code to initially disable caches" + default n if SKIP_LOWLEVEL_INIT + default y + help + This allows the generic start code to initially disable the CPU caches + and run uncached until the caches are initialized and enabled. Disabling + this can be useful on machines which don't need cache initialization or + which want to provide their own cache implementation. + + If unsure, say yes. + config MIPS_RELOCATION_TABLE_SIZE hex "Relocation table size" range 0x100 0x10000arch/mips/cpu/start.S +3
-1@@ -195,7 +195,7 @@ wr_done: /* Clear timer interrupt (CP0_COUNT cleared on branch to 'reset') */ mtc0 zero, CP0_COMPARE -#ifndef CONFIG_SKIP_LOWLEVEL_INIT +#ifdef CONFIG_MIPS_CACHE_DISABLE /* Disable caches */ PTR_LA t9, mips_cache_disable jalr t9@@ -234,12 +234,16 @@ wr_done: jalr t9 nop # endif +#endif +#ifdef CONFIG_MIPS_CACHE_SETUP
arch/mips/cpu/start.S wr_done: · line 249
Quoted 10 lines
arch/mips/cpu/start.S +2
-0/* Initialize caches... */ PTR_LA t9, mips_cache_reset jalr t9 nop +#endif +#ifndef CONFIG_SKIP_LOWLEVEL_INIT # ifndef CONFIG_SYS_MIPS_CACHE_INIT_RAM_LOAD /* Initialize any external memory */ PTR_LA t9, lowlevel_init
Viele Gr??e,
Stefan
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de