| Message ID | 20221025171453.1.I13c2a23f276fb63bfc225aeab0bf0db9560a90e0@changeid (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | thermal: qcom-spmi-temp-alarm: Log the actual max stage 2 threshold | expand |
I just saw that Luca already posted a similar patch: https://lore.kernel.org/lkml/CAHLCerN+-5qKsRmpuF55RdeUMZJZuiZJ-7O4LnM8+QuHJfs0mQ@mail.gmail.com/T/ Please disregard this one. On Tue, Oct 25, 2022 at 05:15:08PM +0000, Matthias Kaehlcke wrote: > If the critical trip point of the thermal zone is higher than > the max threshold of the PMIC log the actual max threshold of the > chip, not the gen1 max threshold of 140°C. > > Reported-by: Luca Weiss <luca.weiss@fairphone.com> > Signed-off-by: Matthias Kaehlcke <mka@chromium.org> > --- > > drivers/thermal/qcom/qcom-spmi-temp-alarm.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/thermal/qcom/qcom-spmi-temp-alarm.c b/drivers/thermal/qcom/qcom-spmi-temp-alarm.c > index be785ab37e53..bdfe2129c357 100644 > --- a/drivers/thermal/qcom/qcom-spmi-temp-alarm.c > +++ b/drivers/thermal/qcom/qcom-spmi-temp-alarm.c > @@ -252,7 +252,8 @@ static int qpnp_tm_update_critical_trip_temp(struct qpnp_tm_chip *chip, > disable_s2_shutdown = true; > else > dev_warn(chip->dev, > - "No ADC is configured and critical temperature is above the maximum stage 2 threshold of 140 C! Configuring stage 2 shutdown at 140 C.\n"); > + "No ADC is configured and critical temperature is above the maximum stage 2 threshold of %d C! Configuring stage 2 shutdown at %d C.\n", > + stage2_threshold_max / 1000, stage2_threshold_max / 1000); > } > > skip: > -- > 2.38.0.135.g90850a2211-goog >
diff --git a/drivers/thermal/qcom/qcom-spmi-temp-alarm.c b/drivers/thermal/qcom/qcom-spmi-temp-alarm.c index be785ab37e53..bdfe2129c357 100644 --- a/drivers/thermal/qcom/qcom-spmi-temp-alarm.c +++ b/drivers/thermal/qcom/qcom-spmi-temp-alarm.c @@ -252,7 +252,8 @@ static int qpnp_tm_update_critical_trip_temp(struct qpnp_tm_chip *chip, disable_s2_shutdown = true; else dev_warn(chip->dev, - "No ADC is configured and critical temperature is above the maximum stage 2 threshold of 140 C! Configuring stage 2 shutdown at 140 C.\n"); + "No ADC is configured and critical temperature is above the maximum stage 2 threshold of %d C! Configuring stage 2 shutdown at %d C.\n", + stage2_threshold_max / 1000, stage2_threshold_max / 1000); } skip:
If the critical trip point of the thermal zone is higher than the max threshold of the PMIC log the actual max threshold of the chip, not the gen1 max threshold of 140°C. Reported-by: Luca Weiss <luca.weiss@fairphone.com> Signed-off-by: Matthias Kaehlcke <mka@chromium.org> --- drivers/thermal/qcom/qcom-spmi-temp-alarm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)