Re: [PATCH 3/3] cpufreq: qcom-nvmem: add compatible fallback for ipq806x for no SMEM

Andy Shevchenko
2025-10-29T15:30:26Z

On Wed, Oct 29, 2025 at 02:33:21PM +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")

Misplaced period, should be at the end of closing parenthesis.

...

> ret = qcom_smem_get_soc_id(&msm_id);
> - if (ret)
> - goto exit;
> + if (ret) {
> + if (ret != -ENODEV)
> + goto exit;

if (ret == ...) {
...
} else if (ret)
goto exit;

Even patch will look better after that.

> + /* Fallback to compatible match with no SMEM initialized */
> + 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;
> + }

--
With Best Regards,
Andy Shevchenko