From patchwork Fri Oct 25 12:05:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hsin-Te Yuan X-Patchwork-Id: 13850587 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 45059D0C601 for ; Fri, 25 Oct 2024 12:11:06 +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: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:In-Reply-To:References:List-Owner; bh=e8yKR4BVLvMBogTBQ5uhZAmMCQQBIAWiGqlkb0ku774=; b=LsUVypFJPRLsS0PDkt77EI/60i 99+KspaiwdXBUu5NxNtjWxr2TZ2+2wNxF47GHZQngIr29eswucQ1h7+0CGsr2nTILT9ODVaemH4jj F+visACFk8w/q93vCU+SCJiA4ARt9okRSFhiZExrLYJ5YpdJ6uJv4S+ntrWU10uYtlybfarJhcD8A Iid1hq9pq0m59I5K1iglJWO17FXgmXiA7Xkt7zrrzGNszFTeozFlUNqrkAkcv5WW8WnE7EPN6YJhH OJw5K/1p6z3Z1fJhwU4rDq3yLbu5RzlMA8hCUubRD384LgslDHt6UUEaM++mbt04bj0HidnhwdLoh fdZPkz2w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t4J9X-00000003c1j-0osw; Fri, 25 Oct 2024 12:10:51 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t4J4Q-00000003bWw-0PaP for linux-arm-kernel@bombadil.infradead.org; Fri, 25 Oct 2024 12:05:34 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Cc:To:Message-Id: Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date:From:Sender: Reply-To:Content-ID:Content-Description:In-Reply-To:References; bh=e8yKR4BVLvMBogTBQ5uhZAmMCQQBIAWiGqlkb0ku774=; b=YOHuORY36mEjYiVkhzpCZirLFU vG1qk2swLR7/1bTbmoNLpiU4OphI6F8w2p9LeEpaAGbfMDOOufAxXOSqTQqmuU3p2ZFxlioEWYOUM wZde2tWS5wx0PQFHhZZvBukTqk2RKzrosFm7cYc6bQLIYdonwUfwHZsbzvifPeK7Qo1XDv5wms9pZ Bmo1UHeGW3rk4NLUSGfaQ7lo45IghzrzNDNq3EjLRJQf6Q9N6RLI+oCbe4In0D4FuouhndWcF++Ow KWCEQFhEON4jbtqJkdvfuckEaaNSCFJxHOsIPsPK5hjvmX4n7FY75QDJbT1bDGuRr+J1Vo9kQYxJz ylO+NNog==; Received: from mail-pl1-x629.google.com ([2607:f8b0:4864:20::629]) by desiato.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t4J4C-00000008tnV-3PYn for linux-arm-kernel@lists.infradead.org; Fri, 25 Oct 2024 12:05:25 +0000 Received: by mail-pl1-x629.google.com with SMTP id d9443c01a7336-20ceb8bd22fso15009935ad.3 for ; Fri, 25 Oct 2024 05:05:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1729857917; x=1730462717; darn=lists.infradead.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=e8yKR4BVLvMBogTBQ5uhZAmMCQQBIAWiGqlkb0ku774=; b=nEkHLlEm/LOJtcBV8fES6IRraP1g0SMXH2BSsfmLoAwakttk/5PoD0mRUXsvzOveu9 12Xo2tTYMg1wn6Zfy+60y5UkDAzHLCaZIhsG+zUA1cDH4uA8nJeDXGeTCCthdmy2Hc41 Oorvs08tN4UdWTSzq7Gi806i0fjNW22miFrRc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729857917; x=1730462717; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=e8yKR4BVLvMBogTBQ5uhZAmMCQQBIAWiGqlkb0ku774=; b=DS6KECMhHwqN0yYREM7zON/YiSheKa7t6BJ6KZRlnT0SaxRB+2pwwjWijqywFJhoDi XTvnxICU4LRU6Ibps51oydXe1jiB9Yd8y5+IYXtQvCgJZ9hsb1+P6qP3mDicJst1HTn3 GBlJQLhioVUyZST1OpO+CxRzwDW/pCmsHNdFcM5ETgyoChVNTS3BKbQtOhE6+xOBwZC5 diYuHwFaEEeIpDZld6GO/QqGRgfXEYlteivcQCle50hA2YGyvGTR/McTXS77V3ktTxEr xBsNk7W3fSd3QoQo7kpxtrZbO1k802+elMjlhfeFXABEtOAnmxk6Rzn0y+7YXarDXIv6 kpZw== X-Forwarded-Encrypted: i=1; AJvYcCVSmRREdsEcjfXNkrE6vO4mNmbpjsTBjaCLe6Wqc1lgs/5YuQR2iPB9Xqw5T7lX25Dzz7W396VTT2J79wOASNgP@lists.infradead.org X-Gm-Message-State: AOJu0YzOslVp2mu/TwgDU/uCi/88FvfRob0HSzlZqYkR7ojNQmNQp1RH 0e3o/qv8scdR49kxOC/NPItS12Qk2T8S0SKBJ7LKFZ3hSRYJuWXwTXbq4jIDVg== X-Google-Smtp-Source: AGHT+IFgd+gptg43VdhIDSdk7mGqoF3jpDKUK7U7sWb9MrqLl4Aed6DcyNuNHfI9LnX+jfuduFQLJA== X-Received: by 2002:a17:903:2341:b0:20c:62e1:6361 with SMTP id d9443c01a7336-20fa9e77fd7mr131727475ad.25.1729857916917; Fri, 25 Oct 2024 05:05:16 -0700 (PDT) Received: from yuanhsinte.c.googlers.com (176.220.194.35.bc.googleusercontent.com. [35.194.220.176]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-210bc02eb3fsm8309495ad.202.2024.10.25.05.05.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Oct 2024 05:05:16 -0700 (PDT) From: Hsin-Te Yuan Date: Fri, 25 Oct 2024 12:05:12 +0000 Subject: [PATCH v14] thermal/drivers/mediatek/auxadc_thermal: expose all thermal sensors MIME-Version: 1.0 Message-Id: <20241025-auxadc_thermal-v14-1-96ab5b60c02e@chromium.org> X-B4-Tracking: v=1; b=H4sIAHeJG2cC/3XP0W7CMAwF0F+p8kxQHKdZyxP/gdCUug6NtLYoh apT1X8nRdMEgz3a1j1XnsXAMfAgdtksIo9hCH2XBjCbTFDjuhPLUKeF0EobVahSuuvkavq8NBx b9yXLihELpqICEil0juzDdBcPxzQ3Ybj08fteMAKs63+tdJcgnUdL9GE8OtxTE/s2XNttH09i9 UbQvwYoBa+GToauCkuqNN4b+2xssp8o2PdRUgaRS2/B+Xf1+FCv81cD1xdyjUC5romqP8ayLDc EV8lqdQEAAA== X-Change-ID: 20240809-auxadc_thermal-9be338ec8b1c To: "Rafael J. Wysocki" , Daniel Lezcano , Zhang Rui , Lukasz Luba , Matthias Brugger , AngeloGioacchino Del Regno Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, James Lo , Michael Kao , Hsin-Yi Wang , Ben Tseng , Hsin-Te Yuan X-Mailer: b4 0.15-dev-7be4f X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241025_130522_873373_D7E66122 X-CRM114-Status: GOOD ( 25.45 ) X-BeenThere: linux-arm-kernel@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-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: James Lo Previously, the driver only supported reading the temperature from all sensors and returning the maximum value. This update adds another get_temp ops to support reading the temperature from each sensor separately. Especially, some thermal zones registered by this patch are needed by MT8183 since those thermal zones are necessary for mtk-svs driver. Signed-off-by: Michael Kao Signed-off-by: Hsin-Yi Wang Signed-off-by: Ben Tseng Signed-off-by: James Lo Reviewed-by: AngeloGioacchino Del Regno Signed-off-by: Hsin-Te Yuan Reviewed-by: Chen-Yu Tsai --- Changes in v14: - Remove redundant error message. - Link to v13: https://lore.kernel.org/r/20241025-auxadc_thermal-v13-1-a5231c52dccb@chromium.org Changes in v13: - Make subject and commit message more clear. - Make error message more clear. - Link to v12: https://lore.kernel.org/r/20241016-auxadc_thermal-v12-1-c0433e9f61af@chromium.org Changes in v12: - Remove unnecessary check and unused variable assignment in mtk_read_sensor_temp. - Add more about what this patch achieves in the commit message. - Link to v11: https://lore.kernel.org/r/20240809-auxadc_thermal-v11-1-af36cc74f3a3@chromium.org Changes in V11: - Rebase on kernel v6.11-rc2 - Use mtk_thermal_temp_is_valid in mtk_read_sensor_temp just like mtk_thermal_bank_temperature - Change the error handling of devm_thermal_of_zone_register return value - link to V10: https://lore.kernel.org/lkml/20220519101044.16765-1-james.lo@mediatek.com/ Changes in V10: - Rebase to kernel-v5.18-rc7 - Resend Changes in V9: - Rebase to kernel-v5.14-rc1 - Bind raw_to_mcelsius_v1 or raw_to_mcelsius_v2 to compatible data of struct mtk_thermal_data - Remove duplicate struct 'mtk_thermal_bank' - Remove unnecessary if condition check - Return error if any thermal zone fail to register Changes in V8: - Rebase to kernel-v5.13-rc1 - Resend Changes in v7: - Fix build error in v6. Changes in v6: - Rebase to kernel-5.11-rc1. - [1/3] - add interrupts property. - [2/3] - add the Tested-by in the commit message. - [3/3] - use the mt->conf->msr[id] instead of conf->msr[id] in the _get_sensor_temp and mtk_thermal_bank_temperature. - remove the redundant space in _get_sensor_temp and mtk_read_sensor_temp. - change kmalloc to dev_kmalloc in mtk_thermal_probe. Changes in v5: - Rebase to kernel-5.9-rc1. - Revise the title of cover letter. - Drop "[v4,7/7] thermal: mediatek: use spinlock to protect PTPCORESEL" - [2/2] - Add the judgement to the version of raw_to_mcelsius. Changes in v4: - Rebase to kernel-5.6-rc1. - [1/7] - Squash thermal zone settings in the dtsi from [v3,5/8] arm64: dts: mt8183: Increase polling frequency for CPU thermal zone. - Remove the property of interrupts and mediatek,hw-reset-temp. - [2/7] - Correct commit message. - [4/7] - Change the target temperature to the 80C and change the commit message. - [6/7] - Adjust newline alignment. - Fix the judgement on the return value of registering thermal zone. Changes in v3: - Rebase to kernel-5.5-rc1. - [1/8] - Update sustainable power of cpu, tzts1~5 and tztsABB. - [7/8] - Bypass the failure that non cpu_thermal sensor is not find in thermal-zones in dts, which is normal for mt8173, so prompt a warning here instead of failing. 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) Changes in v2: - [1/8] - Add the sustainable-power,trips,cooling-maps to the tzts1~tztsABB. - [4/8] - Add the min opp of cpu throttle. --- --- drivers/thermal/mediatek/auxadc_thermal.c | 70 +++++++++++++++++++++++++++---- 1 file changed, 62 insertions(+), 8 deletions(-) --- base-commit: b589839414be04b2b37e4bf6f84af576c99faf64 change-id: 20240809-auxadc_thermal-9be338ec8b1c Best regards, diff --git a/drivers/thermal/mediatek/auxadc_thermal.c b/drivers/thermal/mediatek/auxadc_thermal.c index 9ee2e7283435acfcbb1a956303b6122a08affecc..9a9079d559a3abe9e3823f744d4c9a159a8666bd 100644 --- a/drivers/thermal/mediatek/auxadc_thermal.c +++ b/drivers/thermal/mediatek/auxadc_thermal.c @@ -847,7 +847,8 @@ static int mtk_thermal_bank_temperature(struct mtk_thermal_bank *bank) static int mtk_read_temp(struct thermal_zone_device *tz, int *temperature) { - struct mtk_thermal *mt = thermal_zone_device_priv(tz); + struct mtk_thermal_bank *bank = thermal_zone_device_priv(tz); + struct mtk_thermal *mt = bank->mt; int i; int tempmax = INT_MIN; @@ -866,10 +867,41 @@ static int mtk_read_temp(struct thermal_zone_device *tz, int *temperature) return 0; } +static int mtk_read_sensor_temp(struct thermal_zone_device *tz, int *temperature) +{ + struct mtk_thermal_bank *bank = thermal_zone_device_priv(tz); + struct mtk_thermal *mt = bank->mt; + const struct mtk_thermal_data *conf = mt->conf; + int id = bank->id - 1; + int temp = INT_MIN; + u32 raw; + + 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 (unlikely(!mtk_thermal_temp_is_valid(temp))) + return -EAGAIN; + + *temperature = temp; + + 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) @@ -1199,6 +1231,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_bank *tz; mt = devm_kzalloc(&pdev->dev, sizeof(*mt), GFP_KERNEL); if (!mt) @@ -1285,14 +1318,35 @@ static int mtk_thermal_probe(struct platform_device *pdev) mtk_thermal_init_bank(mt, i, apmixed_phys_base, auxadc_phys_base, ctrl_id); - tzdev = devm_thermal_of_zone_register(&pdev->dev, 0, mt, - &mtk_thermal_ops); - if (IS_ERR(tzdev)) - return PTR_ERR(tzdev); + for (i = 0; i <= mt->conf->num_sensors; 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)) { + ret = PTR_ERR(tzdev); + if (ret == -ENODEV) { + dev_warn(&pdev->dev, + "Can't find thermal zone for sensor %d; sensor skipped.\n", i); + continue; + } + return dev_err_probe(&pdev->dev, ret, + "Failed to register thermal zone %d.\n", i); + } - ret = devm_thermal_add_hwmon_sysfs(&pdev->dev, tzdev); - if (ret) - dev_warn(&pdev->dev, "error in thermal_add_hwmon_sysfs"); + ret = devm_thermal_add_hwmon_sysfs(&pdev->dev, tzdev); + if (ret) + dev_warn(&pdev->dev, + "Sensor %d: Error in thermal_add_hwmon_sysfs: %d\n", i, ret); + } return 0; }