From: Sreeshankar K <sreeshankar0910@gmail.com>
To: Bjorn Andersson <andersson@kernel.org>,
Abel Vesa <abelvesa@kernel.org>, Stephen Boyd <sboyd@kernel.org>,
Brian Masney <bmasney+clk@redhat.com>,
Jerome Brunet <jbrunet+clk@baylibre.com>,
Rob Herring <robh@kernel.org>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
Conor Dooley <conor+dt@kernel.org>,
Taniya Das <taniya.das@oss.qualcomm.com>,
Amit Kucheria <amitk@kernel.org>,
Thara Gopinath <thara.gopinath@gmail.com>,
"Rafael J. Wysocki" <rafael@kernel.org>,
Daniel Lezcano <daniel.lezcano@kernel.org>,
Zhang Rui <rui.zhang@intel.com>,
Lukasz Luba <lukasz.luba@arm.com>,
Konrad Dybcio <konradybcio@kernel.org>,
Robert Marko <robimarko@gmail.com>,
Guru Das Srinagesh <linux@gurudas.dev>,
Viresh Kumar <viresh.kumar@linaro.org>,
Manivannan Sadhasivam <mani@kernel.org>
Cc: linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-pm@vger.kernel.org,
Sreeshankar K <sreeshankar0910@gmail.com>
Subject: [PATCH v15 3/8] thermal/qcom/lmh: Switch to match data for SoC CPU-to-node mappings
Date: Mon, 16 Nov 2026 05:33:47 +0000 [thread overview]
Message-ID: <20261116-sm7250-v15-3-6acbb232fef8@gmail.com> (raw)
In-Reply-To: <20261116-sm7250-v15-0-6acbb232fef8@gmail.com>
lmh_probe() hardcodes the mapping of logical CPU IDs to LMh
hardware cluster node IDs: CPU 0 maps to LMH_CLUSTER0_NODE_ID, and CPU 4
maps to LMH_CLUSTER1_NODE_ID.
This assumption only holds true for 4+4 big.LITTLE architectures like
SDM845 and SM8150. On platforms with asymmetric cluster layouts, such as
the 6+2 topology on SM7250 where the big cluster starts at logical CPU 6,
lmh_probe() fails with -EINVAL. Consequently, the second LMh node does
not register its interrupt domain, which in turn causes dependent drivers
like qcom-cpufreq-hw to fail or indefinitely defer probing via fw_devlink.
Address this by introducing a SoC descriptor structure (struct qcom_lmh_soc_data)
and an explicit mapping table (struct qcom_lmh_node_map) associated with of_device_id
match data. This encapsulates both the algorithm enable flags and the CPU-to-node
mappings per compatible string.
Signed-off-by: Sreeshankar K <sreeshankar0910@gmail.com>
---
drivers/thermal/qcom/lmh.c | 63 +++++++++++++++++++++++++++++++++++-----------
1 file changed, 48 insertions(+), 15 deletions(-)
diff --git a/drivers/thermal/qcom/lmh.c b/drivers/thermal/qcom/lmh.c
index 6bfe25021..9d66d75d8 100644
--- a/drivers/thermal/qcom/lmh.c
+++ b/drivers/thermal/qcom/lmh.c
@@ -94,19 +94,53 @@ static const struct irq_domain_ops lmh_irq_ops = {
.xlate = irq_domain_xlate_onecell,
};
+struct lmh_soc_map {
+ int cpu_id;
+ u32 node_id;
+};
+
+struct lmh_soc_data {
+ uintptr_t flags;
+ const struct lmh_soc_map *map;
+ size_t num_nodes;
+};
+
+static const struct lmh_soc_map sdm845_map[] = {
+ { .cpu_id = 0, .node_id = LMH_CLUSTER0_NODE_ID },
+ { .cpu_id = 4, .node_id = LMH_CLUSTER1_NODE_ID },
+};
+
+static const struct lmh_soc_data sdm845_data = {
+ .map = sdm845_map,
+ .num_nodes = ARRAY_SIZE(sdm845_map),
+ .flags = LMH_ENABLE_ALGOS,
+};
+
+static const struct lmh_soc_data sm8150_data = {
+ .map = sdm845_map,
+ .num_nodes = ARRAY_SIZE(sdm845_map),
+};
+
static int lmh_probe(struct platform_device *pdev)
{
+ const struct lmh_soc_data *soc_data;
struct device *dev = &pdev->dev;
struct device_node *np = dev->of_node;
struct device_node *cpu_node;
struct lmh_hw_data *lmh_data;
int temp_low, temp_high, temp_arm, cpu_id, ret;
unsigned int enable_alg;
+ bool found = false;
u32 node_id;
+ int i;
if (!qcom_scm_is_available())
return -EPROBE_DEFER;
+ soc_data = of_device_get_match_data(dev);
+ if (!soc_data)
+ return -EINVAL;
+
lmh_data = devm_kzalloc_obj(dev, *lmh_data);
if (!lmh_data)
return -ENOMEM;
@@ -139,24 +173,23 @@ static int lmh_probe(struct platform_device *pdev)
return ret;
}
- /*
- * Only sdm845 has lmh hardware currently enabled from hlos. If this is needed
- * for other platforms, revisit this to check if the <cpu-id, node-id> should be part
- * of a dt match table.
- */
- if (cpu_id == 0) {
- node_id = LMH_CLUSTER0_NODE_ID;
- } else if (cpu_id == 4) {
- node_id = LMH_CLUSTER1_NODE_ID;
- } else {
- dev_err(dev, "Wrong CPU id associated with LMh node\n");
+ for (i = 0; i < soc_data->num_nodes; i++) {
+ if (cpu_id == soc_data->map[i].cpu_id) {
+ node_id = soc_data->map[i].node_id;
+ found = true;
+ break;
+ }
+ }
+
+ if (!found) {
+ dev_err(dev, "Wrong CPU id %d associated with LMh node\n", cpu_id);
return -EINVAL;
}
if (!qcom_scm_lmh_dcvsh_available())
return -EINVAL;
- enable_alg = (uintptr_t)of_device_get_match_data(dev);
+ enable_alg = soc_data->flags;
if (enable_alg) {
ret = qcom_scm_lmh_dcvsh(LMH_SUB_FN_CRNT, LMH_ALGO_MODE_ENABLE, 1,
@@ -231,9 +264,9 @@ static int lmh_probe(struct platform_device *pdev)
}
static const struct of_device_id lmh_table[] = {
- { .compatible = "qcom,sc8180x-lmh", },
- { .compatible = "qcom,sdm845-lmh", .data = (void *)LMH_ENABLE_ALGOS},
- { .compatible = "qcom,sm8150-lmh", },
+ { .compatible = "qcom,sc8180x-lmh", .data = &sm8150_data },
+ { .compatible = "qcom,sdm845-lmh", .data = &sdm845_data },
+ { .compatible = "qcom,sm8150-lmh", .data = &sm8150_data },
{}
};
MODULE_DEVICE_TABLE(of, lmh_table);
--
2.43.0
next prev parent reply other threads:[~2026-11-16 5:34 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-16 5:33 [PATCH v15 0/8] Add initial support for Qualcomm SM7250 SoC Sreeshankar K
2026-11-16 5:33 ` [PATCH v15 1/8] dt-bindings: clock: Add SM7250 global clock controller Sreeshankar K
2026-11-16 5:33 ` [PATCH v15 2/8] clk: qcom: Add Global Clock Controller (GCC) driver for SM7250 Sreeshankar K
2026-11-16 5:33 ` Sreeshankar K [this message]
2026-11-16 5:43 ` [PATCH v15 3/8] thermal/qcom/lmh: Switch to match data for SoC CPU-to-node mappings sashiko-bot
2026-11-16 5:33 ` [PATCH v15 4/8] dt-bindings: thermal: lmh: Document SM7250 LMh Sreeshankar K
2026-11-16 5:33 ` [PATCH v15 5/8] thermal/qcom/lmh: Add support for Qualcomm SM7250 Sreeshankar K
2026-11-16 5:33 ` [PATCH v15 6/8] dt-bindings: firmware: qcom,scm: Document SM7250 SCM Sreeshankar K
2026-11-16 5:33 ` [PATCH v15 7/8] dt-bindings: cpufreq: qcom-hw: Document SM7250 cpufreq hardware Sreeshankar K
2026-11-16 5:33 ` [PATCH v15 8/8] arm64: dts: qcom: Add SM7250 devicetree file Sreeshankar K
2026-11-16 6:16 ` sashiko-bot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261116-sm7250-v15-3-6acbb232fef8@gmail.com \
--to=sreeshankar0910@gmail.com \
--cc=abelvesa@kernel.org \
--cc=amitk@kernel.org \
--cc=andersson@kernel.org \
--cc=bmasney+clk@redhat.com \
--cc=conor+dt@kernel.org \
--cc=daniel.lezcano@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=jbrunet+clk@baylibre.com \
--cc=konradybcio@kernel.org \
--cc=krzk+dt@kernel.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux@gurudas.dev \
--cc=lukasz.luba@arm.com \
--cc=mani@kernel.org \
--cc=rafael@kernel.org \
--cc=robh@kernel.org \
--cc=robimarko@gmail.com \
--cc=rui.zhang@intel.com \
--cc=sboyd@kernel.org \
--cc=taniya.das@oss.qualcomm.com \
--cc=thara.gopinath@gmail.com \
--cc=viresh.kumar@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.