On Thu, Jun 01, 2023 at 09:48:03AM +0300, Ido Schimmel wrote:
This reverts commit a71f388045edbf6788a61f43e2cdc94b392a4ea3.
Commit a71f388045ed ("thermal/drivers/mellanox: Use generic thermal_zone_get_trip() function") was backported as a dependency of the fix in upstream commit 6d206b1ea9f4 ("mlxsw: core_thermal: Fix fan speed in maximum cooling state"). However, it is dependent on changes in the thermal core that were merged in v6.3. Without them, the mlxsw driver is unable to register its thermal zone:
mlxsw_spectrum 0000:03:00.0: Failed to register thermal zone mlxsw_spectrum 0000:03:00.0: cannot register bus device mlxsw_spectrum: probe of 0000:03:00.0 failed with error -22
Fix this by reverting this commit and instead fix the small conflict with the above mentioned fix. Tested using the test case mentioned in the change log of the fix:
# cat /sys/class/thermal/thermal_zone2/cdev0/type mlxsw_fan # echo 10 > /sys/class/thermal/thermal_zone2/cdev0/cur_state # cat /sys/class/hwmon/hwmon1/name mlxsw # cat /sys/class/hwmon/hwmon1/pwm1 255
After setting the fan to its maximum cooling state (10), it operates at 100% duty cycle instead of being stuck at 0 RPM.
Fixes: a71f388045ed ("thermal/drivers/mellanox: Use generic thermal_zone_get_trip() function") Reported-by: Joe Botha joe@atomic.ac Tested-by: Joe Botha joe@atomic.ac Signed-off-by: Ido Schimmel idosch@nvidia.com
I read the stable rules, but it is not clear to me which "upstream commit ID" to specify in this case given I am reverting a commit that was mistakenly backported to stable.
This was great, I've taken it as-is, thanks!
greg k-h