From patchwork Tue Jan 24 13:50:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 47714 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2169514wrn; Tue, 24 Jan 2023 06:12:16 -0800 (PST) X-Google-Smtp-Source: AMrXdXsstDoIqjKClGDPEa+qCn4Frkx/yilHiwIV18NJb8a86KiTaYMQ0esB+QSXam7WHgSkMZew X-Received: by 2002:a05:6a20:699b:b0:b8:a4e7:7940 with SMTP id t27-20020a056a20699b00b000b8a4e77940mr36834146pzk.11.1674569535904; Tue, 24 Jan 2023 06:12:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674569535; cv=none; d=google.com; s=arc-20160816; b=gz4wspdQrx9wS3AyEN/kr76Kmy48MhuYVZcgNTzGU/VTpMXuGJpseIdg2+3qzJazlz ul78UGE4zlxpLxb9wD2dxgByFnF8QG1IeKIiRGegX5IYMd8QOFYzJaTu5uvfOJPGXBTC P7/vdYMwC8v07IP9UPy1xgsY+luKIf5rWJc2PQxVtLj92+eqRhqz1q/eQjq5obcxWEwZ 7ue8okEmqmg31ULbhKC8sdehSC4gxo1prJ5Bqi2lsNaNC2e4b3LsY7C+4jO6agNiiNXk B02NV8DsaBHxstL/CRR4rkY0f9s3CUgJm5kvtRdjU0yjS+ChOAyNbxdUFmHkEKGahEa7 Vz6Q== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=GRHFm87xhd5kwGJXeGjCaI1s3MvLoDnYqaOChsF1PF4=; b=GH8rShJze8/IHI3okhbe4pVzsQOwvvRhiAmtDidgsN0BKCOBWajNF/gVZecRrreRj9 69qkRB6BLqg2q7s4MwrOZngVwfTRi2M1yl5/z3ZGujdAXm3PHkl0MbTQDXiXlHkWJS9S 2MEqT3+x3P40lZtQWLqoRTjgzk8TeFXFPuRFxLKZsEVtVBppwL48Po3/GQSMRsgHo1gf dCg//0V6k4sN2IQNuHsqL5+bYCs3K8xcUGKVoVxsSX8di1OcJ9UZJFsZPKuZk+OXBxoZ CYQTPjWm/ZZdkY/aXB71dnljk4mDO93kMkgg1Af89nS3OmufLKLloCHVJZHF4SjErA6v UctA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pcMpDVis; 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=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x8-20020a170902ec8800b00192de3fbb4asi2646411plg.261.2023.01.24.06.11.41; Tue, 24 Jan 2023 06:12:15 -0800 (PST) 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=@linaro.org header.s=google header.b=pcMpDVis; 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=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234671AbjAXNxz (ORCPT + 99 others); Tue, 24 Jan 2023 08:53:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53656 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234704AbjAXNx3 (ORCPT ); Tue, 24 Jan 2023 08:53:29 -0500 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 116E64943C for ; Tue, 24 Jan 2023 05:51:24 -0800 (PST) Received: by mail-wm1-x32c.google.com with SMTP id f19-20020a1c6a13000000b003db0ef4dedcso12859499wmc.4 for ; Tue, 24 Jan 2023 05:51:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GRHFm87xhd5kwGJXeGjCaI1s3MvLoDnYqaOChsF1PF4=; b=pcMpDVisDmB6BmL5C0d/5YIhuoNLTKnu81ssrjpVi0NxvZeV70feTYjhtHR4OR/Yyj AwPFghZLg62VGxxiOUpfY7NS1BPAt/GRPfoOKIRmx9ShUf23BuRt5P1BeJyVtxvdxcH6 jxC2OAt0Vm7SvRJ3wiPKXkFfza17Jao1XQOTCyW1zV+ZVsTzyFPxCasrr7dmtJ8RpXPG J/knhYjAVj6EnNl8p+OYpANuWLsuF4BA07CAE3yMxmRXyKF8Gby4YOuu33Z4W4tuhm4o BAhKUwIe5/QnVmRVOaM17TTW5hPKXw0lDZuxZ6iaRVBaV+DuBhLIuAduTNIo14KKpXAq Wp8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GRHFm87xhd5kwGJXeGjCaI1s3MvLoDnYqaOChsF1PF4=; b=x/+uH1hNAJ6MNj3LS7lEX5Pk3KiJpWWQiTR7AuZPJBMI3PSqZjXzmag298CByVGLbA lb9sKuqB4qts0isY/QzYok2tSOOA3+n6bNHH8R31qbusANWfAPWmJvKKlmLG51DGb76Y MEo+C+/GUfkc7CbdWlGOpM+SheHVG1ddkN6ST2km2OOzDbuSaUFnUOPs8giMeSuSMHbL Cg6etA6keUGeTTrJItTcwsuh8STwy2DzZq1g3zRADE/hEjck5Guf5wI9svrXQV1kXzUv wh5X5+vfALPd+bs7DgczzRlUVz+Be3/rZiix5UGRBq+GUN05EwIPVOCPt3qy1PCJRyTF N9Hw== X-Gm-Message-State: AFqh2kqzpdj4GX6YjkbAtuZ37CGo5ArFI+PElGG4RJHWi8Xtez8Bc4G/ 4w+HehW4zf4QMJlbK/iFaGOqeA== X-Received: by 2002:a05:600c:5114:b0:3db:254e:59a9 with SMTP id o20-20020a05600c511400b003db254e59a9mr19030478wms.15.1674568238494; Tue, 24 Jan 2023 05:50:38 -0800 (PST) Received: from mai.. (146725694.box.freepro.com. [130.180.211.218]) by smtp.gmail.com with ESMTPSA id j4-20020a05600c42c400b003db1ca20170sm1972507wme.37.2023.01.24.05.50.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Jan 2023 05:50:38 -0800 (PST) From: Daniel Lezcano To: daniel.lezcano@linaro.org, rafael@kernel.org Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Amit Kucheria , Zhang Rui , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , linux-arm-kernel@lists.infradead.org (moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE) Subject: [PATCH 3/3] thermal/drivers/imx: USe get_crit_temp() API instead of manual check Date: Tue, 24 Jan 2023 14:50:23 +0100 Message-Id: <20230124135024.366486-3-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230124135024.366486-1-daniel.lezcano@linaro.org> References: <20230124135024.366486-1-daniel.lezcano@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=1.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Level: * 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?1755913425735410433?= X-GMAIL-MSGID: =?utf-8?q?1755913425735410433?= The thermal framework is reworked to use a generic trip point description. That will consolidate the code and will allow to fix a mishandling of the trip points crossed events. In order self-encapsulate the thermal framework and prevent assumption about the indexes we remove the trip id usage in the back end drivers. As the i.MX driver is using the thermal trip generic structure, we can rely on the thermal framework to get the critical temperature instead of using the harcoded IMX_TRIP_CRITICAL index. Signed-off-by: Daniel Lezcano --- drivers/thermal/imx_thermal.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/thermal/imx_thermal.c b/drivers/thermal/imx_thermal.c index c115a696e83f..10ebf42f4915 100644 --- a/drivers/thermal/imx_thermal.c +++ b/drivers/thermal/imx_thermal.c @@ -337,7 +337,7 @@ static int imx_set_trip_temp(struct thermal_zone_device *tz, int trip_id, { struct imx_thermal_data *data = tz->devdata; struct thermal_trip trip; - int ret; + int crit_temp, ret; ret = pm_runtime_resume_and_get(data->dev); if (ret < 0) @@ -347,12 +347,16 @@ static int imx_set_trip_temp(struct thermal_zone_device *tz, int trip_id, if (ret) return ret; + if (temp < 0) + return -EINVAL; + /* do not allow changing critical threshold */ if (trip.type == THERMAL_TRIP_CRITICAL) return -EPERM; - + /* do not allow passive to be set higher than critical */ - if (temp < 0 || temp > trips[IMX_TRIP_CRITICAL].temperature) + ret = thermal_zone_get_crit_temp(tz, &crit_temp); + if (!ret && (crit_temp < temp)) return -EINVAL; imx_set_alarm_temp(data, temp);