From patchwork Thu Oct 20 14:52:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 6237 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4242:0:0:0:0:0 with SMTP id s2csp165171wrr; Thu, 20 Oct 2022 08:12:02 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7OvLc9o+7kPD9jFQcRVFhvLeHZHbl6BI+D9o9LMhjwuTvrkzUhlIUDkbaufMU5wsYQi++q X-Received: by 2002:a17:907:3188:b0:741:4bf7:ec1a with SMTP id xe8-20020a170907318800b007414bf7ec1amr11679911ejb.448.1666278717354; Thu, 20 Oct 2022 08:11:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666278717; cv=none; d=google.com; s=arc-20160816; b=X4HZET5z1UkWsD7AFCIBSTQFdyxfELr3lEgyV9h1Z6ESCUcKmaA3pFiPsjNlS6AZUN R45LS7J77GbdHXf+gTD/7SsGnC5YSSUJs6os6FItHUMQyRxRm8bmKqNuQErbvCtAz1sk 5KvkVyZ0/hZmHBCwwhyQ1dVEmqt5Q8nR9qBySoNDfAXe3mH7U+9m38skbri4E0hRZbWZ VCOPa7UmJwT84YnjeQFslfnlJaMVvv8qqEPzXY58ubahiJZFNiYGCuqtXTq/IZ5TpOR/ xe5URRj6O+EWhcvLcOekIJJWkhc6O+T8FDB61lcErt+DHoS4wWq92KiBSIQEHLQu6yms HpIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=iDGNVxNBG5DnP2O72JRwhZ79bFRdgRafb7U2+dHA6NI=; b=XFpLFiSoN9x367DUUO68Myzfzgn6gvNWWuMaIFCyiQ0g1jWm31NdxTVC2XmvS1o+MU 6v8sYsYwkLzzAasffwVgGGldrTgOTAAkadWRUeHnoMDZL5D5Lu6/EE7IrC9C6GHFhxxS 718M7Ld56UTnW2JAIVHaYe2If7sBPb/4/3noiHz58KMWKtTt80j8VU7Mx0Vo8ka/F5Sb eURBVaQ8Enp/dnemdJhJXOd1J3lnuPjHLcl6KnZrSsLggpqAKPhYTnIAMXOK+U587bnW dBeOHWyLxnrqZX6BygFmjw/GfB+j/mQtUpBwcvLA2F+1e6fJs+9AfdUPLx1WX2FmUhF9 zUTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fairphone.com header.s=fair header.b=HQx6beIG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=fairphone.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d6-20020a170906c20600b0078d27c1c8f4si13978884ejz.696.2022.10.20.08.11.25; Thu, 20 Oct 2022 08:11:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@fairphone.com header.s=fair header.b=HQx6beIG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=fairphone.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229867AbiJTOxM (ORCPT + 99 others); Thu, 20 Oct 2022 10:53:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34768 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229871AbiJTOxK (ORCPT ); Thu, 20 Oct 2022 10:53:10 -0400 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 052EDAA3F7 for ; Thu, 20 Oct 2022 07:53:08 -0700 (PDT) Received: by mail-ej1-x629.google.com with SMTP id 13so128636ejn.3 for ; Thu, 20 Oct 2022 07:53:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=iDGNVxNBG5DnP2O72JRwhZ79bFRdgRafb7U2+dHA6NI=; b=HQx6beIGe/7vsiKgB9fdxAVCuvcdbkQg+VQX6cKRsc+Gu2PI/mHpj5LeOPIAJXmziM +gSPF02UrS5CAMYnQTdZCGvU9PP6fjDkOTBfUlQ5yIN0VeNH2RbKyXy0un3FvjX+lHA1 o6gpyV/iQBb3aFE3FpY9lGrCvezZA0rEW+Gk+OP9jc2i7nzek1ENKKOTWwYXa0FBeaS2 DbyxcM7AIaKGFf0haYiX/biPZcdBTp+ORTfmCYyQeu6tZ/ZRziQBgp+tW1leWRQwo4DQ jhZ5azqVFMc2dtaPNro2vcAwaYNuSRvBE5cHnN/PL+CGBDY3eQHvu2UDa7KqwFLAvk0A IsXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=iDGNVxNBG5DnP2O72JRwhZ79bFRdgRafb7U2+dHA6NI=; b=U7xqY8JAd6b8SbkZPPSyn/vLuboOe4YhEm92kTJgJzShFQKPBN6WT6I0pa697BOYps H5JEXyNJxPVPDcoxKPUjHFYevGfXNqit4YZKgfq5jJJFy6AYhtNi3hGbV/Zw50fDeYmJ pyNHb7hSn3d+uzSd+p69VGjCbZhENjAnUdpSdp/hR8f1+W25TYpE5m2PWg7E6nYzVzN9 n+6OOckPeZkhx1FH8tqnzGyCw7Lb3OZVNrqtGpfJUfIoMixaa8Ot1+bDvBkjew7alLxY yFUv1LlobK5X/dtHUbU7MspSJNow27rvX6pBTpD6YcqU7cszKWUB0QSdmvj1oMSbslP/ dvfQ== X-Gm-Message-State: ACrzQf11c9KHpLbFMkibVPJN3IdmPgERTpvGkA8Gw2Sjo23VeWrG3FKR jiASWWCJe4FxDDv3EGUd/crLHg== X-Received: by 2002:a17:907:c78e:b0:78d:138a:ec4b with SMTP id tz14-20020a170907c78e00b0078d138aec4bmr11231917ejc.381.1666277586545; Thu, 20 Oct 2022 07:53:06 -0700 (PDT) Received: from otso.. (144-178-202-138.static.ef-service.nl. [144.178.202.138]) by smtp.gmail.com with ESMTPSA id fk26-20020a056402399a00b0044dbecdcd29sm12088479edb.12.2022.10.20.07.53.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Oct 2022 07:53:06 -0700 (PDT) From: Luca Weiss To: linux-arm-msm@vger.kernel.org Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, Luca Weiss , Andy Gross , Bjorn Andersson , Konrad Dybcio , Amit Kucheria , Thara Gopinath , "Rafael J. Wysocki" , Daniel Lezcano , Zhang Rui , Stephen Boyd , David Collins , Guru Das Srinagesh , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] thermal/drivers/qcom/temp-alarm: fix inaccurate warning for gen2 Date: Thu, 20 Oct 2022 16:52:37 +0200 Message-Id: <20221020145237.942146-1-luca.weiss@fairphone.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747219872187091587?= X-GMAIL-MSGID: =?utf-8?q?1747219872187091587?= On gen2 chips the stage2 threshold is not 140 degC but 125 degC. Make the warning message clearer by using this variable and also by including the temperature that was checked for. Fixes: aa92b3310c55 ("thermal/drivers/qcom-spmi-temp-alarm: Add support for GEN2 rev 1 PMIC peripherals") Signed-off-by: Luca Weiss Reviewed-by: Amit Kucheria --- 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..ad84978109e6 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 %d mC is above the maximum stage 2 threshold of %ld mC! Configuring stage 2 shutdown at %ld mC.\n", + temp, stage2_threshold_max, stage2_threshold_max); } skip: