brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-06-09 23:36:03 +09:00
Code Issues Projects Releases Wiki Activity

cpu: imx8: use intended cpu-thermal device when getting temp value

Browse Source 
This fixes getting DT alert and critical pdata values in imx_scu_thermal
driver. On i.MX8QXP using not initialized alert pdata value resulted in
boot hang and endless loop outputting:
CPU Temperature (47200C) has beyond alert (0C), close to critical (0C) waiting...

While at it, preset CPU type values once to avoid multiple calls
of device_is_compatible() for same property.

Fixes: 3ee6ea443e ("cpu: imx_cpu: Print the CPU temperature for iMX8QM A72")
Signed-off-by: Anatolij Gustschin <agust@denx.de>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
This commit is contained in:
Anatolij Gustschin 2020-05-20 01:31:44 +02:00
parent 69365540cf
commit 74e8fb03bd
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
drivers/cpu/imx8_cpu.c
View File

@ -20,6 +20,7 @@ struct cpu_imx_platdata {
const char *name;
const char *rev;
const char *type;
u32 cpu_rsrc;
u32 cpurev;
u32 freq_mhz;
u32 mpidr;
@ -52,16 +53,23 @@ const char *get_imx8_rev(u32 rev)
}
}
const char *get_core_name(struct udevice *dev)
static void set_core_data(struct udevice *dev)
{
if (device_is_compatible(dev, "arm,cortex-a35"))
return "A35";
else if (device_is_compatible(dev, "arm,cortex-a53"))
return "A53";
else if (device_is_compatible(dev, "arm,cortex-a72"))
return "A72";
else
return "?";
struct cpu_imx_platdata *plat = dev_get_platdata(dev);
if (device_is_compatible(dev, "arm,cortex-a35")) {
plat->cpu_rsrc = SC_R_A35;
plat->name = "A35";
} else if (device_is_compatible(dev, "arm,cortex-a53")) {
plat->cpu_rsrc = SC_R_A53;
plat->name = "A53";
} else if (device_is_compatible(dev, "arm,cortex-a72")) {
plat->cpu_rsrc = SC_R_A72;
plat->name = "A72";
} else {
plat->cpu_rsrc = SC_R_A53;
plat->name = "?";
}
}
#if IS_ENABLED(CONFIG_IMX_SCU_THERMAL)
@ -69,12 +77,12 @@ static int cpu_imx_get_temp(struct cpu_imx_platdata *plat)
{
struct udevice *thermal_dev;
int cpu_tmp, ret;
int idx = 1; /* use "cpu-thermal0" device */
if (!strcmp(plat->name, "A72"))
ret = uclass_get_device(UCLASS_THERMAL, 1, &thermal_dev);
else
ret = uclass_get_device(UCLASS_THERMAL, 0, &thermal_dev);
if (plat->cpu_rsrc == SC_R_A72)
idx = 2; /* use "cpu-thermal1" device */
ret = uclass_get_device(UCLASS_THERMAL, idx, &thermal_dev);
if (!ret) {
ret = thermal_get_temp(thermal_dev, &cpu_tmp);
if (ret)
@ -182,19 +190,11 @@ static const struct udevice_id cpu_imx8_ids[] = {
static ulong imx8_get_cpu_rate(struct udevice *dev)
{
struct cpu_imx_platdata *plat = dev_get_platdata(dev);
ulong rate;
int ret, type;
int ret;
if (device_is_compatible(dev, "arm,cortex-a35"))
type = SC_R_A35;
else if (device_is_compatible(dev, "arm,cortex-a53"))
type = SC_R_A53;
else if (device_is_compatible(dev, "arm,cortex-a72"))
type = SC_R_A72;
else
return 0;
ret = sc_pm_get_clock_rate(-1, type, SC_PM_CLK_CPU,
ret = sc_pm_get_clock_rate(-1, plat->cpu_rsrc, SC_PM_CLK_CPU,
(sc_pm_clock_rate_t *)&rate);
if (ret) {
printf("Could not read CPU frequency: %d\n", ret);
@ -209,9 +209,9 @@ static int imx8_cpu_probe(struct udevice *dev)
struct cpu_imx_platdata *plat = dev_get_platdata(dev);
u32 cpurev;
set_core_data(dev);
cpurev = get_cpu_rev();
plat->cpurev = cpurev;
plat->name = get_core_name(dev);
plat->rev = get_imx8_rev(cpurev & 0xFFF);
plat->type = get_imx8_type((cpurev & 0xFF000) >> 12);
plat->freq_mhz = imx8_get_cpu_rate(dev) / 1000000;