mips: mt76xx: Remove cache workaround and select SYS_MALLOC_CLEAR_ON_INIT
Subsystems (2)
PATCH v2 1/2 mips: mt76xx: Remove cache workaround and select SYS_MALLOC_CLEAR_ON_INIT
With commit 06985289d452 ("watchdog: Implement generic watchdog_reset() version") the init sequence has changed in arch_misc_init(), resulting in a re-appearance of the d-cache issue on MT7688 boards (e.g. gardena). When this happens, the first (or sometimes later ones as well) TFTP command hangs and does not complete correctly. This leads to the assumption that the d-cache is not in a clean state once the ethernet driver is called (d-cache is used here for the buffers). The old work- around with the cache flush somehow does not work any more now with the new code change.
To fix this issue, this patch now removes the old workaround and selects CONFIG_SYS_MALLOC_CLEAR_ON_INIT for ARCH_MTMIPS. With this option the complete malloc area is initialized with zeros (cache lines are touched). Testing has shown that this also fixes the issue on the MT7688 boards.
---
v2:
- As suggested by Daniel, remove the workaround (hack) and select CONFIG_SYS_MALLOC_CLEAR_ON_INIT instead
arch/mips/Kconfig | 2 +- arch/mips/mach-mtmips/cpu.c | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-)
arch/mips/Kconfig +1 -1
@@ -84,13 +84,13 @@ config ARCH_MTMIPS select DM_SERIAL imply DM_SPI imply DM_SPI_FLASH - select ARCH_MISC_INIT select MIPS_TUNE_24KC select OF_CONTROL select ROM_EXCEPTION_VECTORS select SUPPORTS_CPU_MIPS32_R1 select SUPPORTS_CPU_MIPS32_R2 select SUPPORTS_LITTLE_ENDIAN + select SYS_MALLOC_CLEAR_ON_INIT select SYSRESET config ARCH_JZ47XX
arch/mips/mach-mtmips/cpu.c +0 -15
@@ -68,18 +68,3 @@ int print_cpuinfo(void)return 0 ; } - -int arch_misc_init (void ) -{ -/* -* It has been noticed, that sometimes the d-cache is not in a -* "clean-state" when U-Boot is running on MT7688. This was -* detected when using the ethernet driver (which uses d-cache) -* and a TFTP command does not complete. Flushing the complete -* d-cache (again?) here seems to fix this issue. -*/ -flush_dcache_range (gd->bd->bi_memstart, - gd->bd->bi_memstart + gd->ram_size -1 ); - -return 0 ; -}
Signature · 1 line
2.21.0
PATCH v2 2/2 mips: mt76xx: gardena-smart-gateway: Enable CONFIG_USE_PREBOOT
Enable CONFIG_USE_PREBOOT on for the gardena mt7688 platforms, so that this feature can be used here.
---
v2:
- No change
configs/gardena-smart-gateway-mt7688-ram_defconfig | 1 + configs/gardena-smart-gateway-mt7688_defconfig | 1 + 2 files changed, 2 insertions(+)
configs/gardena-smart-gateway-mt7688-ram_defconfig +1 -0
@@ -12,6 +12,7 @@ CONFIG_IMAGE_FORMAT_LEGACY=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="cp.b 83000000 84000000 10000 && dhcp uEnv.txt && env import -t ${fileaddr} ${filesize} && run do_u_boot_init; reset" +CONFIG_USE_PREBOOT=y CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y CONFIG_BOARD_EARLY_INIT_F=y
configs/gardena-smart-gateway-mt7688_defconfig +1 -0
@@ -15,6 +15,7 @@ CONFIG_IMAGE_FORMAT_LEGACY=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="cp.b 83000000 84000000 10000 && dhcp uEnv.txt && env import -t ${fileaddr} ${filesize} && run do_u_boot_init; reset" +CONFIG_USE_PREBOOT=y CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y CONFIG_BOARD_EARLY_INIT_F=y
Signature · 1 line
2.21.0
PATCH v2 2/2 mips: mt76xx: gardena-smart-gateway: Enable CONFIG_USE_PREBOOT
Am 23.05.19 um 07:55 schrieb Stefan Roese:
Quoted 5 lines
Enable
CONFIG_USE_PREBOOTon for the gardena mt7688 platforms, so that this feature can be used here.Signed-off-by Stefan Roese <[email protected]>Cc Daniel Schwierzeck <[email protected]>
Quoted 8 lines
---
v2:
- No changeconfigs/gardena-smart-gateway-mt7688-ram_defconfig | 1 + configs/gardena-smart-gateway-mt7688_defconfig | 1 + 2 files changed, 2 insertions(+)
applied to u-boot-mips, thanks.
Signature · 1 line
- Daniel
PATCH v2 1/2 mips: mt76xx: Remove cache workaround and select SYS_MALLOC_CLEAR_ON_INIT
In reply to Stefan RoeseAm 23.05.19 um 07:55 schrieb Stefan Roese:
Quoted 18 lines
With commit
06985289d452("watchdog: Implement genericwatchdog_reset()version") the init sequence has changed inarch_misc_init(), resulting in a re-appearance of the d-cache issue on MT7688 boards (e.g. gardena). When this happens, the first (or sometimes later ones as well) TFTP command hangs and does not complete correctly. This leads to the assumption that the d-cache is not in a clean state once the ethernet driver is called (d-cache is used here for the buffers). The old work- around with the cache flush somehow does not work any more now with the new code change.To fix this issue, this patch now removes the old workaround and selects
CONFIG_SYS_MALLOC_CLEAR_ON_INITforARCH_MTMIPS. With this option the complete malloc area is initialized with zeros (cache lines are touched). Testing has shown that this also fixes the issue on the MT7688 boards.Signed-off-by Stefan Roese <[email protected]>Suggested-by Daniel Schwierzeck <[email protected]>Cc Daniel Schwierzeck <[email protected]>
Quoted 9 lines
---
v2:
- As suggested by Daniel, remove the workaround (hack) and selectCONFIG_SYS_MALLOC_CLEAR_ON_INITinsteadarch/mips/Kconfig | 2 +- arch/mips/mach-mtmips/cpu.c | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-)
applied to u-boot-mips, thanks.
Signature · 1 line
- Daniel