From: Greg KH <gregkh@linuxfoundation.org>
To: Ido Schimmel <idosch@nvidia.com>
Cc: stable@vger.kernel.org, daniel.lezcano@linaro.org,
vadimp@nvidia.com, sashal@kernel.org, petrm@nvidia.com,
davem@davemloft.net, joe@atomic.ac
Subject: Re: [PATCH stable 6.1] Revert "thermal/drivers/mellanox: Use generic thermal_zone_get_trip() function"
Date: Thu, 1 Jun 2023 10:42:51 +0100 [thread overview]
Message-ID: <2023060136-macarena-parasail-5b89@gregkh> (raw)
In-Reply-To: <20230601064803.1063014-1-idosch@nvidia.com>
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
prev parent reply other threads:[~2023-06-01 9:43 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-01 6:48 [PATCH stable 6.1] Revert "thermal/drivers/mellanox: Use generic thermal_zone_get_trip() function" Ido Schimmel
2023-06-01 9:42 ` Greg KH [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2023060136-macarena-parasail-5b89@gregkh \
--to=gregkh@linuxfoundation.org \
--cc=daniel.lezcano@linaro.org \
--cc=davem@davemloft.net \
--cc=idosch@nvidia.com \
--cc=joe@atomic.ac \
--cc=petrm@nvidia.com \
--cc=sashal@kernel.org \
--cc=stable@vger.kernel.org \
--cc=vadimp@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).