| Message ID | 20211202223802.382068-2-thara.gopinath@linaro.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Extend LMh driver to suppot Qualcomm sm8150 SoC. | expand |
Hi, On 02.12.2021 23:38, Thara Gopinath wrote: > Add compatible to support LMh for sm8150 SoC. > sm8150 does not require explicit enabling for various LMh subsystems. > Move this piece of code under condition that it is executed only > for sdm845 SoC. > > Signed-off-by: Thara Gopinath <thara.gopinath@linaro.org> > --- > drivers/thermal/qcom/lmh.c | 61 ++++++++++++++++++++------------------ > 1 file changed, 32 insertions(+), 29 deletions(-) [...] > - return ret; > + if (of_device_is_compatible(np, "qcom,sdm845-lmh")) { > + if (!qcom_scm_lmh_dcvsh_available()) > + return -EINVAL; I don't believe this is the correct approach, as different SoCs may require different sequences of these writes (for example SDM660/MSM8998 seems to only enable the thermal algorithm), and there will (hopefully) be interest in adding LMH support for more platforms, so perhaps separating this somehow could keep this a bit cleaner and easier to work with for the next person.. Konrad
Hi Konrad, Thanks for the review. On 12/4/21 8:34 AM, Konrad Dybcio wrote: > Hi, > > On 02.12.2021 23:38, Thara Gopinath wrote: >> Add compatible to support LMh for sm8150 SoC. >> sm8150 does not require explicit enabling for various LMh subsystems. >> Move this piece of code under condition that it is executed only >> for sdm845 SoC. >> >> Signed-off-by: Thara Gopinath <thara.gopinath@linaro.org> >> --- >> drivers/thermal/qcom/lmh.c | 61 ++++++++++++++++++++------------------ >> 1 file changed, 32 insertions(+), 29 deletions(-) > > [...] > > >> - return ret; >> + if (of_device_is_compatible(np, "qcom,sdm845-lmh")) { >> + if (!qcom_scm_lmh_dcvsh_available()) >> + return -EINVAL; > > I don't believe this is the correct approach, as different SoCs may > > require different sequences of these writes (for example SDM660/MSM8998 > > seems to only enable the thermal algorithm), and there will (hopefully) be interest > > in adding LMH support for more platforms, so perhaps separating this somehow > > could keep this a bit cleaner and easier to work with for the next person.. I have not looked at SDM660/MSM8998. Are you telling me that these SoCs don't enable the current and BCL portion of LMh. Maybe they have an earlier version of Lmh which does not support all the features. The right approach in this case will be to add a match table with flags for init based on SoC. I can send v2, adding a match table with a flag to specify whether to do the init sequence or not. Since I am not adding the support for any other SoC at the moment, I cannot put in flags separating out thermal , current and BCL init. > > > > Konrad >
diff --git a/drivers/thermal/qcom/lmh.c b/drivers/thermal/qcom/lmh.c index eafa7526eb8b..e390c3fd0272 100644 --- a/drivers/thermal/qcom/lmh.c +++ b/drivers/thermal/qcom/lmh.c @@ -138,35 +138,37 @@ static int lmh_probe(struct platform_device *pdev) return -EINVAL; } - if (!qcom_scm_lmh_dcvsh_available()) - return -EINVAL; - - ret = qcom_scm_lmh_dcvsh(LMH_SUB_FN_CRNT, LMH_ALGO_MODE_ENABLE, 1, - LMH_NODE_DCVS, node_id, 0); - if (ret) - dev_err(dev, "Error %d enabling current subfunction\n", ret); - - ret = qcom_scm_lmh_dcvsh(LMH_SUB_FN_REL, LMH_ALGO_MODE_ENABLE, 1, - LMH_NODE_DCVS, node_id, 0); - if (ret) - dev_err(dev, "Error %d enabling reliability subfunction\n", ret); - - ret = qcom_scm_lmh_dcvsh(LMH_SUB_FN_BCL, LMH_ALGO_MODE_ENABLE, 1, - LMH_NODE_DCVS, node_id, 0); - if (ret) - dev_err(dev, "Error %d enabling BCL subfunction\n", ret); - - ret = qcom_scm_lmh_dcvsh(LMH_SUB_FN_THERMAL, LMH_ALGO_MODE_ENABLE, 1, - LMH_NODE_DCVS, node_id, 0); - if (ret) { - dev_err(dev, "Error %d enabling thermal subfunction\n", ret); - return ret; - } - - ret = qcom_scm_lmh_profile_change(0x1); - if (ret) { - dev_err(dev, "Error %d changing profile\n", ret); - return ret; + if (of_device_is_compatible(np, "qcom,sdm845-lmh")) { + if (!qcom_scm_lmh_dcvsh_available()) + return -EINVAL; + + ret = qcom_scm_lmh_dcvsh(LMH_SUB_FN_CRNT, LMH_ALGO_MODE_ENABLE, 1, + LMH_NODE_DCVS, node_id, 0); + if (ret) + dev_err(dev, "Error %d enabling current subfunction\n", ret); + + ret = qcom_scm_lmh_dcvsh(LMH_SUB_FN_REL, LMH_ALGO_MODE_ENABLE, 1, + LMH_NODE_DCVS, node_id, 0); + if (ret) + dev_err(dev, "Error %d enabling reliability subfunction\n", ret); + + ret = qcom_scm_lmh_dcvsh(LMH_SUB_FN_BCL, LMH_ALGO_MODE_ENABLE, 1, + LMH_NODE_DCVS, node_id, 0); + if (ret) + dev_err(dev, "Error %d enabling BCL subfunction\n", ret); + + ret = qcom_scm_lmh_dcvsh(LMH_SUB_FN_THERMAL, LMH_ALGO_MODE_ENABLE, 1, + LMH_NODE_DCVS, node_id, 0); + if (ret) { + dev_err(dev, "Error %d enabling thermal subfunction\n", ret); + return ret; + } + + ret = qcom_scm_lmh_profile_change(0x1); + if (ret) { + dev_err(dev, "Error %d changing profile\n", ret); + return ret; + } } /* Set default thermal trips */ @@ -214,6 +216,7 @@ static int lmh_probe(struct platform_device *pdev) static const struct of_device_id lmh_table[] = { { .compatible = "qcom,sdm845-lmh", }, + { .compatible = "qcom,sm8150-lmh", }, {} }; MODULE_DEVICE_TABLE(of, lmh_table);
Add compatible to support LMh for sm8150 SoC. sm8150 does not require explicit enabling for various LMh subsystems. Move this piece of code under condition that it is executed only for sdm845 SoC. Signed-off-by: Thara Gopinath <thara.gopinath@linaro.org> --- drivers/thermal/qcom/lmh.c | 61 ++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 29 deletions(-)