Commit 1af89ded authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

thermal: core: Do not fail cdev registration because of invalid initial state 

It is reported that commit 31a0fa00 ("thermal/debugfs: Pass cooling
device state to thermal_debug_cdev_add()") causes the ACPI fan driver
to fail probing on some systems which turns out to be due to the _FST
control method returning an invalid value until _FSL is first evaluated
for the given fan.  If this happens, the .get_cur_state() cooling device
callback returns an error and __thermal_cooling_device_register() fails
as uses that callback after commit 31a0fa00.

Arguably, _FST should not return an invalid value even if it is
evaluated before _FSL, so this may be regarded as a platform firmware
issue, but at the same time it is not a good enough reason for failing
the cooling device registration where the initial cooling device state
is only needed to initialize a thermal debug facility.

Accordingly, modify __thermal_cooling_device_register() to avoid
calling thermal_debug_cdev_add() instead of returning an error if the
initial .get_cur_state() callback invocation fails.

Fixes: 31a0fa00 ("thermal/debugfs: Pass cooling device state to thermal_debug_cdev_add()")
Closes: https://lore.kernel.org/linux-acpi/20240530153727.843378-1-laura.nao@collabora.com


Reported-by: default avatarLaura Nao <laura.nao@collabora.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Tested-by: default avatarLaura Nao <laura.nao@collabora.com>
parent ae2170d6

drivers/thermal/thermal_core.c

+11 −2
Original line number Diff line number Diff line
@@ -999,9 +999,17 @@ __thermal_cooling_device_register(struct device_node *np, 
	if (ret)

		goto out_cdev_type;



	/*

	 * The cooling device's current state is only needed for debug

	 * initialization below, so a failure to get it does not cause

	 * the entire cooling device initialization to fail.  However,

	 * the debug will not work for the device if its initial state

	 * cannot be determined and drivers are responsible for ensuring

	 * that this will not happen.

	 */

	ret = cdev->ops->get_cur_state(cdev, &current_state);

	if (ret)

		goto out_cdev_type;

		current_state = ULONG_MAX;



	thermal_cooling_device_setup_sysfs(cdev);
@@ -1016,6 +1024,7 @@ __thermal_cooling_device_register(struct device_node *np, 
		return ERR_PTR(ret);

	}



	if (current_state <= cdev->max_state)

		thermal_debug_cdev_add(cdev, current_state);



	/* Add 'this' new cdev to the global cdev list */