Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f660d17 authored by Ram Chandrasekar's avatar Ram Chandrasekar
Browse files

Revert "msm: thermal: Keep core_control_mask coincident with boot_cpu_mask" 



This reverts commit 2a5f5ed0.

This change breaks the thermal hotplug logic.

Change-Id: I93632f934c89381e6fbc1c6ad0deb7d032d234b9
Signed-off-by: default avatarRam Chandrasekar <rkumbako@codeaurora.org>
parent c5353f99

drivers/thermal/msm_thermal.c

+2 −13
Original line number Original line Diff line number Diff line
@@ -4609,19 +4609,8 @@ static int probe_cc(struct device_node *node, struct msm_thermal_data *data, 




	key = "qcom,core-control-mask";

	key = "qcom,core-control-mask";

	ret = of_property_read_u32(node, key, &data->core_control_mask);

	ret = of_property_read_u32(node, key, &data->core_control_mask);

	if (ret) {

	if (ret)

		/*

		goto read_node_fail;

		 * Set default mask for all cores except CPU0.

		 * E.g. 0xE for 4 cores and 0xFE for 8 cores.

		 */

		data->core_control_mask = (~1) & (BIT(num_possible_cpus()) - 1);

	}

	/*

	 * Keep core_control_mask coincident with boot_cpu_mask.

	 * cpu_online_mask is the same as boot_cpu_mask until thermal driver

	 * initialization.

	 */

	data->core_control_mask &= *(uint32_t *)cpu_online_mask;





	key = "qcom,hotplug-temp";

	key = "qcom,hotplug-temp";

	ret = of_property_read_u32(node, key, &data->hotplug_temp_degC);

	ret = of_property_read_u32(node, key, &data->hotplug_temp_degC);