Hi Anatolij,

Subject: [PATCH 2/2] thermal: imx_scu_thermal: fix getting DT alert property value

Fix boot hang with endless loop outputting: CPU Temperature (47200C) has beyond alert (0C), close to critical (0C) waiting...

Could you share more info which part was broken?

Thanks, Peng.

Signed-off-by: Anatolij Gustschin agust@denx.de

i.MX8QXP is broken again, this should be appied ASAP!

drivers/thermal/imx_scu_thermal.c | 101 ++++++++++++------------------ 1 file changed, 41 insertions(+), 60 deletions(-)

diff --git a/drivers/thermal/imx_scu_thermal.c b/drivers/thermal/imx_scu_thermal.c index da13121a09..679ce4e244 100644 --- a/drivers/thermal/imx_scu_thermal.c +++ b/drivers/thermal/imx_scu_thermal.c @@ -57,7 +57,7 @@ int imx_sc_thermal_get_temp(struct udevice *dev, int *temp) if (ret) return ret;

• while (cpu_temp >= pdata->alert) {

• while (cpu_temp >= pdata->alert && pdata->alert) { printf("CPU Temperature (%dC) has beyond alert (%dC), close to

critical (%dC)", cpu_temp, pdata->alert, pdata->critical); puts(" waiting...\n"); @@ -78,7 +78,47 @@ static const struct dm_thermal_ops imx_sc_thermal_ops = {

static int imx_sc_thermal_probe(struct udevice *dev) {

• struct imx_sc_thermal_plat *pdata = dev_get_platdata(dev);
• struct fdtdec_phandle_args args;
• ofnode node, trips_np;
• int ret;
• debug("%s dev name %s\n", __func__, dev->name);
• trips_np = ofnode_path("/thermal-zones/cpu-thermal0/trips");
• node = ofnode_get_parent(trips_np);
• ret = fdtdec_parse_phandle_with_args(gd->fdt_blob, node.of_offset,

• 			     "thermal-sensors",
  

• 			     "#thermal-sensor-cells",
  

• 			     0, 0, &args);
  

• if (ret)

• return ret;
  

• if (args.args_count >= 1)

• pdata->id = args.args[0];
  

• else

• pdata->id = 0;
  

• debug("args.args_count %d, id %d\n", args.args_count, pdata->id);
• pdata->polling_delay = ofnode_read_u32_default(node, "polling-delay",

• 				       1000);
  

• ofnode_for_each_subnode(trips_np, trips_np) {

• const char *type;
  

• type = ofnode_get_property(trips_np, "type", NULL);
  

• if (!type)
  

• 	continue;
  

• if (!strcmp(type, "critical"))
  

• 	pdata->critical =
  

• 	ofnode_read_u32_default(trips_np, "temperature", 85);
  

• else if (!strcmp(type, "passive"))
  

• 	pdata->alert =
  

• 	ofnode_read_u32_default(trips_np, "temperature", 80);
  

• }
• debug("id %d polling_delay %d, critical %d, alert %d\n",

•      pdata->id, pdata->polling_delay, pdata->critical, pdata->alert);
  

  return 0;

}

@@ -121,64 +161,6 @@ static int imx_sc_thermal_bind(struct udevice *dev) return 0; }

-static int imx_sc_thermal_ofdata_to_platdata(struct udevice *dev) -{

• struct imx_sc_thermal_plat *pdata = dev_get_platdata(dev);
• struct fdtdec_phandle_args args;
• const char *type;
• int ret;
• int trips_np;
• debug("%s dev name %s\n", __func__, dev->name);
• if (pdata->zone_node)

• return 0;
  

• ret = fdtdec_parse_phandle_with_args(gd->fdt_blob, dev_of_offset(dev),

• 			     "thermal-sensors",
  

• 			     "#thermal-sensor-cells",
  

• 			     0, 0, &args);
  

• if (ret)

• return ret;
  

• if (args.node != dev_of_offset(dev->parent))

• return -EFAULT;
  

• if (args.args_count >= 1)

• pdata->id = args.args[0];
  

• else

• pdata->id = 0;
  

• debug("args.args_count %d, id %d\n", args.args_count, pdata->id);
• pdata->polling_delay = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev),

• 			      "polling-delay", 1000);
  

• trips_np = fdt_subnode_offset(gd->fdt_blob, dev_of_offset(dev),

• 		      "trips");
  

• fdt_for_each_subnode(trips_np, gd->fdt_blob, trips_np) {

• type = fdt_getprop(gd->fdt_blob, trips_np, "type", NULL);
  

• if (type) {
  

• 	if (strcmp(type, "critical") == 0) {
  

• 		pdata->critical = fdtdec_get_int(gd->fdt_blob,
  

• 						 trips_np,
  

• 						 "temperature",
  

• 						 85);
  

• 	} else if (strcmp(type, "passive") == 0) {
  

• 		pdata->alert = fdtdec_get_int(gd->fdt_blob,
  

• 					      trips_np,
  

• 					      "temperature",
  

• 					      80);
  

• 	}
  

• }
  

• }
• debug("id %d polling_delay %d, critical %d, alert %d\n", pdata->id,

•      pdata->polling_delay, pdata->critical, pdata->alert);
  

• return 0;

-}

static const sc_rsrc_t imx8qm_sensor_rsrc[] = { SC_R_A53, SC_R_A72, SC_R_GPU_0_PID0, SC_R_GPU_1_PID0, SC_R_DRC_0, SC_R_DRC_1, SC_R_VPU_PID0, SC_R_PMIC_0, @@ -205,7 +187,6 @@ U_BOOT_DRIVER(imx_sc_thermal) = { .of_match = imx_sc_thermal_ids, .bind = imx_sc_thermal_bind, .probe = imx_sc_thermal_probe,

• .ofdata_to_platdata = imx_sc_thermal_ofdata_to_platdata, .platdata_auto_alloc_size = sizeof(struct imx_sc_thermal_plat), .flags = DM_FLAG_PRE_RELOC,

};

2.17.1

On Tue, 19 May 2020 10:05:21 +0000 Peng Fan peng.fan@nxp.com wrote: ...

Would this help?

diff --git a/drivers/cpu/imx8_cpu.c b/drivers/cpu/imx8_cpu.c index 95c14c98d8..6c949ccbd4 100644 --- a/drivers/cpu/imx8_cpu.c +++ b/drivers/cpu/imx8_cpu.c @@ -68,10 +68,13 @@ static int cpu_imx_get_temp(struct cpu_imx_platdata *plat) struct udevice *thermal_dev; int cpu_tmp, ret;

•   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 (!strcmp(plat->name, "A72")) {
  

•           ret = uclass_get_device_by_name(UCLASS_THERMAL, "cpu-thermal1",
  

•                                           &thermal_dev);
  

•   } else {
  

•           ret = uclass_get_device_by_name(UCLASS_THERMAL, "cpu-thermal0",
  

•                                           &thermal_dev);
  

•   }
  
    if (!ret) {
            ret = thermal_get_temp(thermal_dev, &cpu_tmp);
  

Yes, this fixes the problem, thanks!

-- Anatolij

Subject: [PATCH] cpu: imx8: use intended cpu-thermal device when getting temp value

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: 3ee6ea443eb4 ("cpu: imx_cpu: Print the CPU temperature for iMX8QM A72") Signed-off-by: Anatolij Gustschin agust@denx.de

---

This one supersedes the older patch here:

https://eur01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fpatchw ork.ozlabs.org%2Fproject%2Fuboot%2Fpatch%2F20200516203420.24409-2-a gust%40denx.de&data=02%7C01%7Cpeng.fan%40nxp.com%7C3a05de6 b676d4479832a08d7fc4ccc4d%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C 0%7C0%7C637255279084654887&sdata=W7kv5XqeSrcxcOHNgE0TgcR8 POPyt3VR4EsWszlFXLI%3D&reserved=0

drivers/cpu/imx8_cpu.c | 50 +++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/drivers/cpu/imx8_cpu.c b/drivers/cpu/imx8_cpu.c index 896e1ac776..adc4919d9e 100644 --- a/drivers/cpu/imx8_cpu.c +++ b/drivers/cpu/imx8_cpu.c @@ -18,6 +18,7 @@ struct cpu_imx_platdata { const char *name; const char *rev; const char *type;

• u32 cpu_rsrc; u32 cpurev; u32 freq_mhz; u32 mpidr;

@@ -50,16 +51,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) @@ -67,12 +75,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)

@@ -180,19 +188,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;
• 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;
  

• int ret;

• 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); @@ -207,9

+207,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;

-- 2.17.1

Reviewed-by: Peng Fan peng.fan@nxp.com