u-boot/arch/mips/mach-mtmips/cpu.c
Stefan Roese f913eab9b9 mips: mt76xx: Remove cache workaround and select SYS_MALLOC_CLEAR_ON_INIT
With commit 06985289d4 ("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.

Signed-off-by: Stefan Roese <sr@denx.de>
Suggested-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
2019-05-24 15:55:17 +02:00

70 lines
1.5 KiB
C

// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2018 Stefan Roese <sr@denx.de>
*/
#include <common.h>
#include <dm.h>
#include <ram.h>
#include <wdt.h>
#include <asm/io.h>
#include <linux/io.h>
#include <linux/sizes.h>
#include "mt76xx.h"
#define STR_LEN 6
#ifdef CONFIG_BOOT_ROM
int mach_cpu_init(void)
{
ddr_calibrate();
return 0;
}
#endif
int dram_init(void)
{
gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE, SZ_256M);
return 0;
}
int print_cpuinfo(void)
{
static const char * const boot_str[] = { "PLL (3-Byte SPI Addr)",
"PLL (4-Byte SPI Addr)",
"XTAL (3-Byte SPI Addr)",
"XTAL (4-Byte SPI Addr)" };
const void *blob = gd->fdt_blob;
void __iomem *sysc_base;
char buf[STR_LEN + 1];
fdt_addr_t base;
fdt_size_t size;
char *str;
int node;
u32 val;
/* Get system controller base address */
node = fdt_node_offset_by_compatible(blob, -1, "ralink,mt7620a-sysc");
if (node < 0)
return -FDT_ERR_NOTFOUND;
base = fdtdec_get_addr_size_auto_noparent(blob, node, "reg",
0, &size, true);
if (base == FDT_ADDR_T_NONE)
return -EINVAL;
sysc_base = ioremap_nocache(base, size);
str = (char *)sysc_base + MT76XX_CHIPID_OFFS;
snprintf(buf, STR_LEN + 1, "%s", str);
val = readl(sysc_base + MT76XX_CHIP_REV_ID_OFFS);
printf("CPU: %-*s Rev %ld.%ld - ", STR_LEN, buf,
(val & GENMASK(11, 8)) >> 8, val & GENMASK(3, 0));
val = (readl(sysc_base + MT76XX_SYSCFG0_OFFS) & GENMASK(3, 1)) >> 1;
printf("Boot from %s\n", boot_str[val]);
return 0;
}