From patchwork Wed Oct 19 14:17:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amjad Ouled-Ameur X-Patchwork-Id: 13011889 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 52DBEC433FE for ; Wed, 19 Oct 2022 14:46:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=r1PrDZfmYougOsxckNxrQ+xzuB0k8iiqOh0Bd1vtSCc=; b=x3qogzoYq5r6coupHX3Rrg5qfE 3FRtRxBictoYboFU9Tr+cmTeH792zOq969o6XpBQh+MQdkK3ze1TrK87+9aYRktsEln+qxZC/ebgH B2+HXlzi29p259geOHjsVpGAF6BMUOoNc9a1aJT0fBqIZ5JH/7gZne3+PO/1rDhEO1DInwl7HDHd9 Vqb6Rx1ndOERmA7wiP1FK62jl6+1cNNtirDun+IwtHAsXJMLklGJTRm/wnhk5p9AZZ8BFhZy1rA9U 09FsEYqJddeYty5TqgJUbLwZSCYMRZRS2hP+UH4wwOd6jHnurDcNbXAWiMw24CPsaziLYQ/al5WaV wt4A+nbA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1olAKq-002s1k-V9; Wed, 19 Oct 2022 14:46:21 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ol9tb-002iFR-2c for linux-mediatek@bombadil.infradead.org; Wed, 19 Oct 2022 14:18:11 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Cc:To:In-Reply-To:References: Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Sender:Reply-To:Content-ID:Content-Description; bh=r1PrDZfmYougOsxckNxrQ+xzuB0k8iiqOh0Bd1vtSCc=; b=nRYUMds4F3jV7nfar9ruMNsL4G uQTkw89f3nclHjohuApjCtzd4wZLcb/u2dlOMtAJg3xEeJy7kQekmbI6NgQsDSsS37uaW4ZAkkLPE EtDnkOFy1ly2dyw9oELAnUVCoigQ2PNHf/45MaX/qbBQFS40xYyh8/qBiMCeTdEvFLgXAwFb259mu /uBh+Ls/EerNgM/w3lVP9/MYlqtSXngOBboxxHkisJSdZqIMakRsp/oHicFy/41AbyKOCM6rWNtbe S1iFtl8XxArfjG6/XwbW3f1fB/Ip5DpZ65XSnPBmvhQ6NTJt6ptAeuBRptMKYrmoSHtlwXys/CG9Y HGZEMWnw==; Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ol9tW-004lpq-0y for linux-mediatek@lists.infradead.org; Wed, 19 Oct 2022 14:18:09 +0000 Received: by mail-wr1-x430.google.com with SMTP id n12so29197869wrp.10 for ; Wed, 19 Oct 2022 07:18:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20210112.gappssmtp.com; s=20210112; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=r1PrDZfmYougOsxckNxrQ+xzuB0k8iiqOh0Bd1vtSCc=; b=crf2NXyIHNERe/g40V/74dQ2TcrFy04yDb7Z6j173hLda7PrrzE8Hog47MMmX38b4I p+zvmiYQQY8f1OT4DZgszfe3SlmHT/gf1p/cKhIeAWcjkV3Ae+uNN0gTIB2+J0/eEwkD +/gu52wzFP15Gj7k6hZzX3IcnualSrPnQNDugsgM+naSeSpPXre+epWpMkeGv2zWsPBs SfaL0lhBgHV6NDMAQ6t8UuRVKHJQEsn3rGu5ONutkqe5SdHaIKnQopR/PbMblmW2y79y DwS5R9Xs4OZaqchL0hTwDHv5Oi8/bHDHq5yaZcTQgrISf0ZF1Ee23vrwzk0fgZesuKJM OAHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=r1PrDZfmYougOsxckNxrQ+xzuB0k8iiqOh0Bd1vtSCc=; b=arE03cy0p8wgNxr1+Mdq/0VTLTTGFcrbE3mNwBCE7sHi8MJV96QtnGeeRrwiFAr/63 fMfwu/ok8ezFe5C3StQwblhQnxwaOMVtrZUms9YT372vQ1dgiDsWNyA1CpCTq2PtOKsS lV3LbqZmClwVs7OlSzqrVgTUMPViKoEbhjyQA3h79qhScPCyn8BdlYyxDalOF6cwmra9 7I5Ix/UrTvRshpy/Q0mdR1IyGcBhGCu1bowq0k7S4+22VKJh6qFEp0oFdw7rdLFjAPXO DRULDJaoRrnJnN3xw95Sxkd7VceU67+hPurP9NCy0nKVdmb5YtMovcdUY3ZSuydHS4Mj AyUg== X-Gm-Message-State: ACrzQf2YNSQkVlDgRV9WioV3/oyPaABnFV/fTR3GJNucWsz1l9svU5kW /g4gZdAqGWpAF5fnL3RSc6XAXA== X-Google-Smtp-Source: AMsMyM5Y/74+1pzQiwlun2S8Zq7M/Gz8GRVvcjjcaZVepoj35UG4S/4Q7BzlKNSsI3kMxeFEkLGNXQ== X-Received: by 2002:a5d:47c2:0:b0:22e:4911:6925 with SMTP id o2-20020a5d47c2000000b0022e49116925mr5339604wrc.403.1666189080951; Wed, 19 Oct 2022 07:18:00 -0700 (PDT) Received: from [127.0.1.1] (rtr.23.90.200.126.unyc.it. [23.90.200.126]) by smtp.googlemail.com with ESMTPSA id n9-20020a05600c3b8900b003b4ff30e566sm2126577wms.3.2022.10.19.07.18.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Oct 2022 07:18:00 -0700 (PDT) From: Amjad Ouled-Ameur Date: Wed, 19 Oct 2022 16:17:57 +0200 Subject: [PATCH v6 4/4] thermal: mediatek: add another get_temp ops for thermal sensors MIME-Version: 1.0 Message-Id: <20221018-up-i350-thermal-bringup-v6-4-c87b9f75550b@baylibre.com> References: <20221018-up-i350-thermal-bringup-v6-0-c87b9f75550b@baylibre.com> In-Reply-To: <20221018-up-i350-thermal-bringup-v6-0-c87b9f75550b@baylibre.com> To: Krzysztof Kozlowski , Zhang Rui , Amit Kucheria , Rob Herring , "Rafael J. Wysocki" , Daniel Lezcano Cc: Fabien Parent , linux-mediatek@lists.infradead.org, Rob Herring , Markus Schneider-Pargmann , linux-arm-kernel@lists.infradead.org, linux-pm@vger.kernel.org, AngeloGioacchino Del Regno , Michael Kao , Hsin-Yi Wang , Amjad Ouled-Ameur , linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Matthias Brugger X-Mailer: b4 0.10.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1666189076; l=5964; i=aouledameur@baylibre.com; s=20220920; h=from:subject:message-id; bh=PvZXnHsGezp4LZF6C3Dyxbe0D+0mUeauPzu2u+WwTJc=; b=mN12SgEKRbCMQ8J43HF0rMCxcYPMfYBZmq1IrycQ0tHL/y41ovLGQ3dNTGgXY8s8Q9yZ+3awDmcB 2AdC/id3A6pdrLQwfJbcFda3VLuZY4sTB5+Q7cxgdtso+O8UzYwJ X-Developer-Key: i=aouledameur@baylibre.com; a=ed25519; pk=HgYWawSL4qLGPx+RzJ+Cuu+V8Pi/KQnDDm1wjWPMOFE= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221019_151806_403580_9300B432 X-CRM114-Status: GOOD ( 21.38 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org 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 Reviewed-by: AngeloGioacchino Del Regno --- 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 { struct mtk_thermal; +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 { 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); }; /* MT8183 thermal sensor data */ @@ -709,6 +716,29 @@ static void mtk_thermal_put_bank(struct mtk_thermal_bank *bank) mutex_unlock(&mt->lock); } +static int _get_sensor_temp(struct mtk_thermal *mt, int id) +{ + u32 raw; + int temp; + + const struct mtk_thermal_data *conf = mt->conf; + + raw = readl(mt->thermal_base + conf->msr[id]); + + temp = 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_thermal_bank *bank) struct mtk_thermal *mt = bank->mt; const struct mtk_thermal_data *conf = mt->conf; int i, temp = INT_MIN, max = INT_MIN; - u32 raw; for (i = 0; i < conf->bank_data[bank->id].num_sensors; i++) { - raw = readl(mt->thermal_base + conf->msr[i]); - - if (mt->conf->version == MTK_THERMAL_V1) { - temp = raw_to_mcelsius_v1( - mt, conf->bank_data[bank->id].sensors[i], raw); - } else { - temp = 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 = 0; + temp = _get_sensor_temp(mt, i); if (temp > max) max = temp; @@ -749,9 +762,10 @@ static int mtk_thermal_bank_temperature(struct mtk_thermal_bank *bank) return max; } -static int mtk_read_temp(struct thermal_zone_device *tz, int *temperature) +static int mtk_read_temp(struct thermal_zone_device *tzdev, int *temperature) { - struct mtk_thermal *mt = tz->devdata; + struct mtk_thermal_zone *tz = tzdev->devdata; + struct mtk_thermal *mt = tz->mt; int i; int tempmax = INT_MIN; @@ -770,10 +784,28 @@ static int mtk_read_temp(struct thermal_zone_device *tz, int *temperature) return 0; } +static int mtk_read_sensor_temp(struct thermal_zone_device *tzdev, int *temperature) +{ + struct mtk_thermal_zone *tz = tzdev->devdata; + struct mtk_thermal *mt = tz->mt; + int id = tz->id - 1; + + if (id < 0) + return -EACCES; + + *temperature = _get_sensor_temp(mt, id); + + return 0; +} + static const struct thermal_zone_device_ops mtk_thermal_ops = { .get_temp = mtk_read_temp, }; +static const struct thermal_zone_device_ops mtk_thermal_sensor_ops = { + .get_temp = 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; mt = devm_kzalloc(&pdev->dev, sizeof(*mt), GFP_KERNEL); if (!mt) @@ -1150,6 +1183,9 @@ static int mtk_thermal_probe(struct platform_device *pdev) mtk_thermal_turn_on_buffer(mt, apmixed_base); + mt->raw_to_mcelsius = (mt->conf->version == MTK_THERMAL_V1) ? + raw_to_mcelsius_v1 : raw_to_mcelsius_v2; + if (mt->conf->version == MTK_THERMAL_V2) { mtk_thermal_release_periodic_ts(mt, auxadc_base); } @@ -1161,11 +1197,29 @@ static int mtk_thermal_probe(struct platform_device *pdev) platform_set_drvdata(pdev, mt); - tzdev = devm_thermal_of_zone_register(&pdev->dev, 0, mt, - &mtk_thermal_ops); - if (IS_ERR(tzdev)) { - ret = PTR_ERR(tzdev); - goto err_disable_clk_peri_therm; + for (i = 0; i < mt->conf->num_sensors + 1; i++) { + tz = devm_kmalloc(&pdev->dev, sizeof(*tz), GFP_KERNEL); + if (!tz) + return -ENOMEM; + + tz->mt = mt; + tz->id = i; + + tzdev = devm_thermal_of_zone_register(&pdev->dev, i, tz, (i == 0) ? + &mtk_thermal_ops : + &mtk_thermal_sensor_ops); + + if (IS_ERR(tzdev)) { + if (PTR_ERR(tzdev) == -ENODEV) { + dev_warn(&pdev->dev, + "sensor %d not registered in thermal zone in dt\n", i); + continue; + } + if (PTR_ERR(tzdev) == -EACCES) { + ret = PTR_ERR(tzdev); + goto err_disable_clk_peri_therm; + } + } } ret = devm_thermal_add_hwmon_sysfs(tzdev);