smallsolar/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cpu: imx8_cpu: Avoid revision to corrupt device tree

Browse Source 
U-Boot device tree is padded just after U-Boot proper.
After the whole stuff loaded to DRAM space, the device tree
area is conflict with BSS region before U-Boot relocation.

So any write to BSS area before reloc_fdt will corrupt the
device tree. Without the fix, there is issue that “binman_init
failed:-2” on i.MX8MP-EVK board.

Drop 'revision' and use malloc area in cpu_imx_plat->rev.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
This commit is contained in:
Peng Fan
2024-10-18 15:34:32 +08:00
committed by Fabio Estevam
parent 21cd724a54
commit 9b1cecdd9b
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/cpu/imx8_cpu.c
View File

@@ -20,10 +20,11 @@
DECLARE_GLOBAL_DATA_PTR;
#define IMX_REV_LEN 4
struct cpu_imx_plat {
const char *name;
const char *rev;
const char *type;
char rev[IMX_REV_LEN];
u32 cpu_rsrc;
u32 cpurev;
u32 freq_mhz;
@@ -69,28 +70,29 @@ static const char *get_imx_type_str(u32 imxtype)
}
}
static const char *get_imx_rev_str(u32 rev)
static void get_imx_rev_str(struct cpu_imx_plat *plat, u32 rev)
{
static char revision[4];
if (IS_ENABLED(CONFIG_IMX8)) {
switch (rev) {
case CHIP_REV_A:
return "A";
plat->rev[0] = 'A';
break;
case CHIP_REV_B:
return "B";
plat->rev[0] = 'B';
break;
case CHIP_REV_C:
return "C";
plat->rev[0] = 'C';
break;
default:
return "?";
plat->rev[0] = '?';
break;
}
plat->rev[1] = '\0';
} else {
revision[0] = '1' + (((rev & 0xf0) - CHIP_REV_1_0) >> 4);
revision[1] = '.';
revision[2] = '0' + (rev & 0xf);
revision[3] = '\0';
return revision;
plat->rev[0] = '1' + (((rev & 0xf0) - CHIP_REV_1_0) >> 4);
plat->rev[1] = '.';
plat->rev[2] = '0' + (rev & 0xf);
plat->rev[3] = '\0';
}
}
@@ -318,7 +320,7 @@ static int imx_cpu_probe(struct udevice *dev)
set_core_data(dev);
cpurev = get_cpu_rev();
plat->cpurev = cpurev;
plat->rev = get_imx_rev_str(cpurev & 0xFFF);
get_imx_rev_str(plat, cpurev & 0xFFF);
plat->type = get_imx_type_str((cpurev & 0x1FF000) >> 12);
plat->freq_mhz = imx_get_cpu_rate(dev) / 1000000;
plat->mpidr = dev_read_addr(dev);