From patchwork Tue Oct 1 11:16:14 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: 832191 Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 405D119DFA3 for ; Tue, 1 Oct 2024 11:16:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727781381; cv=none; b=uCeb9wuJv+BaGrdcL1yD0dlynRi53a1I49Lu7XlRImBmX8ZFRFDl5hXhcJ7xjEyu4FXDT/owhXtrVWiILji5CbkLTh7+0WpE2EgsfUxA49I/5Mb0LAvdBD/nnxqvzQJa1KifIyhkZ41y98lhWBNpCmNkyIDeb9OxAblga/yrtoA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727781381; c=relaxed/simple; bh=1qivdgPzhiPmx8coSkwgmE5FSvW0jIi1boUu/nZ5AZ8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=WzQYntRVnFqUVYt5g6kPKkpc7ZQFPHkBHKuioT6xU6JCmN+8VT17GFHj1PHy19cUVUWehizE6B9EwSqd3qoOj3vknmmGgORnOml3D0aZvEB3JfwZ5/KKeeXBtioLWdeWEAx601P2tjFKTzjmHO2PC9+Q0RgsW1BUdqm7Cp6pk6w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=SNZzOWWI; arc=none smtp.client-ip=209.85.215.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="SNZzOWWI" Received: by mail-pg1-f180.google.com with SMTP id 41be03b00d2f7-7c6b4222fe3so3575866a12.3 for ; Tue, 01 Oct 2024 04:16:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1727781379; x=1728386179; darn=vger.kernel.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=cwJJmP/ZXKEl//vPqzZxNk4JrFy3Wy0nARrCJ7oJJlA=; b=SNZzOWWI3AIZPhR0NAfuMgIH/5AIIa9dxJ4ntIozou8KTF+J7ftlK0LZxivwooSITE ZOhmkEKKNy3q7UkVLhB1YHciOoj51clCu+Vytu5ANfSoIFEl51dERGt7lIQFZnNsrOvr OnN5P964gYIZ+LGjMPze0CiW/cxy3sZjrNxro= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727781379; x=1728386179; 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=cwJJmP/ZXKEl//vPqzZxNk4JrFy3Wy0nARrCJ7oJJlA=; b=hE8in3LgeJWrQtobAJn04ue3O6fFN6tUK9AgTY5p7KxtqUMCG22ha0UypiOpIzIGj/ 3EZppFMlU4s36SckAqQHh3EmmDKaRtelxiq2SX/1GvlTdQgensOdgQ4l1ZUyQpDsF/GV Y75DDqCWXqjizatwqdszPhtvMYtVT6E6kF+ABOZavQS7locwsiqqN5+UC3GAeYK4ac1n IE3RfBjYBA1+nTXOdR2AtHKe1gkNKexQipmFrwkDSxPgfWzcz8eKIf236NBysmOcln/+ dOii4zUB9BGg6tQ4xhBe9ChhYCZ64cwNnHYiGJt2+VwY6r+LPKN8P/AHYSvvw7zGviYO Qh6w== X-Gm-Message-State: AOJu0YyUEMYe365hIn512oUSwF44af3ntRk3pm1E4N+nw2Z85176+Xhc XuzK5DeEB0qdRDBkDr6xxR6RfVMlqVd+gPwDIhqVVxCMeGUMmMq+FwN3mRfcig== X-Google-Smtp-Source: AGHT+IEj4ZMqDKKRjp4KmzOCFn648FwdwFoBSsaDdMBfRT2/mcBhVeT/PceYv28mjxgjFSwQp8iGQA== X-Received: by 2002:a05:6a20:2d06:b0:1cf:2aaa:9199 with SMTP id adf61e73a8af0-1d4fa69ed3dmr21046877637.15.1727781379378; Tue, 01 Oct 2024 04:16:19 -0700 (PDT) Received: from yuanhsinte.c.googlers.com (35.198.80.34.bc.googleusercontent.com. [34.80.198.35]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71b264bb648sm7775829b3a.73.2024.10.01.04.16.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Oct 2024 04:16:19 -0700 (PDT) From: Hsin-Te Yuan Date: Tue, 01 Oct 2024 11:16:14 +0000 Subject: [PATCH v12] thermal/drivers/mediatek: add another get_temp ops for thermal sensors Precedence: bulk X-Mailing-List: linux-pm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241001-auxadc_thermal-v12-1-2b86c094ff46@chromium.org> X-B4-Tracking: v=1; b=H4sIAP3Z+2YC/3WNwQ6CMBBEf4Xs2RpKiYIn/8MQU5aFbiLUbIFgS P/dyt3jvMm82SGQMAW4ZTsIrRzYTyno4pQBOjsNpLhLAIq8KPMqr5VdNtvhc3Yko32puiVjKsK q1Qhp9BbqeTuMjyZlx2H28jkOVq1/+K8r9Uor25sL4rXsjTV3dOJHXsazlwGaGOMXw8i9v7IAA AA= 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 From: James Lo Previously, the driver only supported reading the temperature from all sensors and returning the maximum value. This updatea adds another get_temp ops to support reading the temperature from each sensor separately. This feature provides the ability to read all thermal sensor values in the SoC through the node /sys/class/thermal. 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 --- 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..10938be2e5545fba2fff7d5cc5a0269d42e5d44d 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 sensor %d\n", i); + continue; + } + dev_err(&pdev->dev, + "Error: Failed to register thermal zone %d, ret = %d\n", + i, ret); + return ret; + } - 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, "error in thermal_add_hwmon_sysfs: %d\n", ret); + } return 0; }