Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cpufreq: qcom-nvmem: add compatible fallback for ipq806x for no SMEM 

On some IPQ806x SoC SMEM might be not initialized by SBL. This is the
case for some Google devices (the OnHub family) that can't make use of
SMEM to detect the SoC ID (and socinfo can't be used either as it does
depends on SMEM presence).

To handle these specific case, check if the SMEM is not initialized (by
checking if the qcom_smem_get_soc_id returns -ENODEV) and fallback to
OF machine compatible checking to identify the SoC variant.

Suggested-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
This commit is contained in:
Christian Marangi 2025-11-05 12:21:34 +01:00 committed by Viresh Kumar
parent 1971b18785
commit 58f5d39d5e
1 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/cpufreq/qcom-cpufreq-nvmem.c
View File

@ -256,13 +256,22 @@ static int qcom_cpufreq_krait_name_version(struct device *cpu_dev,
return ret; return ret;
} }
static const struct of_device_id qcom_cpufreq_ipq806x_match_list[] = {
{ .compatible = "qcom,ipq8062", .data = (const void *)QCOM_ID_IPQ8062 },
{ .compatible = "qcom,ipq8064", .data = (const void *)QCOM_ID_IPQ8064 },
{ .compatible = "qcom,ipq8065", .data = (const void *)QCOM_ID_IPQ8065 },
{ .compatible = "qcom,ipq8066", .data = (const void *)QCOM_ID_IPQ8066 },
{ .compatible = "qcom,ipq8068", .data = (const void *)QCOM_ID_IPQ8068 },
{ .compatible = "qcom,ipq8069", .data = (const void *)QCOM_ID_IPQ8069 },
};
static int qcom_cpufreq_ipq8064_name_version(struct device *cpu_dev, static int qcom_cpufreq_ipq8064_name_version(struct device *cpu_dev,
struct nvmem_cell *speedbin_nvmem, struct nvmem_cell *speedbin_nvmem,
char **pvs_name, char **pvs_name,
struct qcom_cpufreq_drv *drv) struct qcom_cpufreq_drv *drv)
{ {
int msm_id = -1, ret = 0;
int speed = 0, pvs = 0; int speed = 0, pvs = 0;
int msm_id, ret = 0;
u8 *speedbin; u8 *speedbin;
size_t len; size_t len;
@ -279,8 +288,30 @@ static int qcom_cpufreq_ipq8064_name_version(struct device *cpu_dev,
get_krait_bin_format_a(cpu_dev, &speed, &pvs, speedbin); get_krait_bin_format_a(cpu_dev, &speed, &pvs, speedbin);
ret = qcom_smem_get_soc_id(&msm_id); ret = qcom_smem_get_soc_id(&msm_id);
if (ret) if (ret == -ENODEV) {
const struct of_device_id *match;
struct device_node *root;
root = of_find_node_by_path("/");
if (!root) {
ret = -ENODEV;
goto exit; goto exit;
}
/* Fallback to compatible match with no SMEM initialized */
match = of_match_node(qcom_cpufreq_ipq806x_match_list, root);
of_node_put(root);
if (!match) {
ret = -ENODEV;
goto exit;
}
/* We found a matching device, get the msm_id from the data entry */
msm_id = (int)(uintptr_t)match->data;
ret = 0;
} else if (ret) {
goto exit;
}
switch (msm_id) { switch (msm_id) {
case QCOM_ID_IPQ8062: case QCOM_ID_IPQ8062: