From nobody Sat Sep 21 18:07:19 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8EAC2ECAAA1 for ; Fri, 9 Sep 2022 07:41:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231899AbiIIHlL (ORCPT ); Fri, 9 Sep 2022 03:41:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54934 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231356AbiIIHka (ORCPT ); Fri, 9 Sep 2022 03:40:30 -0400 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DFD30A00C5 for ; Fri, 9 Sep 2022 00:36:43 -0700 (PDT) Received: by mail-wr1-x436.google.com with SMTP id b17so1303284wrq.3 for ; Fri, 09 Sep 2022 00:36:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=VAYnwkfrZ4a7tvkEcL0k72yy6ShpvbFzBv3SVUue2w0=; b=5jSMd6uAHwza5UlrJoB6FQW/tHwd9jFbHNjmWHyWQv8eOKXF6fFoZ9HSrHOb4J7qmL IPtNbnl+fKofabUfLBZXJRhSG81KvlPegAmuHjSdMmMxa/VDTZsaTVxI13QRMyrQPaCp +bZrapGgLgCGimLOiayBXzUuyzBKgm5LGF/nkhI04q+t7PFonp8+Qd5LpRadYGdMGLwH w6aLP4LIq3l/sTs4tuToxErg/yhUDB0njwMtUuCxMcMoKONWrKksmZFLXuQgDSrF81dZ 9IKML0l3lH7OH37/c+Rtpju90cC/Czohc17yBLJochaN7DnnFIE74yVe/UzbThPZdcvh QGVA== 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; bh=VAYnwkfrZ4a7tvkEcL0k72yy6ShpvbFzBv3SVUue2w0=; b=vZNRQgjtJgAJcRry4FbS5cvlsaZI2YyW9PGZZexqyAmOXWF9WvlOs5cy2InOcZmBCP FgethGSd1nhvjz02LUb8vG2ByYNDhpvcbtaRyVDwCI7gPNh+ic94yS7O3R395VPH0rAg jIsyuG9cJKz0E0W5FwKokcl6u/qYIHsceRQty+eLkq5qvww5d5Q4YxZV2IRJls16GPqM 7IW6k9NUKLQrEfTxuJO1gm4R3rCuWZZHPD0Xj1DJbzYHItHa55UFi49o+jalaymqNbxc ckImIBNLo6qelDjLMZ23LOGxgDoEt3UBWylpbGklXAcwtFDBmrhYpi+W+Pq+bG35JcWK zTBA== X-Gm-Message-State: ACgBeo0et9/nHMVmaF9AJdEUQIA0MMmENssDjCp8uoYDP2RFuE3LLSK7 +LuKHqr51ogPeFkr+UK83sbdaA== X-Google-Smtp-Source: AA6agR529TsTLCA7lamvsUdJRLJmefnUu63I84uP0pqFOAGToGl9EepQN9wyhSYrdATkJqDDAV+A6A== X-Received: by 2002:a5d:6f0d:0:b0:229:a479:989e with SMTP id ay13-20020a5d6f0d000000b00229a479989emr6090317wrb.158.1662708987956; Fri, 09 Sep 2022 00:36:27 -0700 (PDT) Received: from amjad-ThinkPad-T490.baylibre (laubervilliers-658-1-213-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.googlemail.com with ESMTPSA id j5-20020a05600c1c0500b003a682354f63sm5345901wms.11.2022.09.09.00.36.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Sep 2022 00:36:27 -0700 (PDT) From: Amjad Ouled-Ameur To: matthias.bgg@gmail.com Cc: Amjad Ouled-Ameur , rafael@kernel.org, fparent@baylibre.com, amitk@kernel.org, daniel.lezcano@linaro.org, devicetree@vger.kernel.org, krzysztof.kozlowski+dt@linaro.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-pm@vger.kernel.org, robh+dt@kernel.org, rui.zhang@intel.com, Michael Kao , Hsin-Yi Wang Subject: [PATCH v4 4/4] thermal: mediatek: add another get_temp ops for thermal sensors Date: Fri, 9 Sep 2022 09:36:09 +0200 Message-Id: <20220909073609.32337-5-aouledameur@baylibre.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220909073609.32337-1-aouledameur@baylibre.com> References: <20220909073609.32337-1-aouledameur@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Provide thermal zone to read thermal sensor in the SoC. We can read all the thermal sensors value in the SoC by the node /sys/class/thermal/ In mtk_thermal_bank_temperature, return -EAGAIN instead of -EACCESS on the first read of sensor that often are bogus values. This can avoid following warning on boot: thermal thermal_zone6: failed to read out thermal zone (-13) Signed-off-by: Michael Kao Signed-off-by: Hsin-Yi Wang Signed-off-by: Amjad Ouled-Ameur --- Changes in V4: - Use callback for raw_to_mcelsius() - Use struct 'struct thermal_zone_device_ops' instead of no longer existent 'struct thermal_zone_of_device_ops' drivers/thermal/mtk_thermal.c | 104 ++++++++++++++++++++++++++-------- 1 file changed, 79 insertions(+), 25 deletions(-) diff --git a/drivers/thermal/mtk_thermal.c b/drivers/thermal/mtk_thermal.c index 3a5df1440822..311ad611fdab 100644 --- a/drivers/thermal/mtk_thermal.c +++ b/drivers/thermal/mtk_thermal.c @@ -259,6 +259,11 @@ enum mtk_thermal_version { =20 struct mtk_thermal; =20 +struct mtk_thermal_zone { + struct mtk_thermal *mt; + int id; +}; + struct thermal_bank_cfg { unsigned int num_sensors; const int *sensors; @@ -307,6 +312,8 @@ struct mtk_thermal { =20 const struct mtk_thermal_data *conf; struct mtk_thermal_bank banks[MAX_NUM_ZONES]; + + int (*raw_to_mcelsius)(struct mtk_thermal *mt, int sensno, s32 raw); }; =20 /* MT8183 thermal sensor data */ @@ -709,6 +716,29 @@ static void mtk_thermal_put_bank(struct mtk_thermal_ba= nk *bank) mutex_unlock(&mt->lock); } =20 +static int _get_sensor_temp(struct mtk_thermal *mt, int id) +{ + u32 raw; + int temp; + + const struct mtk_thermal_data *conf =3D mt->conf; + + raw =3D readl(mt->thermal_base + conf->msr[id]); + + temp =3D mt->raw_to_mcelsius(mt, id, raw); + + /* + * The first read of a sensor often contains very high bogus + * temperature value. Filter these out so that the system does + * not immediately shut down. + */ + + if (temp > 200000) + return -EAGAIN; + else + return temp; +} + /** * mtk_thermal_bank_temperature - get the temperature of a bank * @bank: The bank @@ -721,26 +751,9 @@ static int mtk_thermal_bank_temperature(struct mtk_the= rmal_bank *bank) struct mtk_thermal *mt =3D bank->mt; const struct mtk_thermal_data *conf =3D mt->conf; int i, temp =3D INT_MIN, max =3D INT_MIN; - u32 raw; =20 for (i =3D 0; i < conf->bank_data[bank->id].num_sensors; i++) { - raw =3D readl(mt->thermal_base + conf->msr[i]); - - if (mt->conf->version =3D=3D MTK_THERMAL_V1) { - temp =3D raw_to_mcelsius_v1( - mt, conf->bank_data[bank->id].sensors[i], raw); - } else { - temp =3D raw_to_mcelsius_v2( - mt, conf->bank_data[bank->id].sensors[i], raw); - } - - /* - * The first read of a sensor often contains very high bogus - * temperature value. Filter these out so that the system does - * not immediately shut down. - */ - if (temp > 200000) - temp =3D 0; + temp =3D _get_sensor_temp(mt, i); =20 if (temp > max) max =3D temp; @@ -749,9 +762,10 @@ static int mtk_thermal_bank_temperature(struct mtk_the= rmal_bank *bank) return max; } =20 -static int mtk_read_temp(struct thermal_zone_device *tz, int *temperature) +static int mtk_read_temp(struct thermal_zone_device *tzdev, int *temperatu= re) { - struct mtk_thermal *mt =3D tz->devdata; + struct mtk_thermal_zone *tz =3D tzdev->devdata; + struct mtk_thermal *mt =3D tz->mt; int i; int tempmax =3D INT_MIN; =20 @@ -770,10 +784,28 @@ static int mtk_read_temp(struct thermal_zone_device *= tz, int *temperature) return 0; } =20 +static int mtk_read_sensor_temp(struct thermal_zone_device *tzdev, int *te= mperature) +{ + struct mtk_thermal_zone *tz =3D tzdev->devdata; + struct mtk_thermal *mt =3D tz->mt; + int id =3D tz->id - 1; + + if (id < 0) + return -EACCES; + + *temperature =3D _get_sensor_temp(mt, id); + + return 0; +} + static const struct thermal_zone_device_ops mtk_thermal_ops =3D { .get_temp =3D mtk_read_temp, }; =20 +static const struct thermal_zone_device_ops mtk_thermal_sensor_ops =3D { + .get_temp =3D mtk_read_sensor_temp, +}; + static void mtk_thermal_init_bank(struct mtk_thermal *mt, int num, u32 apmixed_phys_base, u32 auxadc_phys_base, int ctrl_id) @@ -1072,6 +1104,7 @@ static int mtk_thermal_probe(struct platform_device *= pdev) u64 auxadc_phys_base, apmixed_phys_base; struct thermal_zone_device *tzdev; void __iomem *apmixed_base, *auxadc_base; + struct mtk_thermal_zone *tz; =20 mt =3D devm_kzalloc(&pdev->dev, sizeof(*mt), GFP_KERNEL); if (!mt) @@ -1150,6 +1183,9 @@ static int mtk_thermal_probe(struct platform_device *= pdev) =20 mtk_thermal_turn_on_buffer(mt, apmixed_base); =20 + mt->raw_to_mcelsius =3D (mt->conf->version =3D=3D MTK_THERMAL_V1) ? + raw_to_mcelsius_v1 : raw_to_mcelsius_v2; + if (mt->conf->version =3D=3D MTK_THERMAL_V2) { mtk_thermal_release_periodic_ts(mt, auxadc_base); } @@ -1161,11 +1197,29 @@ static int mtk_thermal_probe(struct platform_device= *pdev) =20 platform_set_drvdata(pdev, mt); =20 - tzdev =3D devm_thermal_of_zone_register(&pdev->dev, 0, mt, - &mtk_thermal_ops); - if (IS_ERR(tzdev)) { - ret =3D PTR_ERR(tzdev); - goto err_disable_clk_peri_therm; + for (i =3D 0; i < mt->conf->num_sensors + 1; i++) { + tz =3D devm_kmalloc(&pdev->dev, sizeof(*tz), GFP_KERNEL); + if (!tz) + return -ENOMEM; + + tz->mt =3D mt; + tz->id =3D i; + + tzdev =3D devm_thermal_of_zone_register(&pdev->dev, i, tz, (i =3D=3D 0) ? + &mtk_thermal_ops : + &mtk_thermal_sensor_ops); + + if (IS_ERR(tzdev)) { + if (PTR_ERR(tzdev) =3D=3D -ENODEV) { + dev_warn(&pdev->dev, + "sensor %d not registered in thermal zone in dt\n", i); + continue; + } + if (PTR_ERR(tzdev) =3D=3D -EACCES) { + ret =3D PTR_ERR(tzdev); + goto err_disable_clk_peri_therm; + } + } } =20 ret =3D devm_thermal_add_hwmon_sysfs(tzdev); --=20 2.37.3