From nobody Sun Oct 5 12:52:24 2025 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E62572522BE; Mon, 4 Aug 2025 13:32:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754314361; cv=none; b=J1AUxfCkfD+RDMJKl2izUPXNgqg083A3R2ZMr84iihGE+uVVQuabaJtlJfWmI9bSAnaoFuIA1tWHbzDmYgFsQhEgKQO2XQk9lxBXyxwohSg/I62Ihn6cxkJSA3BoMLpNXae6FOXnvZrAJeg9jnjFgOMBfyC/zJhUFJwCFnHEj5E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754314361; c=relaxed/simple; bh=XAybBYmR7h7F7zb2Ub4Edx4t+muG85usYjalyXOHf+o=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=X/3yZga0vteRmZfb4IB9dirlH09+fPXCCI62jhY4bwdvDbjOCv+/aRKXudLp8GosDL7/BVZ9cQLRDktcxXDJWXuB3QUZ99MdVT5dhElVBECOy7ukv5h9R09TV1f0meTS/sflXkT/dCoojBXH2gap7wtcfYNYk+fSOw0O61C2r7s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=OoTahuH0; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="OoTahuH0" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1754314358; bh=XAybBYmR7h7F7zb2Ub4Edx4t+muG85usYjalyXOHf+o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OoTahuH0JEl3wrl5TdIRRbH0I68D4omapVMTyXrVMtO4Aa6Ta2ZYXThg5h5E34JwV Qj7+FdjKC8JWuaRJLUCtJJxy6RJ/jy0Kv2Y25YJdHJEC/JauG5e2DEzWYTvLm30Jvh EpNRn+GSN7Aiuv6Rc5ZdTDOlbZzggbyfKL/xZGFHytzdO+7jNHQwvbqm4n4NAahW5q gdfQ1MJZ2rvMmULlI2/Fw2XPqs3qXSzxnHBGZaHzYPxlo33aJ9yYID9RR1Us2jUGO4 6MLchZptUIUTPhtd1plIXwPmSHYfDFtOTBaMui2jCRTZvmARqc5fO/UWS0GIm3aIQn tsv2pPNgISJaA== Received: from laura.lan (unknown [IPv6:2001:b07:646b:e2:865e:547d:4830:837d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: laura.nao) by bali.collaboradmins.com (Postfix) with ESMTPSA id B6CCC17E01F5; Mon, 4 Aug 2025 15:32:36 +0200 (CEST) From: Laura Nao To: srini@kernel.org, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, rafael@kernel.org, daniel.lezcano@linaro.org, rui.zhang@intel.com, lukasz.luba@arm.com, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com Cc: nfraprado@collabora.com, arnd@arndb.de, colin.i.king@gmail.com, u.kleine-koenig@baylibre.com, andrew-ct.chen@mediatek.com, lala.lin@mediatek.com, bchihi@baylibre.com, frank-w@public-files.de, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, kernel@collabora.com, Laura Nao , Krzysztof Kozlowski Subject: [PATCH v3 1/9] dt-bindings: thermal: mediatek: Add LVTS thermal controller support for MT8196 Date: Mon, 4 Aug 2025 15:30:27 +0200 Message-Id: <20250804133035.309990-2-laura.nao@collabora.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250804133035.309990-1-laura.nao@collabora.com> References: <20250804133035.309990-1-laura.nao@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add LVTS thermal controller binding for MediaTek MT8196. Acked-by: Krzysztof Kozlowski Reviewed-by: AngeloGioacchino Del Regno Signed-off-by: Laura Nao Tested-by: AngeloGioacchino Del Regno =20 --- .../thermal/mediatek,lvts-thermal.yaml | 2 ++ .../thermal/mediatek,lvts-thermal.h | 26 +++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/Documentation/devicetree/bindings/thermal/mediatek,lvts-therma= l.yaml b/Documentation/devicetree/bindings/thermal/mediatek,lvts-thermal.ya= ml index 0259cd3ce9c5..beccdabe110b 100644 --- a/Documentation/devicetree/bindings/thermal/mediatek,lvts-thermal.yaml +++ b/Documentation/devicetree/bindings/thermal/mediatek,lvts-thermal.yaml @@ -26,6 +26,8 @@ properties: - mediatek,mt8192-lvts-mcu - mediatek,mt8195-lvts-ap - mediatek,mt8195-lvts-mcu + - mediatek,mt8196-lvts-ap + - mediatek,mt8196-lvts-mcu =20 reg: maxItems: 1 diff --git a/include/dt-bindings/thermal/mediatek,lvts-thermal.h b/include/= dt-bindings/thermal/mediatek,lvts-thermal.h index ddc7302a510a..0ec8ad184d47 100644 --- a/include/dt-bindings/thermal/mediatek,lvts-thermal.h +++ b/include/dt-bindings/thermal/mediatek,lvts-thermal.h @@ -80,4 +80,30 @@ #define MT8192_AP_MD1 15 #define MT8192_AP_MD2 16 =20 +#define MT8196_MCU_MEDIUM_CPU6_0 0 +#define MT8196_MCU_MEDIUM_CPU6_1 1 +#define MT8196_MCU_DSU2 2 +#define MT8196_MCU_DSU3 3 +#define MT8196_MCU_LITTLE_CPU3 4 +#define MT8196_MCU_LITTLE_CPU0 5 +#define MT8196_MCU_LITTLE_CPU1 6 +#define MT8196_MCU_LITTLE_CPU2 7 +#define MT8196_MCU_MEDIUM_CPU4_0 8 +#define MT8196_MCU_MEDIUM_CPU4_1 9 +#define MT8196_MCU_MEDIUM_CPU5_0 10 +#define MT8196_MCU_MEDIUM_CPU5_1 11 +#define MT8196_MCU_DSU0 12 +#define MT8196_MCU_DSU1 13 +#define MT8196_MCU_BIG_CPU7_0 14 +#define MT8196_MCU_BIG_CPU7_1 15 + +#define MT8196_AP_TOP0 0 +#define MT8196_AP_TOP1 1 +#define MT8196_AP_TOP2 2 +#define MT8196_AP_TOP3 3 +#define MT8196_AP_BOT0 4 +#define MT8196_AP_BOT1 5 +#define MT8196_AP_BOT2 6 +#define MT8196_AP_BOT3 7 + #endif /* __MEDIATEK_LVTS_DT_H */ --=20 2.39.5 From nobody Sun Oct 5 12:52:24 2025 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 74DD126B777; Mon, 4 Aug 2025 13:32:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754314363; cv=none; b=a0vu3/RCDWetWdyWyEHWZU3mVi5+9OsmvmCFNy4xIpnZJtUBn1jSAVHWZm3MSj45Mvi5mIThjwrguIk4B1lpVDEmMN7RW7busXckGY0OCKB+ZzGzX0CA/J4f6ocG4dpxpYegeN+D/Hva/k6F2CIG9zgxDuDeJWSxnIWmX/VqaUM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754314363; c=relaxed/simple; bh=sBFrFN/0Q4PTxo3EyInJXxrpUZe3NhXyKNGlvNQwUTE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=LUgCAZEdGLalojHrA2ErztksiPzid2PQxEEoe08gj7cJhR6476W7QcdD2Z1/9Qu4jeWdxSVXKnSratrmtV3YdINFaiCjgm8Y6z78woMKdTnNGoBzmHGTgBdWnn/QTLWJV647HNc/kta7TV6kJe1a6AUtA1zdI9mBhyvrmT/CHbg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=NdBQfrrv; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="NdBQfrrv" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1754314359; bh=sBFrFN/0Q4PTxo3EyInJXxrpUZe3NhXyKNGlvNQwUTE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NdBQfrrvAZ8haD6I6RQIdM9hNdbDv9108g4AZ5di1amYZzOBaI4H3jtllUrbCGOJW RnltuFnchdQQIu8UkEQ7oYgk1FwXXXXNgZCSr8ueqWN3atkBOXt0Bh06Q7OH01lvyB d7CVAYv/MbWfptjjbkzOBfpyAi7kcMwkDfUjjqk7zNxS6r8CBGK+0jFsjX2UIm07sR v4wFWCgJ5OC+/IW1dApNRjM63rV9JxNTluMImQPPewPBcbR7YwRY8Rb3fMD3JvCLKj jzZMzZscJRUn1ksNJjoxJJf0syj8SaGeipJdxxhEppj4/7hG7Q/QWCA59WTcVr6sDs fLWPSF/Bv8VaA== Received: from laura.lan (unknown [IPv6:2001:b07:646b:e2:865e:547d:4830:837d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: laura.nao) by bali.collaboradmins.com (Postfix) with ESMTPSA id 5920F17E0662; Mon, 4 Aug 2025 15:32:38 +0200 (CEST) From: Laura Nao To: srini@kernel.org, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, rafael@kernel.org, daniel.lezcano@linaro.org, rui.zhang@intel.com, lukasz.luba@arm.com, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com Cc: nfraprado@collabora.com, arnd@arndb.de, colin.i.king@gmail.com, u.kleine-koenig@baylibre.com, andrew-ct.chen@mediatek.com, lala.lin@mediatek.com, bchihi@baylibre.com, frank-w@public-files.de, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, kernel@collabora.com, Laura Nao , Fei Shao Subject: [PATCH v3 2/9] thermal/drivers/mediatek/lvts: Make number of calibration offsets configurable Date: Mon, 4 Aug 2025 15:30:28 +0200 Message-Id: <20250804133035.309990-3-laura.nao@collabora.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250804133035.309990-1-laura.nao@collabora.com> References: <20250804133035.309990-1-laura.nao@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" MT8196/MT6991 use 2-byte eFuse calibration data, whereas other SoCs supported by the driver rely on 3 bytes. Make the number of calibration bytes per sensor configurable, enabling support for SoCs with varying calibration formats. Reviewed-by: Fei Shao Reviewed-by: AngeloGioacchino Del Regno Signed-off-by: Laura Nao Tested-by: AngeloGioacchino Del Regno =20 --- drivers/thermal/mediatek/lvts_thermal.c | 32 +++++++++++++++++-------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/drivers/thermal/mediatek/lvts_thermal.c b/drivers/thermal/medi= atek/lvts_thermal.c index f4d1e66d7db9..05aa8895ccce 100644 --- a/drivers/thermal/mediatek/lvts_thermal.c +++ b/drivers/thermal/mediatek/lvts_thermal.c @@ -96,12 +96,14 @@ =20 #define LVTS_MINIMUM_THRESHOLD 20000 =20 +#define LVTS_MAX_CAL_OFFSETS 3 + static int golden_temp =3D LVTS_GOLDEN_TEMP_DEFAULT; static int golden_temp_offset; =20 struct lvts_sensor_data { int dt_id; - u8 cal_offsets[3]; + u8 cal_offsets[LVTS_MAX_CAL_OFFSETS]; }; =20 struct lvts_ctrl_data { @@ -127,6 +129,7 @@ struct lvts_data { const struct lvts_ctrl_data *lvts_ctrl; const u32 *conn_cmd; const u32 *init_cmd; + int num_cal_offsets; int num_lvts_ctrl; int num_conn_cmd; int num_init_cmd; @@ -711,7 +714,7 @@ static int lvts_calibration_init(struct device *dev, st= ruct lvts_ctrl *lvts_ctrl u8 *efuse_calibration, size_t calib_len) { - int i; + int i, j; u32 gt; =20 /* A zero value for gt means that device has invalid efuse data */ @@ -720,17 +723,18 @@ static int lvts_calibration_init(struct device *dev, = struct lvts_ctrl *lvts_ctrl lvts_for_each_valid_sensor(i, lvts_ctrl_data) { const struct lvts_sensor_data *sensor =3D &lvts_ctrl_data->lvts_sensor[i]; + u32 calib =3D 0; =20 - if (sensor->cal_offsets[0] >=3D calib_len || - sensor->cal_offsets[1] >=3D calib_len || - sensor->cal_offsets[2] >=3D calib_len) - return -EINVAL; + for (j =3D 0; j < lvts_ctrl->lvts_data->num_cal_offsets; j++) { + u8 offset =3D sensor->cal_offsets[j]; + + if (offset >=3D calib_len) + return -EINVAL; + calib |=3D efuse_calibration[offset] << (8 * j); + } =20 if (gt) { - lvts_ctrl->calibration[i] =3D - (efuse_calibration[sensor->cal_offsets[0]] << 0) + - (efuse_calibration[sensor->cal_offsets[1]] << 8) + - (efuse_calibration[sensor->cal_offsets[2]] << 16); + lvts_ctrl->calibration[i] =3D calib; } else if (lvts_ctrl->lvts_data->def_calibration) { lvts_ctrl->calibration[i] =3D lvts_ctrl->lvts_data->def_calibration; } else { @@ -1763,6 +1767,7 @@ static const struct lvts_data mt7988_lvts_ap_data =3D= { .temp_factor =3D LVTS_COEFF_A_MT7988, .temp_offset =3D LVTS_COEFF_B_MT7988, .gt_calib_bit_offset =3D 24, + .num_cal_offsets =3D 3, }; =20 static const struct lvts_data mt8186_lvts_data =3D { @@ -1776,6 +1781,7 @@ static const struct lvts_data mt8186_lvts_data =3D { .temp_offset =3D LVTS_COEFF_B_MT7988, .gt_calib_bit_offset =3D 24, .def_calibration =3D 19000, + .num_cal_offsets =3D 3, }; =20 static const struct lvts_data mt8188_lvts_mcu_data =3D { @@ -1789,6 +1795,7 @@ static const struct lvts_data mt8188_lvts_mcu_data = =3D { .temp_offset =3D LVTS_COEFF_B_MT8195, .gt_calib_bit_offset =3D 20, .def_calibration =3D 35000, + .num_cal_offsets =3D 3, }; =20 static const struct lvts_data mt8188_lvts_ap_data =3D { @@ -1802,6 +1809,7 @@ static const struct lvts_data mt8188_lvts_ap_data =3D= { .temp_offset =3D LVTS_COEFF_B_MT8195, .gt_calib_bit_offset =3D 20, .def_calibration =3D 35000, + .num_cal_offsets =3D 3, }; =20 static const struct lvts_data mt8192_lvts_mcu_data =3D { @@ -1815,6 +1823,7 @@ static const struct lvts_data mt8192_lvts_mcu_data = =3D { .temp_offset =3D LVTS_COEFF_B_MT8195, .gt_calib_bit_offset =3D 24, .def_calibration =3D 35000, + .num_cal_offsets =3D 3, }; =20 static const struct lvts_data mt8192_lvts_ap_data =3D { @@ -1828,6 +1837,7 @@ static const struct lvts_data mt8192_lvts_ap_data =3D= { .temp_offset =3D LVTS_COEFF_B_MT8195, .gt_calib_bit_offset =3D 24, .def_calibration =3D 35000, + .num_cal_offsets =3D 3, }; =20 static const struct lvts_data mt8195_lvts_mcu_data =3D { @@ -1841,6 +1851,7 @@ static const struct lvts_data mt8195_lvts_mcu_data = =3D { .temp_offset =3D LVTS_COEFF_B_MT8195, .gt_calib_bit_offset =3D 24, .def_calibration =3D 35000, + .num_cal_offsets =3D 3, }; =20 static const struct lvts_data mt8195_lvts_ap_data =3D { @@ -1854,6 +1865,7 @@ static const struct lvts_data mt8195_lvts_ap_data =3D= { .temp_offset =3D LVTS_COEFF_B_MT8195, .gt_calib_bit_offset =3D 24, .def_calibration =3D 35000, + .num_cal_offsets =3D 3, }; =20 static const struct of_device_id lvts_of_match[] =3D { --=20 2.39.5 From nobody Sun Oct 5 12:52:24 2025 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0D3EA26CE2D; Mon, 4 Aug 2025 13:32:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754314364; cv=none; b=uNtqSIiLUSHtaOHLkc29GNrZGWNNp6noIhi0bFKNvDf/NJrhUHOIaiNnKTetvdDI0GtY72YGucv07ZSRxg9w9OHDyzo4lhpG0sSg/xf/byBi6j6wZaT1cV4kjFMDIRVsbCMAzLtHBLqNNSiWH5Ey3WHZc5LU7VwZBOHVM04MW0w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754314364; c=relaxed/simple; bh=odWRAl94AI131ZH9bWkD5WdWUHexg4q4fcoXkXOB/Gg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=e4lvTzgk5c40Ja0H60vzrC8HvwDc6m3NTz9YJ8Rx4sK79db6YJmJJ6LahW7Ump7uU0E2AoGFPHeG5xxFQz1FM2+h2G7igUQvXuTX6Sv083fq8wPtSUN5jvHIC+VDXB5zPUNRtN6lAU5NhvKhOkgvCaBoQrm3GTCd5pPKNP4Ro+o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=ndgqcUqV; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="ndgqcUqV" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1754314361; bh=odWRAl94AI131ZH9bWkD5WdWUHexg4q4fcoXkXOB/Gg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ndgqcUqVYcbUD2NXFPt0fYbaY2jrSG3jw6FJeKR22KyZkaHqUiPIPyOBmxhxVbNFI a9m3XKnyXFfMcBs0ON06R47cn7fpGzyLUCSxH2qi+hwWR/LPJMrNz3TZkS5GNNqScc 2ApT0K37PeP1DwbRlXA95qDgUeXu88IFAExhwIdMsXn7HtHzye3vPHtxEQOtkNbSWY TrmoGjUKJxXxx3HRwhZfjLrqXoxWOnwnhpabMKX3lHWNd7gtF9SVowqGCl/jBKj56a 5SHvLLsTK706WyjOwWV9NwCxoGboMvEm5MGcRD9/cG2Z0utmLOcLCU+werVpqifoAY x9iVRcrMoAeCQ== Received: from laura.lan (unknown [IPv6:2001:b07:646b:e2:865e:547d:4830:837d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: laura.nao) by bali.collaboradmins.com (Postfix) with ESMTPSA id 07F5417E0F3C; Mon, 4 Aug 2025 15:32:39 +0200 (CEST) From: Laura Nao To: srini@kernel.org, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, rafael@kernel.org, daniel.lezcano@linaro.org, rui.zhang@intel.com, lukasz.luba@arm.com, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com Cc: nfraprado@collabora.com, arnd@arndb.de, colin.i.king@gmail.com, u.kleine-koenig@baylibre.com, andrew-ct.chen@mediatek.com, lala.lin@mediatek.com, bchihi@baylibre.com, frank-w@public-files.de, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, kernel@collabora.com, Laura Nao , Chen-Yu Tsai , Fei Shao Subject: [PATCH v3 3/9] thermal/drivers/mediatek/lvts: Guard against zero temp_factor in lvts_raw_to_temp Date: Mon, 4 Aug 2025 15:30:29 +0200 Message-Id: <20250804133035.309990-4-laura.nao@collabora.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250804133035.309990-1-laura.nao@collabora.com> References: <20250804133035.309990-1-laura.nao@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add a guard against zero temp_factor in lvts_raw_to_temp() to prevent division by zero and ensure safe conversion. Fixes: 6725a29321e4 ("thermal/drivers/mediatek/lvts_thermal: Make coeff con= figurable") Reviewed-by: Chen-Yu Tsai Reviewed-by: Fei Shao Reviewed-by: AngeloGioacchino Del Regno Signed-off-by: Laura Nao Tested-by: AngeloGioacchino Del Regno =20 --- drivers/thermal/mediatek/lvts_thermal.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/thermal/mediatek/lvts_thermal.c b/drivers/thermal/medi= atek/lvts_thermal.c index 05aa8895ccce..8398af657ba2 100644 --- a/drivers/thermal/mediatek/lvts_thermal.c +++ b/drivers/thermal/mediatek/lvts_thermal.c @@ -284,11 +284,14 @@ static int lvts_raw_to_temp(u32 raw_temp, int temp_fa= ctor) =20 static u32 lvts_temp_to_raw(int temperature, int temp_factor) { - u32 raw_temp =3D ((s64)(golden_temp_offset - temperature)) << 14; + u32 raw_temp; =20 - raw_temp =3D div_s64(raw_temp, -temp_factor); + if (temp_factor =3D=3D 0) + return temperature; =20 - return raw_temp; + raw_temp =3D ((s64)(golden_temp_offset - temperature)) << 14; + + return div_s64(raw_temp, -temp_factor); } =20 static int lvts_get_temp(struct thermal_zone_device *tz, int *temp) @@ -1346,6 +1349,9 @@ static int lvts_probe(struct platform_device *pdev) if (irq < 0) return irq; =20 + if (!lvts_data->temp_factor) + dev_warn(dev, "temp_factor should never be zero; check platform data.\n"= ); + golden_temp_offset =3D lvts_data->temp_offset; =20 ret =3D lvts_domain_init(dev, lvts_td, lvts_data); --=20 2.39.5 From nobody Sun Oct 5 12:52:24 2025 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B7B3326FA56; Mon, 4 Aug 2025 13:32:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754314367; cv=none; b=DoAq5GdkKoWZPuMR9FOsX/dppe5NMA8qMvNZsR7iJRLjh5YZF3JMh7eh/EFt0EN9/BLR6Koot1ahp0zRQL8YmDjuTKGSXcNShAcTJl5CnjfrDsptEajAGaZqu8UKbSCo7irXPe5C4SljlBbCFla53mq7vIPe0FVGn0NjaNWM4A4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754314367; c=relaxed/simple; bh=m/48SHb+sDgnCPz39BvxsQGwb3qepM8dH2EhkYdEQ/4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=C6gbGalcl13fIl52wiKL9o3Fo5ltlrzQe9fogMw+/nGYRZ09KSaHkfYrCRKlgEKMRb+RLlsjVet1Hko9R/iXHNJjsffF6u9ZHFbh6zN0vQxB3FYOHNNqHp4wzdPe+F8fXL+g3U2UzV4ZgmrNObU/5NhqaxmEckxQkU5gfNEPJdI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=qMyECc5n; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="qMyECc5n" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1754314363; bh=m/48SHb+sDgnCPz39BvxsQGwb3qepM8dH2EhkYdEQ/4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qMyECc5nfIKEzSfqerCeK5QCJS7dXE6GL6kHgX8mC2W6DgUqdsGLdwv6qpuZ2yiBE kJ5v3qCExt617uWGl8EycuhwYqg4hweUYIauJ4+8ZSOCqebiryxhjzck/TTlCR3QPt uPJ2C1OTuvuzMoW3hdRe6HLUt2w0TJFEYk2hUrtWHJHJaDBxG8vQmOYODXa5jLrcJX 66qxkwW3vyDv8K5cx9asMz/ih0p+PXJn6304nX2f0j4wcc4K3B8u2rEIEG1FRs1yZD tb5fWGVkxbTJbFZf9LMR/Ys43W9XGFI8AOzgAi2EaWbNb0AsPPk8qzg1oqXVgpIbVJ MtJeWFWsVdZKA== Received: from laura.lan (unknown [IPv6:2001:b07:646b:e2:865e:547d:4830:837d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: laura.nao) by bali.collaboradmins.com (Postfix) with ESMTPSA id AABF517E0202; Mon, 4 Aug 2025 15:32:41 +0200 (CEST) From: Laura Nao To: srini@kernel.org, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, rafael@kernel.org, daniel.lezcano@linaro.org, rui.zhang@intel.com, lukasz.luba@arm.com, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com Cc: nfraprado@collabora.com, arnd@arndb.de, colin.i.king@gmail.com, u.kleine-koenig@baylibre.com, andrew-ct.chen@mediatek.com, lala.lin@mediatek.com, bchihi@baylibre.com, frank-w@public-files.de, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, kernel@collabora.com, Laura Nao , Fei Shao Subject: [PATCH v3 4/9] thermal: mediatek: lvts: Add platform ops to support alternative conversion logic Date: Mon, 4 Aug 2025 15:30:30 +0200 Message-Id: <20250804133035.309990-5-laura.nao@collabora.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250804133035.309990-1-laura.nao@collabora.com> References: <20250804133035.309990-1-laura.nao@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Introduce lvts_platform_ops struct to support SoC-specific versions of lvts_raw_to_temp() and lvts_temp_to_raw() conversion functions. This is in preparation for supporting SoCs like MT8196/MT6991, which require a different lvts_temp_to_raw() implementation. Reviewed-by: Fei Shao Reviewed-by: AngeloGioacchino Del Regno Signed-off-by: Laura Nao Tested-by: AngeloGioacchino Del Regno =20 --- drivers/thermal/mediatek/lvts_thermal.c | 27 ++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/drivers/thermal/mediatek/lvts_thermal.c b/drivers/thermal/medi= atek/lvts_thermal.c index 8398af657ba2..47124d33ca2e 100644 --- a/drivers/thermal/mediatek/lvts_thermal.c +++ b/drivers/thermal/mediatek/lvts_thermal.c @@ -125,8 +125,14 @@ struct lvts_ctrl_data { continue; \ else =20 +struct lvts_platform_ops { + int (*lvts_raw_to_temp)(u32 raw_temp, int temp_factor); + u32 (*lvts_temp_to_raw)(int temperature, int temp_factor); +}; + struct lvts_data { const struct lvts_ctrl_data *lvts_ctrl; + const struct lvts_platform_ops *ops; const u32 *conn_cmd; const u32 *init_cmd; int num_cal_offsets; @@ -300,6 +306,7 @@ static int lvts_get_temp(struct thermal_zone_device *tz= , int *temp) struct lvts_ctrl *lvts_ctrl =3D container_of(lvts_sensor, struct lvts_ctr= l, sensors[lvts_sensor->id]); const struct lvts_data *lvts_data =3D lvts_ctrl->lvts_data; + const struct lvts_platform_ops *ops =3D lvts_data->ops; void __iomem *msr =3D lvts_sensor->msr; u32 value; int rc; @@ -332,7 +339,7 @@ static int lvts_get_temp(struct thermal_zone_device *tz= , int *temp) if (rc) return -EAGAIN; =20 - *temp =3D lvts_raw_to_temp(value & 0xFFFF, lvts_data->temp_factor); + *temp =3D ops->lvts_raw_to_temp(value & 0xFFFF, lvts_data->temp_factor); =20 return 0; } @@ -400,10 +407,11 @@ static int lvts_set_trips(struct thermal_zone_device = *tz, int low, int high) struct lvts_ctrl *lvts_ctrl =3D container_of(lvts_sensor, struct lvts_ctr= l, sensors[lvts_sensor->id]); const struct lvts_data *lvts_data =3D lvts_ctrl->lvts_data; + const struct lvts_platform_ops *ops =3D lvts_data->ops; void __iomem *base =3D lvts_sensor->base; - u32 raw_low =3D lvts_temp_to_raw(low !=3D -INT_MAX ? low : LVTS_MINIMUM_T= HRESHOLD, + u32 raw_low =3D ops->lvts_temp_to_raw(low !=3D -INT_MAX ? low : LVTS_MINI= MUM_THRESHOLD, lvts_data->temp_factor); - u32 raw_high =3D lvts_temp_to_raw(high, lvts_data->temp_factor); + u32 raw_high =3D ops->lvts_temp_to_raw(high, lvts_data->temp_factor); bool should_update_thresh; =20 lvts_sensor->low_thresh =3D low; @@ -1763,6 +1771,11 @@ static const struct lvts_ctrl_data mt8195_lvts_ap_da= ta_ctrl[] =3D { } }; =20 +static const struct lvts_platform_ops lvts_platform_ops_v1 =3D { + .lvts_raw_to_temp =3D lvts_raw_to_temp, + .lvts_temp_to_raw =3D lvts_temp_to_raw, +}; + static const struct lvts_data mt7988_lvts_ap_data =3D { .lvts_ctrl =3D mt7988_lvts_ap_data_ctrl, .conn_cmd =3D mt7988_conn_cmds, @@ -1774,6 +1787,7 @@ static const struct lvts_data mt7988_lvts_ap_data =3D= { .temp_offset =3D LVTS_COEFF_B_MT7988, .gt_calib_bit_offset =3D 24, .num_cal_offsets =3D 3, + .ops =3D &lvts_platform_ops_v1, }; =20 static const struct lvts_data mt8186_lvts_data =3D { @@ -1788,6 +1802,7 @@ static const struct lvts_data mt8186_lvts_data =3D { .gt_calib_bit_offset =3D 24, .def_calibration =3D 19000, .num_cal_offsets =3D 3, + .ops =3D &lvts_platform_ops_v1, }; =20 static const struct lvts_data mt8188_lvts_mcu_data =3D { @@ -1802,6 +1817,7 @@ static const struct lvts_data mt8188_lvts_mcu_data = =3D { .gt_calib_bit_offset =3D 20, .def_calibration =3D 35000, .num_cal_offsets =3D 3, + .ops =3D &lvts_platform_ops_v1, }; =20 static const struct lvts_data mt8188_lvts_ap_data =3D { @@ -1816,6 +1832,7 @@ static const struct lvts_data mt8188_lvts_ap_data =3D= { .gt_calib_bit_offset =3D 20, .def_calibration =3D 35000, .num_cal_offsets =3D 3, + .ops =3D &lvts_platform_ops_v1, }; =20 static const struct lvts_data mt8192_lvts_mcu_data =3D { @@ -1830,6 +1847,7 @@ static const struct lvts_data mt8192_lvts_mcu_data = =3D { .gt_calib_bit_offset =3D 24, .def_calibration =3D 35000, .num_cal_offsets =3D 3, + .ops =3D &lvts_platform_ops_v1, }; =20 static const struct lvts_data mt8192_lvts_ap_data =3D { @@ -1844,6 +1862,7 @@ static const struct lvts_data mt8192_lvts_ap_data =3D= { .gt_calib_bit_offset =3D 24, .def_calibration =3D 35000, .num_cal_offsets =3D 3, + .ops =3D &lvts_platform_ops_v1, }; =20 static const struct lvts_data mt8195_lvts_mcu_data =3D { @@ -1858,6 +1877,7 @@ static const struct lvts_data mt8195_lvts_mcu_data = =3D { .gt_calib_bit_offset =3D 24, .def_calibration =3D 35000, .num_cal_offsets =3D 3, + .ops =3D &lvts_platform_ops_v1, }; =20 static const struct lvts_data mt8195_lvts_ap_data =3D { @@ -1872,6 +1892,7 @@ static const struct lvts_data mt8195_lvts_ap_data =3D= { .gt_calib_bit_offset =3D 24, .def_calibration =3D 35000, .num_cal_offsets =3D 3, + .ops =3D &lvts_platform_ops_v1, }; =20 static const struct of_device_id lvts_of_match[] =3D { --=20 2.39.5 From nobody Sun Oct 5 12:52:24 2025 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 92CDD26FD9F; Mon, 4 Aug 2025 13:32:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754314369; cv=none; b=mzLB8tOl62ZDGMj9yj4ht3HSoD8U8kSln3rC1+ll/hmJwiODdlyITefowDbxU7Jti5GgGzAsynxioayG6fOKmO6HIAJ6T2CoAgB1G9BHRPnsa/gah8IWn0k8i4R9I1BNHt7vV4z12g6yg5pFIYrKYBTLp0Oghb6XBLQ2usyz7U4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754314369; c=relaxed/simple; bh=p8TNqT/5VVY0x4ZX9U/Edo2dC4tTH5VL+JaK2ksQlv4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=u5EjSL37eEkX+v3B3E9+luQm5Pe2lz0APu78RtOXRvTa5XVjuGwtqcUCJPxuPZyiAqlUjHVV08NI2XSz4uS3aXiBo69Qid/MVT6DeI/d4I1s7Te1CfE6KWY2Ug7zWGmC6TSuNoJJkcEPL1TV2uAVy+pSk7e8CuIp40binNajGd0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=IAyB20mF; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="IAyB20mF" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1754314364; bh=p8TNqT/5VVY0x4ZX9U/Edo2dC4tTH5VL+JaK2ksQlv4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IAyB20mFKP98JZzTsGAMRSvNOE22Kp81k8/xPcNbRYq2C4i14IelZn/6BBbCnxxpP QjqfD1A52AdrTAYFMswHe7aPfG0MkfSXA+26K7tY45mUYV7YNGSuRdTT0auUg6s8GA SEAQKjFPF+hxNcNFSEdR1JG49ipPpRVQ2BzrEUm938wm5EEotzTuPhtduP8gM/xiKH wD40UVMe4mhj/l+H337zPkXFTTdy/En9iNzrotkX1g+a4z3xaGWFy0xiQEVYHKH5v1 0YMyeujLL9XsnPP9CTy/GwYrmhn9zULywbMjvNMfuboOluPB0mupYvJrRz+Uhwp9Mx Ep5yx0vptsbiQ== Received: from laura.lan (unknown [IPv6:2001:b07:646b:e2:865e:547d:4830:837d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: laura.nao) by bali.collaboradmins.com (Postfix) with ESMTPSA id 6460E17E09F0; Mon, 4 Aug 2025 15:32:43 +0200 (CEST) From: Laura Nao To: srini@kernel.org, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, rafael@kernel.org, daniel.lezcano@linaro.org, rui.zhang@intel.com, lukasz.luba@arm.com, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com Cc: nfraprado@collabora.com, arnd@arndb.de, colin.i.king@gmail.com, u.kleine-koenig@baylibre.com, andrew-ct.chen@mediatek.com, lala.lin@mediatek.com, bchihi@baylibre.com, frank-w@public-files.de, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, kernel@collabora.com, Laura Nao , Chen-Yu Tsai , Fei Shao Subject: [PATCH v3 5/9] thermal/drivers/mediatek/lvts: Add lvts_temp_to_raw variant Date: Mon, 4 Aug 2025 15:30:31 +0200 Message-Id: <20250804133035.309990-6-laura.nao@collabora.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250804133035.309990-1-laura.nao@collabora.com> References: <20250804133035.309990-1-laura.nao@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" MT8196/MT6991 require a different version of lvts_temp_to_raw(), specifically the multiplicative inverse of the existing implementation. Introduce a variant of the function with inverted calculation logic to match this requirement. This ensures accurate raw value generation for temperature thresholds, avoiding spurious thermal interrupts or unintended hardware resets on MT8196/MT6991. Reviewed-by: Chen-Yu Tsai Reviewed-by: AngeloGioacchino Del Regno Reviewed-by: Fei Shao Signed-off-by: Laura Nao Tested-by: AngeloGioacchino Del Regno =20 --- drivers/thermal/mediatek/lvts_thermal.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/thermal/mediatek/lvts_thermal.c b/drivers/thermal/medi= atek/lvts_thermal.c index 47124d33ca2e..e29664f1316a 100644 --- a/drivers/thermal/mediatek/lvts_thermal.c +++ b/drivers/thermal/mediatek/lvts_thermal.c @@ -300,6 +300,18 @@ static u32 lvts_temp_to_raw(int temperature, int temp_= factor) return div_s64(raw_temp, -temp_factor); } =20 +static u32 lvts_temp_to_raw_v2(int temperature, int temp_factor) +{ + u32 raw_temp; + + if (temp_factor =3D=3D 0) + return temperature; + + raw_temp =3D temperature - golden_temp_offset; + + return div_s64((s64)temp_factor << 14, raw_temp); +} + static int lvts_get_temp(struct thermal_zone_device *tz, int *temp) { struct lvts_sensor *lvts_sensor =3D thermal_zone_device_priv(tz); --=20 2.39.5 From nobody Sun Oct 5 12:52:24 2025 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4B84626B2A5; Mon, 4 Aug 2025 13:32:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754314370; cv=none; b=uA+5gHTUkPcvZ/v44fz2F9FHW3WL9C2wrEc9vXn62d7QvPAZUykbS2212lFBut72WJgEAK0PzBa4ivKYhka2t1Fzn2N6OcPdjjH2qKbz4wlfFzJ3lGe1qiMVkdpY8zvoAhONcq7wKtvUCYqvBnlMOsDXpNnmwn1geVxKZrLKrxY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754314370; c=relaxed/simple; bh=3EUMyB1zHIKHzfZUJiqkP2t5ouVGGyM7JSAA86ydGYM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=QZNgdGXaPvsMMpKKYrResxNg0AT0I04ekbIgr1ZBq9KI0MSAzT+1c+fcqSUfupoNypO5W2yLcV3pwkhArf0qLGZi1YbXVSEYnStR//SIeAD0BIkI0jHqyt28u+uCV3d22+3x2wBdrK0O5AMbOEHSCzZoqqFK4762507gOdyXFBo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=V6ddnnko; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="V6ddnnko" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1754314366; bh=3EUMyB1zHIKHzfZUJiqkP2t5ouVGGyM7JSAA86ydGYM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V6ddnnkoOJopqolmpjTOlmMYmcmhq43y8AJcl/O/ZY4CcBhq0sIbwg7aUt1enFz80 qbcvSYZj9NfnyGZJSlDw+Pi14mRDw8RBhZhzmMqsGQoe/iVg86ZW2Xn15NRJlv3l1H 6FgUJ27JJhTWaOKoZeXB24rurjloKZB6KCe/hBsykz6K67+HN2/jLH0MZh30IzdFy8 ixFJXy18i8f2d7g0DEtP1xKXIrsXDu2e582HhVZunrBm1I87Y3ceV00pkXPjrizDC2 p/0lf03XvLxkK5BlcRHMTLT13vKTkRZ9Py8GDFhnln2Yy+d7b5o6bz2ERmPeXjNqWt 3B4f4L8liF+tQ== Received: from laura.lan (unknown [IPv6:2001:b07:646b:e2:865e:547d:4830:837d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: laura.nao) by bali.collaboradmins.com (Postfix) with ESMTPSA id 0FB8517E1298; Mon, 4 Aug 2025 15:32:45 +0200 (CEST) From: Laura Nao To: srini@kernel.org, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, rafael@kernel.org, daniel.lezcano@linaro.org, rui.zhang@intel.com, lukasz.luba@arm.com, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com Cc: nfraprado@collabora.com, arnd@arndb.de, colin.i.king@gmail.com, u.kleine-koenig@baylibre.com, andrew-ct.chen@mediatek.com, lala.lin@mediatek.com, bchihi@baylibre.com, frank-w@public-files.de, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, kernel@collabora.com, Laura Nao , Chen-Yu Tsai , Fei Shao Subject: [PATCH v3 6/9] thermal/drivers/mediatek/lvts: Add support for ATP mode Date: Mon, 4 Aug 2025 15:30:32 +0200 Message-Id: <20250804133035.309990-7-laura.nao@collabora.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250804133035.309990-1-laura.nao@collabora.com> References: <20250804133035.309990-1-laura.nao@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" MT8196/MT6991 uses ATP (Abnormal Temperature Prevention) mode to detect abnormal temperature conditions, which involves reading temperature data from a dedicated set of registers separate from the ones used for immediate and filtered modes. Add support for ATP mode and its relative registers to ensure accurate temperature readings and proper thermal management on MT8196/MT6991 devices. While at it, convert mode defines to enum. Reviewed-by: Chen-Yu Tsai Reviewed-by: AngeloGioacchino Del Regno Reviewed-by: Fei Shao Signed-off-by: Laura Nao Tested-by: AngeloGioacchino Del Regno =20 --- drivers/thermal/mediatek/lvts_thermal.c | 44 +++++++++++++++++++++---- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/drivers/thermal/mediatek/lvts_thermal.c b/drivers/thermal/medi= atek/lvts_thermal.c index e29664f1316a..dcfcb1be5a09 100644 --- a/drivers/thermal/mediatek/lvts_thermal.c +++ b/drivers/thermal/mediatek/lvts_thermal.c @@ -44,6 +44,10 @@ #define LVTS_EDATA01(__base) (__base + 0x0058) #define LVTS_EDATA02(__base) (__base + 0x005C) #define LVTS_EDATA03(__base) (__base + 0x0060) +#define LVTS_ATP0(__base) (__base + 0x0070) +#define LVTS_ATP1(__base) (__base + 0x0074) +#define LVTS_ATP2(__base) (__base + 0x0078) +#define LVTS_ATP3(__base) (__base + 0x007C) #define LVTS_MSR0(__base) (__base + 0x0090) #define LVTS_MSR1(__base) (__base + 0x0094) #define LVTS_MSR2(__base) (__base + 0x0098) @@ -88,9 +92,6 @@ #define LVTS_COEFF_A_MT7988 -204650 #define LVTS_COEFF_B_MT7988 204650 =20 -#define LVTS_MSR_IMMEDIATE_MODE 0 -#define LVTS_MSR_FILTERED_MODE 1 - #define LVTS_MSR_READ_TIMEOUT_US 400 #define LVTS_MSR_READ_WAIT_US (LVTS_MSR_READ_TIMEOUT_US / 2) =20 @@ -101,6 +102,12 @@ static int golden_temp =3D LVTS_GOLDEN_TEMP_DEFAULT; static int golden_temp_offset; =20 +enum lvts_msr_mode { + LVTS_MSR_IMMEDIATE_MODE, + LVTS_MSR_FILTERED_MODE, + LVTS_MSR_ATP_MODE, +}; + struct lvts_sensor_data { int dt_id; u8 cal_offsets[LVTS_MAX_CAL_OFFSETS]; @@ -110,7 +117,7 @@ struct lvts_ctrl_data { struct lvts_sensor_data lvts_sensor[LVTS_SENSOR_MAX]; u8 valid_sensor_mask; int offset; - int mode; + enum lvts_msr_mode mode; }; =20 #define VALID_SENSOR_MAP(s0, s1, s2, s3) \ @@ -211,6 +218,10 @@ static const struct debugfs_reg32 lvts_regs[] =3D { LVTS_DEBUG_FS_REGS(LVTS_EDATA01), LVTS_DEBUG_FS_REGS(LVTS_EDATA02), LVTS_DEBUG_FS_REGS(LVTS_EDATA03), + LVTS_DEBUG_FS_REGS(LVTS_ATP0), + LVTS_DEBUG_FS_REGS(LVTS_ATP1), + LVTS_DEBUG_FS_REGS(LVTS_ATP2), + LVTS_DEBUG_FS_REGS(LVTS_ATP3), LVTS_DEBUG_FS_REGS(LVTS_MSR0), LVTS_DEBUG_FS_REGS(LVTS_MSR1), LVTS_DEBUG_FS_REGS(LVTS_MSR2), @@ -625,6 +636,13 @@ static int lvts_sensor_init(struct device *dev, struct= lvts_ctrl *lvts_ctrl, LVTS_IMMD3(lvts_ctrl->base) }; =20 + void __iomem *atp_regs[] =3D { + LVTS_ATP0(lvts_ctrl->base), + LVTS_ATP1(lvts_ctrl->base), + LVTS_ATP2(lvts_ctrl->base), + LVTS_ATP3(lvts_ctrl->base) + }; + int i; =20 lvts_for_each_valid_sensor(i, lvts_ctrl_data) { @@ -660,8 +678,20 @@ static int lvts_sensor_init(struct device *dev, struct= lvts_ctrl *lvts_ctrl, /* * Each sensor has its own register address to read from. */ - lvts_sensor[i].msr =3D lvts_ctrl_data->mode =3D=3D LVTS_MSR_IMMEDIATE_MO= DE ? - imm_regs[i] : msr_regs[i]; + switch (lvts_ctrl_data->mode) { + case LVTS_MSR_IMMEDIATE_MODE: + lvts_sensor[i].msr =3D imm_regs[i]; + break; + case LVTS_MSR_FILTERED_MODE: + lvts_sensor[i].msr =3D msr_regs[i]; + break; + case LVTS_MSR_ATP_MODE: + lvts_sensor[i].msr =3D atp_regs[i]; + break; + default: + lvts_sensor[i].msr =3D imm_regs[i]; + break; + } =20 lvts_sensor[i].low_thresh =3D INT_MIN; lvts_sensor[i].high_thresh =3D INT_MIN; @@ -911,7 +941,7 @@ static void lvts_ctrl_monitor_enable(struct device *dev= , struct lvts_ctrl *lvts_ u32 sensor_map =3D 0; int i; =20 - if (lvts_ctrl->mode !=3D LVTS_MSR_FILTERED_MODE) + if (lvts_ctrl->mode =3D=3D LVTS_MSR_IMMEDIATE_MODE) return; =20 if (enable) { --=20 2.39.5 From nobody Sun Oct 5 12:52:24 2025 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BA714270EC1; Mon, 4 Aug 2025 13:32:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754314371; cv=none; b=j5JmdbJGNsQ+g6dhXQFClTyI36UJhUeGaAiDuy6tkfaGfVZM9gyWsL4YwOZ0v02a0nNj6Te7whgCpjM+gMti2wNB2KVawINbF1BYw4jNYirovXAcPqhlj+wVMuvufSX6iM7vuUD9209MUKekQbXh7u7ugrjUZx9zdAoGvGemEDc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754314371; c=relaxed/simple; bh=uY4kKMPnqiqV9X/4qOUA+HIRtOTWlGXuobPhqN9t1qo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=R9Rj+vmQFqT33SJ1qICinwkShPBVMhm7/HfoN00OF+Jl1KMKfoL7eJCHwXv6dMNCUuVRKVIjXrZW/fKTh/JS8JDw6p/Nz3ig/qZt8q9VXKWk0EZfNUt9hsU7SLVkMFVHhObrBIead8Gd98e3ORDqDPvYM31hel/JbMV0QtEFEP0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=mK98SG/T; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="mK98SG/T" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1754314368; bh=uY4kKMPnqiqV9X/4qOUA+HIRtOTWlGXuobPhqN9t1qo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mK98SG/TQ9nKPQQrppl/cMqudqopj4v5io1iT6quyIecCymqs+P8HKaghPz0X0ilU V7Ph3xUsUHYlAIzvspW6HQxDE1IXZ/i8KK89hFJMuY/2OEL5FmFCSfenocMtfdlA4q DvlELi2Myi4JMH2HcB1+8Ss/ausgsACuw3zSFgEEB1XeqovZhDapdCbsWQjLtnBvPi TcNmVIO1KwIoyTEqqOldIEVthEbGRKAkaGZal2/b5Ky8zHJR9xDfT5DPC7KQkxJ5Dn FMzZ5sKZ5U2Z8VbDWwsJ5dsPOT3v5p3OzKV1OJHRVZG3a8J4+TqZE+MLFaXlauOIK3 HCK6YFYmF0XhA== Received: from laura.lan (unknown [IPv6:2001:b07:646b:e2:865e:547d:4830:837d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: laura.nao) by bali.collaboradmins.com (Postfix) with ESMTPSA id B2C0617E1540; Mon, 4 Aug 2025 15:32:46 +0200 (CEST) From: Laura Nao To: srini@kernel.org, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, rafael@kernel.org, daniel.lezcano@linaro.org, rui.zhang@intel.com, lukasz.luba@arm.com, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com Cc: nfraprado@collabora.com, arnd@arndb.de, colin.i.king@gmail.com, u.kleine-koenig@baylibre.com, andrew-ct.chen@mediatek.com, lala.lin@mediatek.com, bchihi@baylibre.com, frank-w@public-files.de, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, kernel@collabora.com, Laura Nao Subject: [PATCH v3 7/9] thermal/drivers/mediatek/lvts: Support MSR offset for 16-bit calibration data Date: Mon, 4 Aug 2025 15:30:33 +0200 Message-Id: <20250804133035.309990-8-laura.nao@collabora.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250804133035.309990-1-laura.nao@collabora.com> References: <20250804133035.309990-1-laura.nao@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" On MT8196/MT6991, per-sensor calibration data read from eFuses is 16-bit. When the LVTS controller operates in 16-bit mode, a fixed offset must be added to MSR values during post-processing to obtain correct temperature readings. Introduce a new msr_offset field in lvts_data, program the respective register and apply the offset to the calibration data read from eFuses. Reviewed-by: AngeloGioacchino Del Regno Signed-off-by: Laura Nao Tested-by: AngeloGioacchino Del Regno =20 --- drivers/thermal/mediatek/lvts_thermal.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/drivers/thermal/mediatek/lvts_thermal.c b/drivers/thermal/medi= atek/lvts_thermal.c index dcfcb1be5a09..481ca133902d 100644 --- a/drivers/thermal/mediatek/lvts_thermal.c +++ b/drivers/thermal/mediatek/lvts_thermal.c @@ -44,6 +44,7 @@ #define LVTS_EDATA01(__base) (__base + 0x0058) #define LVTS_EDATA02(__base) (__base + 0x005C) #define LVTS_EDATA03(__base) (__base + 0x0060) +#define LVTS_MSROFT(__base) (__base + 0x006C) #define LVTS_ATP0(__base) (__base + 0x0070) #define LVTS_ATP1(__base) (__base + 0x0074) #define LVTS_ATP2(__base) (__base + 0x0078) @@ -150,6 +151,7 @@ struct lvts_data { int temp_offset; int gt_calib_bit_offset; unsigned int def_calibration; + u16 msr_offset; }; =20 struct lvts_sensor { @@ -218,6 +220,7 @@ static const struct debugfs_reg32 lvts_regs[] =3D { LVTS_DEBUG_FS_REGS(LVTS_EDATA01), LVTS_DEBUG_FS_REGS(LVTS_EDATA02), LVTS_DEBUG_FS_REGS(LVTS_EDATA03), + LVTS_DEBUG_FS_REGS(LVTS_MSROFT), LVTS_DEBUG_FS_REGS(LVTS_ATP0), LVTS_DEBUG_FS_REGS(LVTS_ATP1), LVTS_DEBUG_FS_REGS(LVTS_ATP2), @@ -788,6 +791,8 @@ static int lvts_calibration_init(struct device *dev, st= ruct lvts_ctrl *lvts_ctrl =20 if (gt) { lvts_ctrl->calibration[i] =3D calib; + if (lvts_ctrl->lvts_data->msr_offset) + lvts_ctrl->calibration[i] +=3D lvts_ctrl->lvts_data->msr_offset; } else if (lvts_ctrl->lvts_data->def_calibration) { lvts_ctrl->calibration[i] =3D lvts_ctrl->lvts_data->def_calibration; } else { @@ -1095,6 +1100,17 @@ static int lvts_ctrl_calibrate(struct device *dev, s= truct lvts_ctrl *lvts_ctrl) for (i =3D 0; i < LVTS_SENSOR_MAX; i++) writel(lvts_ctrl->calibration[i], lvts_edata[i]); =20 + /* LVTS_MSROFT : Constant offset applied to MSR values + * for post-processing + * + * Bits: + * + * 20-0 : Constant data added to MSR values + */ + if (lvts_ctrl->lvts_data->msr_offset) + writel(lvts_ctrl->lvts_data->msr_offset, + LVTS_MSROFT(lvts_ctrl->base)); + return 0; } =20 --=20 2.39.5 From nobody Sun Oct 5 12:52:24 2025 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2D259271A9A; Mon, 4 Aug 2025 13:32:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754314373; cv=none; b=MBjgTble8KIlv/Ir/bAAX4HsB98gW507sdKN5IczOeNn+qCWY+bvydR8uByOhMAjw6+3KS25lSjDNJHslh6gh+Y7maoXM3B/05Gev9rNwMdZk11Kq7l6XYp4AYMxCUDb5IJKz+WvakwkN0NA++bi2qC+XVIe6VRnVb0b7CNrjpU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754314373; c=relaxed/simple; bh=pnFTB9ccubAjgjKfgARV6bTlIT7guNmOKCqGQkmNlCQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=UAf6OS76peMt/jMPnys9ilYINsx9r4uvpKzFRXqgWMYnAIt0FM/+VKUqTZhdjyuDNGukgZPC8Z6fnpF8KFR4dZtEFgy75uqmQ9htmcR6L3+ij38VuZE7ONXmEH8b/wGZm3lYTm7IvgNXmVZ3FZU/UwwcDIIMmANx6guWstT6yWQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=ENvzEV7Q; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="ENvzEV7Q" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1754314369; bh=pnFTB9ccubAjgjKfgARV6bTlIT7guNmOKCqGQkmNlCQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ENvzEV7QfdItWAk7fxjjBjTraCO2g9Is7WbSrUqLPTGgzi3xjTVwml5PVakf8fLTq oJ6han9GzWsZc26hnGqEwVd0SevoypDjuzNV55mpW/DdUH8qol+1oq2wB0rcrl+UNh VhrgzaCUvtoBfQZG0g86GgXCvXaA6wNKpP4Rk+WaMaJPt0kLKfoybR+6lVgMtsWbmj Y1V7Ch1Lrk8MQXLTEPwhqOfGPOtAVuwgiZLSuny8VhdJ5ko+W2e3t70JN9BwnBr65U 0f+RAoNOHBbF/1y5L4vSDZbExXGezcu6V1QwMi20+523Y6irG95NwQOUCZ87mQ/kd+ obc9eEy/A++aA== Received: from laura.lan (unknown [IPv6:2001:b07:646b:e2:865e:547d:4830:837d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: laura.nao) by bali.collaboradmins.com (Postfix) with ESMTPSA id 4AFD317E1274; Mon, 4 Aug 2025 15:32:48 +0200 (CEST) From: Laura Nao To: srini@kernel.org, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, rafael@kernel.org, daniel.lezcano@linaro.org, rui.zhang@intel.com, lukasz.luba@arm.com, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com Cc: nfraprado@collabora.com, arnd@arndb.de, colin.i.king@gmail.com, u.kleine-koenig@baylibre.com, andrew-ct.chen@mediatek.com, lala.lin@mediatek.com, bchihi@baylibre.com, frank-w@public-files.de, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, kernel@collabora.com, Laura Nao Subject: [PATCH v3 8/9] thermal/drivers/mediatek/lvts_thermal: Add MT8196 support Date: Mon, 4 Aug 2025 15:30:34 +0200 Message-Id: <20250804133035.309990-9-laura.nao@collabora.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250804133035.309990-1-laura.nao@collabora.com> References: <20250804133035.309990-1-laura.nao@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add LVTS driver support for MT8196. Reviewed-by: AngeloGioacchino Del Regno Signed-off-by: Laura Nao Tested-by: AngeloGioacchino Del Regno =20 --- drivers/thermal/mediatek/lvts_thermal.c | 164 ++++++++++++++++++++++++ 1 file changed, 164 insertions(+) diff --git a/drivers/thermal/mediatek/lvts_thermal.c b/drivers/thermal/medi= atek/lvts_thermal.c index 481ca133902d..51a0fd22c2a2 100644 --- a/drivers/thermal/mediatek/lvts_thermal.c +++ b/drivers/thermal/mediatek/lvts_thermal.c @@ -92,6 +92,10 @@ #define LVTS_COEFF_B_MT8195 250460 #define LVTS_COEFF_A_MT7988 -204650 #define LVTS_COEFF_B_MT7988 204650 +#define LVTS_COEFF_A_MT8196 391460 +#define LVTS_COEFF_B_MT8196 -391460 + +#define LVTS_MSR_OFFSET_MT8196 -984 =20 #define LVTS_MSR_READ_TIMEOUT_US 400 #define LVTS_MSR_READ_WAIT_US (LVTS_MSR_READ_TIMEOUT_US / 2) @@ -761,6 +765,39 @@ static int lvts_sensor_init(struct device *dev, struct= lvts_ctrl *lvts_ctrl, * <-----ap--tc#3-----> <-----sensor#7-----> <-----sensor#8-----> * 0x40 | 0x41 | 0x42 | 0x43 | 0x44 | 0x45 | 0x46 | 0x47 | 0x48 * + * MT8196 : + * Stream index map for MCU Domain mt8196 : + * + * <-sensor#1--> <-sensor#0--> <-sensor#3--> <-sensor#2--> + * 0x04 | 0x05 | 0x06 | 0x07 | 0x08 | 0x09 | 0x0A | 0x0B + * + * <-sensor#5--> <-sensor#4--> <-sensor#7--> <-sensor#6--> + * 0x0C | 0x0D | 0x0E | 0x0F | 0x10 | 0x11 | 0x12 | 0x13 + * + * <-sensor#9--> <-sensor#8--> <-sensor#11-> <-sensor#10-> + * 0x14 | 0x15 | 0x16 | 0x17 | 0x18 | 0x19 | 0x1A | 0X1B + * + * <-sensor#13-> <-sensor#12-> <-sensor#15-> <-sensor#14-> + * 0x1C | 0x1D | 0x1E | 0x1F | 0x20 | 0x21 | 0x22 | 0x23 + * + * Stream index map for APU Domain mt8196 : + * + * <-sensor#1--> <-sensor#0--> <-sensor#3--> <-sensor#2--> + * 0x24 | 0x25 | 0x26 | 0x27 | 0x28 | 0x29 | 0x2A | 0x2B + * + * Stream index map for GPU Domain mt8196 : + * + * <-sensor#1--> <-sensor#0--> + * 0x2C | 0x2D | 0x2E | 0x2F + * + * Stream index map for AP Domain mt8196 : + * + * <-sensor#1--> <-sensor#0--> <-sensor#3--> <-sensor#2--> + * 0x30 | 0x31 | 0x32 | 0x33 | 0x34 | 0x35 | 0x36 | 0x37 + * + * <-sensor#5--> <-sensor#4--> <-sensor#6--> <-sensor#7--> + * 0x38 | 0x39 | 0x3A | 0x3B | 0x3C | 0x3D | 0x3E | 0x3F + * * Note: In some cases, values don't strictly follow a little endian order= ing. * The data description gives byte offsets constituting each calibration v= alue * for each sensor. @@ -1829,11 +1866,112 @@ static const struct lvts_ctrl_data mt8195_lvts_ap_= data_ctrl[] =3D { } }; =20 +static const struct lvts_ctrl_data mt8196_lvts_mcu_data_ctrl[] =3D { + { + .lvts_sensor =3D { + { .dt_id =3D MT8196_MCU_MEDIUM_CPU6_0, + .cal_offsets =3D { 0x06, 0x07 } }, + { .dt_id =3D MT8196_MCU_MEDIUM_CPU6_1, + .cal_offsets =3D { 0x04, 0x05 } }, + { .dt_id =3D MT8196_MCU_DSU2, + .cal_offsets =3D { 0x0A, 0x0B } }, + { .dt_id =3D MT8196_MCU_DSU3, + .cal_offsets =3D { 0x08, 0x09 } } + }, + VALID_SENSOR_MAP(1, 1, 1, 1), + .offset =3D 0x0, + .mode =3D LVTS_MSR_ATP_MODE, + }, + { + .lvts_sensor =3D { + { .dt_id =3D MT8196_MCU_LITTLE_CPU3, + .cal_offsets =3D { 0x0E, 0x0F } }, + { .dt_id =3D MT8196_MCU_LITTLE_CPU0, + .cal_offsets =3D { 0x0C, 0x0D } }, + { .dt_id =3D MT8196_MCU_LITTLE_CPU1, + .cal_offsets =3D { 0x12, 0x13 } }, + { .dt_id =3D MT8196_MCU_LITTLE_CPU2, + .cal_offsets =3D { 0x10, 0x11 } } + }, + VALID_SENSOR_MAP(1, 1, 1, 1), + .offset =3D 0x100, + .mode =3D LVTS_MSR_ATP_MODE, + }, + { + .lvts_sensor =3D { + { .dt_id =3D MT8196_MCU_MEDIUM_CPU4_0, + .cal_offsets =3D { 0x16, 0x17 } }, + { .dt_id =3D MT8196_MCU_MEDIUM_CPU4_1, + .cal_offsets =3D { 0x14, 0x15 } }, + { .dt_id =3D MT8196_MCU_MEDIUM_CPU5_0, + .cal_offsets =3D { 0x1A, 0x1B } }, + { .dt_id =3D MT8196_MCU_MEDIUM_CPU5_1, + .cal_offsets =3D { 0x18, 0x19 } } + }, + VALID_SENSOR_MAP(1, 1, 1, 1), + .offset =3D 0x200, + .mode =3D LVTS_MSR_ATP_MODE, + }, + { + .lvts_sensor =3D { + { .dt_id =3D MT8196_MCU_DSU0, + .cal_offsets =3D { 0x1E, 0x1F } }, + { .dt_id =3D MT8196_MCU_DSU1, + .cal_offsets =3D { 0x1C, 0x1D } }, + { .dt_id =3D MT8196_MCU_BIG_CPU7_0, + .cal_offsets =3D { 0x22, 0x23 } }, + { .dt_id =3D MT8196_MCU_BIG_CPU7_1, + .cal_offsets =3D { 0x20, 0x21 } } + }, + VALID_SENSOR_MAP(1, 1, 1, 1), + .offset =3D 0x300, + .mode =3D LVTS_MSR_ATP_MODE, + } +}; + +static const struct lvts_ctrl_data mt8196_lvts_ap_data_ctrl[] =3D { + { + .lvts_sensor =3D { + { .dt_id =3D MT8196_AP_TOP0, + .cal_offsets =3D { 0x32, 0x33 } }, + { .dt_id =3D MT8196_AP_TOP1, + .cal_offsets =3D { 0x30, 0x31 } }, + { .dt_id =3D MT8196_AP_TOP2, + .cal_offsets =3D { 0x36, 0x37 } }, + { .dt_id =3D MT8196_AP_TOP3, + .cal_offsets =3D { 0x34, 0x35 } } + }, + VALID_SENSOR_MAP(1, 1, 1, 1), + .offset =3D 0x0, + .mode =3D LVTS_MSR_ATP_MODE, + }, + { + .lvts_sensor =3D { + { .dt_id =3D MT8196_AP_BOT0, + .cal_offsets =3D { 0x3A, 0x3B } }, + { .dt_id =3D MT8196_AP_BOT1, + .cal_offsets =3D { 0x38, 0x39 } }, + { .dt_id =3D MT8196_AP_BOT2, + .cal_offsets =3D { 0x3E, 0x3F } }, + { .dt_id =3D MT8196_AP_BOT3, + .cal_offsets =3D { 0x3C, 0x3D } } + }, + VALID_SENSOR_MAP(1, 1, 1, 1), + .offset =3D 0x100, + .mode =3D LVTS_MSR_ATP_MODE, + } +}; + static const struct lvts_platform_ops lvts_platform_ops_v1 =3D { .lvts_raw_to_temp =3D lvts_raw_to_temp, .lvts_temp_to_raw =3D lvts_temp_to_raw, }; =20 +static const struct lvts_platform_ops lvts_platform_ops_v2 =3D { + .lvts_raw_to_temp =3D lvts_raw_to_temp, + .lvts_temp_to_raw =3D lvts_temp_to_raw_v2, +}; + static const struct lvts_data mt7988_lvts_ap_data =3D { .lvts_ctrl =3D mt7988_lvts_ap_data_ctrl, .conn_cmd =3D mt7988_conn_cmds, @@ -1953,6 +2091,30 @@ static const struct lvts_data mt8195_lvts_ap_data = =3D { .ops =3D &lvts_platform_ops_v1, }; =20 +static const struct lvts_data mt8196_lvts_mcu_data =3D { + .lvts_ctrl =3D mt8196_lvts_mcu_data_ctrl, + .num_lvts_ctrl =3D ARRAY_SIZE(mt8196_lvts_mcu_data_ctrl), + .temp_factor =3D LVTS_COEFF_A_MT8196, + .temp_offset =3D LVTS_COEFF_B_MT8196, + .gt_calib_bit_offset =3D 0, + .def_calibration =3D 14437, + .num_cal_offsets =3D 2, + .msr_offset =3D LVTS_MSR_OFFSET_MT8196, + .ops =3D &lvts_platform_ops_v2, +}; + +static const struct lvts_data mt8196_lvts_ap_data =3D { + .lvts_ctrl =3D mt8196_lvts_ap_data_ctrl, + .num_lvts_ctrl =3D ARRAY_SIZE(mt8196_lvts_ap_data_ctrl), + .temp_factor =3D LVTS_COEFF_A_MT8196, + .temp_offset =3D LVTS_COEFF_B_MT8196, + .gt_calib_bit_offset =3D 0, + .def_calibration =3D 14437, + .num_cal_offsets =3D 2, + .msr_offset =3D LVTS_MSR_OFFSET_MT8196, + .ops =3D &lvts_platform_ops_v2, +}; + static const struct of_device_id lvts_of_match[] =3D { { .compatible =3D "mediatek,mt7988-lvts-ap", .data =3D &mt7988_lvts_ap_da= ta }, { .compatible =3D "mediatek,mt8186-lvts", .data =3D &mt8186_lvts_data }, @@ -1962,6 +2124,8 @@ static const struct of_device_id lvts_of_match[] =3D { { .compatible =3D "mediatek,mt8192-lvts-ap", .data =3D &mt8192_lvts_ap_da= ta }, { .compatible =3D "mediatek,mt8195-lvts-mcu", .data =3D &mt8195_lvts_mcu_= data }, { .compatible =3D "mediatek,mt8195-lvts-ap", .data =3D &mt8195_lvts_ap_da= ta }, + { .compatible =3D "mediatek,mt8196-lvts-mcu", .data =3D &mt8196_lvts_mcu_= data }, + { .compatible =3D "mediatek,mt8196-lvts-ap", .data =3D &mt8196_lvts_ap_da= ta }, {}, }; MODULE_DEVICE_TABLE(of, lvts_of_match); --=20 2.39.5 From nobody Sun Oct 5 12:52:24 2025 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D8A822737EE; Mon, 4 Aug 2025 13:32:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754314374; cv=none; b=vAkz5C0l6A9M1+RfjKJzi9P4YP1X0PkfYqXBdLKPCclzpv5KMMPD/uRxs0AkUqWQxrIl13GGLJVhITqfT7YYlB0bbrfjGuHQ2QC3e339pbsW3yzMAlHt7aOj1XwyD1nf6C0+ZqOKyETlW5R9nlWTsk3isspUR7li2gZ96uCIj8c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754314374; c=relaxed/simple; bh=ercQN29j590aHpm9+xA8hm1HdQq4WZB6Q1EllLqESa8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=aetmZZyJ68vlbjCgdHM0E4r6qHJ9mP4NpzkFmWGWm+n4G73UDRnd4sMPIXJ6X9IAnxai7/Qb3loZbNbSpXxtQ/ZHFHtQVWAN40bVlH90TrjGwNi6+ZP70NCtMl+zXAaYP52/7XP8r3LwC1bp0hP6jsW4SoAcyFP5lIvWfQ7ym4I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=e3lJoDgQ; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="e3lJoDgQ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1754314371; bh=ercQN29j590aHpm9+xA8hm1HdQq4WZB6Q1EllLqESa8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=e3lJoDgQEhq4oap7y5IdSE+kxRF8tHZ0W6wDxkCfzrAhotv2C9LzW6zlLkj4H8UnX NcOtDy7AUvpdovsyjs/0izCwO29xV8zPZWPrByJla0OfMJbbD8i+qd0gOeDJbCb9vI CGXQEy0mAk/pIKU8ebVQZjO82DJAJ4OHQ/ARXyfAUYP7bbv2cXyDIxQgyUluH+hHI7 zOE1H3WID+aVItyRnp5gA110WH9cfosb7WR9GojVccK/QOks62ULgL+8A8QUD36NcY TtbfYNfgMf1Rxh5v871sm/V+mRYmaGhfOy6IYKHWsYdntL8FBfmAVzGMx65i0Pn6iq h/czDa+NKrIJg== Received: from laura.lan (unknown [IPv6:2001:b07:646b:e2:865e:547d:4830:837d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: laura.nao) by bali.collaboradmins.com (Postfix) with ESMTPSA id D5F6F17E132A; Mon, 4 Aug 2025 15:32:49 +0200 (CEST) From: Laura Nao To: srini@kernel.org, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, rafael@kernel.org, daniel.lezcano@linaro.org, rui.zhang@intel.com, lukasz.luba@arm.com, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com Cc: nfraprado@collabora.com, arnd@arndb.de, colin.i.king@gmail.com, u.kleine-koenig@baylibre.com, andrew-ct.chen@mediatek.com, lala.lin@mediatek.com, bchihi@baylibre.com, frank-w@public-files.de, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, kernel@collabora.com, Laura Nao Subject: [PATCH v3 9/9] dt-bindings: nvmem: mediatek: efuse: Add support for MT8196 Date: Mon, 4 Aug 2025 15:30:35 +0200 Message-Id: <20250804133035.309990-10-laura.nao@collabora.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250804133035.309990-1-laura.nao@collabora.com> References: <20250804133035.309990-1-laura.nao@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The MT8196 eFuse layout is compatible with MT8186 and shares the same decoding scheme for the gpu-speedbin cell. Reviewed-by: AngeloGioacchino Del Regno Signed-off-by: Laura Nao Tested-by: AngeloGioacchino Del Regno =20 --- Documentation/devicetree/bindings/nvmem/mediatek,efuse.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/nvmem/mediatek,efuse.yaml b/= Documentation/devicetree/bindings/nvmem/mediatek,efuse.yaml index 4dc0d42df3e6..c90b026e40bd 100644 --- a/Documentation/devicetree/bindings/nvmem/mediatek,efuse.yaml +++ b/Documentation/devicetree/bindings/nvmem/mediatek,efuse.yaml @@ -25,7 +25,9 @@ properties: compatible: oneOf: - items: - - const: mediatek,mt8188-efuse + - enum: + - mediatek,mt8196-efuse + - mediatek,mt8188-efuse - const: mediatek,mt8186-efuse - const: mediatek,mt8186-efuse =20 --=20 2.39.5