MIPS: use CONFIG_SYS_TEXT_BASE in relocation calculations
PATCH 1/1 MIPS: use CONFIG_SYS_TEXT_BASE in relocation calculations
The relocation code uses the CONFIG_SYS_MONITOR_BASE constant for calculating the reserved memory size and relocation offset values. Along with these predefined values the code also uses several other constants which are computed by the linker from the CONFIG_SYS_TEXT_BASE value. Due to this, the relocation code works incorreclty if the CONFIG_SYS_TEXT_BASE and CONFIG_SYS_MONITOR_BASE values are different.
Change the relocation code to use the CONFIG_SYS_TEXT_BASE constant in the calculations to avoid the problem.
Only tested in qemu with the 'malta' and 'qemu_mips{,el}' targets.
---
Daniel,
This should be merged before my 'malta: use unmapped flash base address' patch.
Thanks,
Gabor
--- arch/mips/cpu/mips32/start.S | 2 +- arch/mips/cpu/mips64/start.S | 2 +- arch/mips/cpu/xburst/start.S | 2 +- arch/mips/lib/board.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
arch/mips/cpu/mips32/start.S +1 -1
@@ -159,7 +159,7 @@ relocate_code: move s0, a1 # save gd in s0 move s2, a2 # save destination address in s2 - li t0, CONFIG_SYS_MONITOR_BASE + li t0, CONFIG_SYS_TEXT_BASE sub s1, s2, t0 # s1 <-- relocation offset la t3, in_ram
arch/mips/cpu/mips64/start.S +1 -1
@@ -153,7 +153,7 @@ relocate_code: move s0, a1 # save gd in s0 move s2, a2 # save destination address in s2 - dli t0, CONFIG_SYS_MONITOR_BASE + dli t0, CONFIG_SYS_TEXT_BASE dsub s1, s2, t0 # s1 <-- relocation offset dla t3, in_ram
arch/mips/cpu/xburst/start.S +1 -1
@@ -50,7 +50,7 @@ relocate_code: move s0, a1 # save gd in s0 move s2, a2 # save destination address in s2 - li t0, CONFIG_SYS_MONITOR_BASE + li t0, CONFIG_SYS_TEXT_BASE sub s1, s2, t0 # s1 <-- relocation offset la t3, in_ram
arch/mips/lib/board.c +1 -1
@@ -160,7 +160,7 @@ void board_init_f(ulong bootflag)/* Reserve memory for U-Boot code, data & bss * round down to next 16 kB limit */ - len =bss_end () -CONFIG_SYS_MONITOR_BASE ; + len =bss_end () -CONFIG_SYS_TEXT_BASE ; addr -= len; addr &= ~(16 *1024 -1 );
Signature · 1 line
1.7.10
PATCH 1/1 MIPS: use CONFIG_SYS_TEXT_BASE in relocation calculations
2013/11/11 Gabor Juhos <[email protected]>:
Quoted 18 lines
The relocation code uses the
CONFIG_SYS_MONITOR_BASEconstant for calculating the reserved memory size and relocation offset values. Along with these predefined values the code also uses several other constants which are computed by the linker from theCONFIG_SYS_TEXT_BASEvalue. Due to this, the relocation code works incorreclty if theCONFIG_SYS_TEXT_BASEandCONFIG_SYS_MONITOR_BASEvalues are different.Change the relocation code to use the
CONFIG_SYS_TEXT_BASEconstant in the calculations to avoid the problem.Only tested in qemu with the 'malta' and 'qemu_mips{,el}' targets.
Signed-off-by Gabor Juhos <[email protected]>Cc Daniel Schwierzeck <[email protected]>Cc Paul Burton <[email protected]>
Quoted 8 lines
---
Daniel,This should be merged before my 'malta: use unmapped flash base address' patch.
Thanks,
Gabor
thanks, I'll test it on real hardware.
Signature · 1 line
- Daniel
PATCH 1/1 MIPS: use CONFIG_SYS_TEXT_BASE in relocation calculations
In reply to Gabor Juhos2013/11/11 Gabor Juhos <[email protected]>:
Quoted 8 lines
The relocation code uses the
CONFIG_SYS_MONITOR_BASEconstant for calculating the reserved memory size and relocation offset values. Along with these predefined values the code also uses several other constants which are computed by the linker from theCONFIG_SYS_TEXT_BASEvalue. Due to this, the relocation code works incorreclty if theCONFIG_SYS_TEXT_BASEandCONFIG_SYS_MONITOR_BASEvalues are different.
to be consistent with all other architectures, we should keep CONFIG_SYS_MONITOR_BASE. I think it is neither valid nor intentional to use a value different from CONFIG_SYS_TEXT_BASE. Instead we should change include/configs/malta.h:
-#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
+#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE
Comments?
Signature · 1 line
- Daniel
PATCH 1/1 MIPS: use CONFIG_SYS_TEXT_BASE in relocation calculations
2013.11.11. 20:36 keltez?ssel, Daniel Schwierzeck ?rta:
Quoted 10 lines
2013/11/11 Gabor Juhos <[email protected]>:
Quoted 8 lines
The relocation code uses the
CONFIG_SYS_MONITOR_BASEconstant for calculating the reserved memory size and relocation offset values. Along with these predefined values the code also uses several other constants which are computed by the linker from theCONFIG_SYS_TEXT_BASEvalue. Due to this, the relocation code works incorreclty if theCONFIG_SYS_TEXT_BASEandCONFIG_SYS_MONITOR_BASEvalues are different.
Quoted 3 lines
to be consistent with all other architectures, we should keep
CONFIG_SYS_MONITOR_BASE. I think it is neither valid nor intentional to use a value different fromCONFIG_SYS_TEXT_BASE.
If it is neither valid nor intentional, the CONFIG_SYS_MONITOR_BASE constant should not exist at all and CONFIG_SYS_TEXT_BASE should be used everywhere instead IMHO.
Additionally, we have this check in arch/mips/lib/board.c:
Quoted 5 lines
#if CONFIG_SYS_MONITOR_BASE == CONFIG_SYS_FLASH_BASE bd->bi_flashoffset = monitor_flash_len; /* reserved area for U-Boot */ #else bd->bi_flashoffset = 0;#endif
If it is not allowed to use different values for the two constants, the condition and the #else branch should be removed.
Quoted 7 lines
Instead we should change
include/configs/malta.h:(quoted diff) +1
-1-#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASEComments?
I have tried this already. It is working as well, however with this change the flash sectors containing the bootloader are not protected correctly:
Quoted 21 lines
malta # flinfo
Bank # 1: CFI conformant flash (32 x 32) Size: 4 MB in 64 Sectors
Intel Extended command set, Manufacturer ID:0x00, Device ID:0x00Erase timeout: 16384 ms, write timeout: 3 ms
Buffer write timeout: 3 ms, buffer size: 2048 bytesSector Start Addresses:
BE000000 BE010000 BE020000 BE030000 BE040000 BE050000 BE060000 BE070000 BE080000 BE090000 BE0A0000 BE0B0000 BE0C0000 BE0D0000 BE0E0000 BE0F0000 BE100000 BE110000 BE120000 BE130000 BE140000 BE150000 BE160000 BE170000 BE180000 BE190000 BE1A0000 BE1B0000 BE1C0000 BE1D0000 BE1E0000 BE1F0000 BE200000 BE210000 BE220000 BE230000 BE240000 BE250000 BE260000 BE270000 BE280000 BE290000 BE2A0000 BE2B0000 BE2C0000 BE2D0000 BE2E0000 BE2F0000 BE300000 BE310000 BE320000 BE330000 BE340000 BE350000 BE360000 BE370000 BE380000 BE390000 BE3A0000 BE3B0000 BE3C0000 BE3D0000 BE3E0000 RO BE3F0000 RO
Quoted 1 line
malta #
For reference, this is the output of flinfo with my change:
Quoted 21 lines
malta # flinfo
Bank # 1: CFI conformant flash (32 x 32) Size: 4 MB in 64 Sectors
Intel Extended command set, Manufacturer ID:0x00, Device ID:0x00Erase timeout: 16384 ms, write timeout: 3 ms
Buffer write timeout: 3 ms, buffer size: 2048 bytesSector Start Addresses:
BE000000 RO BE010000 RO BE020000 RO BE030000 BE040000 BE050000 BE060000 BE070000 BE080000 BE090000 BE0A0000 BE0B0000 BE0C0000 BE0D0000 BE0E0000 BE0F0000 BE100000 BE110000 BE120000 BE130000 BE140000 BE150000 BE160000 BE170000 BE180000 BE190000 BE1A0000 BE1B0000 BE1C0000 BE1D0000 BE1E0000 BE1F0000 BE200000 BE210000 BE220000 BE230000 BE240000 BE250000 BE260000 BE270000 BE280000 BE290000 BE2A0000 BE2B0000 BE2C0000 BE2D0000 BE2E0000 BE2F0000 BE300000 BE310000 BE320000 BE330000 BE340000 BE350000 BE360000 BE370000 BE380000 BE390000 BE3A0000 BE3B0000 BE3C0000 BE3D0000 BE3E0000 RO BE3F0000 RO
Quoted 1 line
malta #
Any idea how can we resolve this properly?
-Gabor
PATCH 1/1 MIPS: use CONFIG_SYS_TEXT_BASE in relocation calculations
2013/11/11 Gabor Juhos <[email protected]>:
Quoted 11 lines
2013.11.11. 20:36 keltez?ssel, Daniel Schwierzeck ?rta:
Quoted 10 lines
2013/11/11 Gabor Juhos <[email protected]>:
Quoted 8 lines
The relocation code uses the
CONFIG_SYS_MONITOR_BASEconstant for calculating the reserved memory size and relocation offset values. Along with these predefined values the code also uses several other constants which are computed by the linker from theCONFIG_SYS_TEXT_BASEvalue. Due to this, the relocation code works incorreclty if theCONFIG_SYS_TEXT_BASEandCONFIG_SYS_MONITOR_BASEvalues are different.
Quoted 7 lines
Quoted 3 lines
to be consistent with all other architectures, we should keep
CONFIG_SYS_MONITOR_BASE. I think it is neither valid nor intentional to use a value different fromCONFIG_SYS_TEXT_BASE.If it is neither valid nor intentional, the
CONFIG_SYS_MONITOR_BASEconstant should not exist at all andCONFIG_SYS_TEXT_BASEshould be used everywhere instead IMHO.
By now it is redundant. Once CONFIG_SYS_TEXT_BASE was only a make variable named TEXT_BASE and defined in board-specific config.mk. This
has been converted with commit14d0a02a168b36e87665b8d7f42fa3e88263d26d.
BTW the README states:
- CONFIG_SYS_MONITOR_BASE:
Physical start address of boot monitor code (set by make config files to be same as the text base address (CONFIG_SYS_TEXT_BASE) used when linking) - same as CONFIG_SYS_FLASH_BASE when booting from flash.
Quoted 11 lines
Additionally, we have this check in
arch/mips/lib/board.c:Quoted 5 lines
#if CONFIG_SYS_MONITOR_BASE == CONFIG_SYS_FLASH_BASE bd->bi_flashoffset = monitor_flash_len; /* reserved area for U-Boot */ #else bd->bi_flashoffset = 0;#endif
If it is not allowed to use different values for the two constants, the condition and the #else branch should be removed.
no that is still needed if a board has NOR flash but boots from NAND or SPI flash or other media (e.g. SoC evaluation boards). In that case CONFIG_SYS_TEXT_BASE points usually to an SRAM address.
Quoted 60 lines
Quoted 8 lines
Instead we should change
include/configs/malta.h:(quoted diff) +1
-1-#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASEComments?
I have tried this already. It is working as well, however with this change the flash sectors containing the bootloader are not protected correctly:
Quoted 21 lines
malta # flinfo
Bank # 1: CFI conformant flash (32 x 32) Size: 4 MB in 64 Sectors
Intel Extended command set, Manufacturer ID:0x00, Device ID:0x00Erase timeout: 16384 ms, write timeout: 3 ms
Buffer write timeout: 3 ms, buffer size: 2048 bytesSector Start Addresses:
BE000000 BE010000 BE020000 BE030000 BE040000 BE050000 BE060000 BE070000 BE080000 BE090000 BE0A0000 BE0B0000 BE0C0000 BE0D0000 BE0E0000 BE0F0000 BE100000 BE110000 BE120000 BE130000 BE140000 BE150000 BE160000 BE170000 BE180000 BE190000 BE1A0000 BE1B0000 BE1C0000 BE1D0000 BE1E0000 BE1F0000 BE200000 BE210000 BE220000 BE230000 BE240000 BE250000 BE260000 BE270000 BE280000 BE290000 BE2A0000 BE2B0000 BE2C0000 BE2D0000 BE2E0000 BE2F0000 BE300000 BE310000 BE320000 BE330000 BE340000 BE350000 BE360000 BE370000 BE380000 BE390000 BE3A0000 BE3B0000 BE3C0000 BE3D0000 BE3E0000 RO BE3F0000 ROQuoted 1 line
malta #
For reference, this is the output of flinfo with my change:
Quoted 21 lines
malta # flinfo
Bank # 1: CFI conformant flash (32 x 32) Size: 4 MB in 64 Sectors
Intel Extended command set, Manufacturer ID:0x00, Device ID:0x00Erase timeout: 16384 ms, write timeout: 3 ms
Buffer write timeout: 3 ms, buffer size: 2048 bytesSector Start Addresses:
BE000000 RO BE010000 RO BE020000 RO BE030000 BE040000 BE050000 BE060000 BE070000 BE080000 BE090000 BE0A0000 BE0B0000 BE0C0000 BE0D0000 BE0E0000 BE0F0000 BE100000 BE110000 BE120000 BE130000 BE140000 BE150000 BE160000 BE170000 BE180000 BE190000 BE1A0000 BE1B0000 BE1C0000 BE1D0000 BE1E0000 BE1F0000 BE200000 BE210000 BE220000 BE230000 BE240000 BE250000 BE260000 BE270000 BE280000 BE290000 BE2A0000 BE2B0000 BE2C0000 BE2D0000 BE2E0000 BE2F0000 BE300000 BE310000 BE320000 BE330000 BE340000 BE350000 BE360000 BE370000 BE380000 BE390000 BE3A0000 BE3B0000 BE3C0000 BE3D0000 BE3E0000 RO BE3F0000 ROQuoted 1 line
malta #
Quoted 3 lines
Any idea how can we resolve this properly?
-Gabor
following seems to work (in both variants with -bios and -pflash)
#define CONFIG_SYS_TEXT_BASE 0xbe000000 #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE
Signature · 1 line
- Daniel
PATCH 1/1 MIPS: use CONFIG_SYS_TEXT_BASE in relocation calculations
2013.11.11. 23:36 keltez?ssel, Daniel Schwierzeck ?rta:
<...>
Quoted 13 lines
Quoted 7 lines
Quoted 3 lines
to be consistent with all other architectures, we should keep
CONFIG_SYS_MONITOR_BASE. I think it is neither valid nor intentional to use a value different fromCONFIG_SYS_TEXT_BASE.If it is neither valid nor intentional, the
CONFIG_SYS_MONITOR_BASEconstant should not exist at all andCONFIG_SYS_TEXT_BASEshould be used everywhere instead IMHO.By now it is redundant. Once
CONFIG_SYS_TEXT_BASEwas only a make variable namedTEXT_BASEand defined in board-specific config.mk. This
has been converted with commit14d0a02a168b36e87665b8d7f42fa3e88263d26d.
Quoted 7 lines
BTW the README states:
-
CONFIG_SYS_MONITOR_BASE:
Physical start address of boot monitor code (set by make config files to be same as the text base address (CONFIG_SYS_TEXT_BASE) used when linking) - same asCONFIG_SYS_FLASH_BASEwhen booting from flash.
I see. Thank you for the explanation.
Quoted 9 lines
Quoted 9 lines
Additionally, we have this check in
arch/mips/lib/board.c:Quoted 5 lines
#if CONFIG_SYS_MONITOR_BASE == CONFIG_SYS_FLASH_BASE bd->bi_flashoffset = monitor_flash_len; /* reserved area for U-Boot */ #else bd->bi_flashoffset = 0;#endif
Quoted 6 lines
Quoted 2 lines
If it is not allowed to use different values for the two constants, the condition and the #else branch should be removed.
no that is still needed if a board has NOR flash but boots from NAND or SPI flash or other media (e.g. SoC evaluation boards). In that case
CONFIG_SYS_TEXT_BASEpoints usually to an SRAM address.
Ok.
Quoted 61 lines
Quoted 61 lines
Quoted 9 lines
Instead we should change
include/configs/malta.h:(quoted diff) +1
-1-#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASEComments?
I have tried this already. It is working as well, however with this change the flash sectors containing the bootloader are not protected correctly:
Quoted 21 lines
malta # flinfo
Bank # 1: CFI conformant flash (32 x 32) Size: 4 MB in 64 Sectors
Intel Extended command set, Manufacturer ID:0x00, Device ID:0x00Erase timeout: 16384 ms, write timeout: 3 ms
Buffer write timeout: 3 ms, buffer size: 2048 bytesSector Start Addresses:
BE000000 BE010000 BE020000 BE030000 BE040000 BE050000 BE060000 BE070000 BE080000 BE090000 BE0A0000 BE0B0000 BE0C0000 BE0D0000 BE0E0000 BE0F0000 BE100000 BE110000 BE120000 BE130000 BE140000 BE150000 BE160000 BE170000 BE180000 BE190000 BE1A0000 BE1B0000 BE1C0000 BE1D0000 BE1E0000 BE1F0000 BE200000 BE210000 BE220000 BE230000 BE240000 BE250000 BE260000 BE270000 BE280000 BE290000 BE2A0000 BE2B0000 BE2C0000 BE2D0000 BE2E0000 BE2F0000 BE300000 BE310000 BE320000 BE330000 BE340000 BE350000 BE360000 BE370000 BE380000 BE390000 BE3A0000 BE3B0000 BE3C0000 BE3D0000 BE3E0000 RO BE3F0000 ROQuoted 1 line
malta #
For reference, this is the output of flinfo with my change:
Quoted 22 lines
malta # flinfo
Bank # 1: CFI conformant flash (32 x 32) Size: 4 MB in 64 Sectors
Intel Extended command set, Manufacturer ID:0x00, Device ID:0x00Erase timeout: 16384 ms, write timeout: 3 ms
Buffer write timeout: 3 ms, buffer size: 2048 bytesSector Start Addresses:
BE000000 RO BE010000 RO BE020000 RO BE030000 BE040000 BE050000 BE060000 BE070000 BE080000 BE090000 BE0A0000 BE0B0000 BE0C0000 BE0D0000 BE0E0000 BE0F0000 BE100000 BE110000 BE120000 BE130000 BE140000 BE150000 BE160000 BE170000 BE180000 BE190000 BE1A0000 BE1B0000 BE1C0000 BE1D0000 BE1E0000 BE1F0000 BE200000 BE210000 BE220000 BE230000 BE240000 BE250000 BE260000 BE270000 BE280000 BE290000 BE2A0000 BE2B0000 BE2C0000 BE2D0000 BE2E0000 BE2F0000 BE300000 BE310000 BE320000 BE330000 BE340000 BE350000 BE360000 BE370000 BE380000 BE390000 BE3A0000 BE3B0000 BE3C0000 BE3D0000 BE3E0000 RO BE3F0000 ROmalta #
Quoted 8 lines
Quoted 3 lines
Any idea how can we resolve this properly?
-Gabor
following seems to work (in both variants with -bios and -pflash)
#define
CONFIG_SYS_TEXT_BASE0xbe000000#defineCONFIG_SYS_MONITOR_BASECONFIG_SYS_TEXT_BASE
Yeah, this definitely looks better than my solution. :)
Do you want me to incorporate this into the 'malta: use unmapped flash base address' patch, or do you want to apply this separately?
-Gabor
Quoted 1 line
PATCH 1/1 MIPS: use CONFIG_SYS_TEXT_BASE in relocation calculations
2013/11/12 Gabor Juhos <[email protected]>:
Quoted 2 lines
2013.11.11. 23:36 keltez?ssel, Daniel Schwierzeck ?rta:
...
Quoted 7 lines
Quoted 7 lines
Quoted 4 lines
Any idea how can we resolve this properly?
-Gabor
following seems to work (in both variants with -bios and -pflash)
Quoted 7 lines
Quoted 2 lines
#define
CONFIG_SYS_TEXT_BASE0xbe000000#defineCONFIG_SYS_MONITOR_BASECONFIG_SYS_TEXT_BASEYeah, this definitely looks better than my solution. :)
Do you want me to incorporate this into the 'malta: use unmapped flash base address' patch,
yes, one patch is sufficiently
Quoted 2 lines
or do you want to apply this separately?
Signature · 1 line
- Daniel
PATCH 1/1 MIPS: use CONFIG_SYS_TEXT_BASE in relocation calculations
2013.11.12. 16:40 keltez?ssel, Daniel Schwierzeck ?rta:
Quoted 14 lines
2013/11/12 Gabor Juhos <[email protected]>:
Quoted 2 lines
2013.11.11. 23:36 keltez?ssel, Daniel Schwierzeck ?rta:
...
Quoted 10 lines
Quoted 9 lines
Quoted 4 lines
Any idea how can we resolve this properly?
-Gabor
following seems to work (in both variants with -bios and -pflash)
#define
CONFIG_SYS_TEXT_BASE0xbe000000#defineCONFIG_SYS_MONITOR_BASECONFIG_SYS_TEXT_BASE
Quoted 6 lines
Quoted 4 lines
Yeah, this definitely looks better than my solution. :)
Do you want me to incorporate this into the 'malta: use unmapped flash base address' patch,
yes, one patch is sufficiently
Ok.