[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <6909eabc.050a0220.54944.cd03@mx.google.com>
Date: Tue, 4 Nov 2025 12:59:54 +0100
From: Christian Marangi <ansuelsmth@...il.com>
To: Bjorn Andersson <andersson@...nel.org>
Cc: Ilia Lin <ilia.lin@...nel.org>, "Rafael J. Wysocki" <rafael@...nel.org>,
Viresh Kumar <viresh.kumar@...aro.org>,
Konrad Dybcio <konradybcio@...nel.org>,
Arnd Bergmann <arnd@...db.de>,
Andy Shevchenko <andriy.shevchenko@...ux.intel.com>,
Raag Jadav <raag.jadav@...el.com>, linux-arm-msm@...r.kernel.org,
linux-pm@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH v2 3/3] cpufreq: qcom-nvmem: add compatible fallback for
ipq806x for no SMEM
On Sat, Nov 01, 2025 at 12:42:55PM -0500, Bjorn Andersson wrote:
> On Fri, Oct 31, 2025 at 02:08:34PM +0100, Christian Marangi wrote:
> > 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.
> >
> > 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.
> >
> > Notice that the checking order is important as the machine compatible
> > are normally defined with the specific one following the generic SoC
> > (for example compatible = "qcom,ipq8065", "qcom,ipq8064").
> >
> > Signed-off-by: Christian Marangi <ansuelsmth@...il.com>
>
> Reviewed-by: Bjorn Andersson <andersson@...nel.org>
>
> And as mentioned in v1, this (cpufreq) patch can be merged independently
> of the first two patches. So please merge it through the cpufreq tree.
>
I will send a new revision just for this patch so I can use
of_match_node()
Should be ok since it hasn't been picked right?
>
> > ---
> > drivers/cpufreq/qcom-cpufreq-nvmem.c | 17 +++++++++++++++--
> > 1 file changed, 15 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/cpufreq/qcom-cpufreq-nvmem.c b/drivers/cpufreq/qcom-cpufreq-nvmem.c
> > index 3a8ed723a23e..5a9bd780a4f3 100644
> > --- a/drivers/cpufreq/qcom-cpufreq-nvmem.c
> > +++ b/drivers/cpufreq/qcom-cpufreq-nvmem.c
> > @@ -257,8 +257,8 @@ static int qcom_cpufreq_ipq8064_name_version(struct device *cpu_dev,
> > char **pvs_name,
> > struct qcom_cpufreq_drv *drv)
> > {
> > + int msm_id = -1, ret = 0;
> > int speed = 0, pvs = 0;
> > - int msm_id, ret = 0;
> > u8 *speedbin;
> > size_t len;
> >
> > @@ -275,8 +275,21 @@ static int qcom_cpufreq_ipq8064_name_version(struct device *cpu_dev,
> > get_krait_bin_format_a(cpu_dev, &speed, &pvs, speedbin);
> >
> > ret = qcom_smem_get_soc_id(&msm_id);
> > - if (ret)
> > + if (ret == -ENODEV) {
> > + /* Fallback to compatible match with no SMEM initialized */
> > + ret = 0;
> > + if (of_machine_is_compatible("qcom,ipq8062"))
> > + msm_id = QCOM_ID_IPQ8062;
> > + else if (of_machine_is_compatible("qcom,ipq8065") ||
> > + of_machine_is_compatible("qcom,ipq8069"))
> > + msm_id = QCOM_ID_IPQ8065;
> > + else if (of_machine_is_compatible("qcom,ipq8064") ||
> > + of_machine_is_compatible("qcom,ipq8066") ||
> > + of_machine_is_compatible("qcom,ipq8068"))
> > + msm_id = QCOM_ID_IPQ8064;
> > + } else if (ret) {
> > goto exit;
> > + }
> >
> > switch (msm_id) {
> > case QCOM_ID_IPQ8062:
> > --
> > 2.51.0
> >
--
Ansuel
Powered by blists - more mailing lists