On Thu 06 Jan 09:31 PST 2022, Thara Gopinath wrote:
> Add compatible to support LMh for sm8150 SoC.
> sm8150 does not require explicit enabling for various LMh subsystems.
> Add a variable indicating the same as match data which is set for sdm845.
> Execute the piece of code enabling various LMh subsystems only if
> enable algorithm match data is present.
>
> Signed-off-by: Thara Gopinath <thara.gopinath@xxxxxxxxxx>
Reviewed-by: Bjorn Andersson <bjorn.andersson@xxxxxxxxxx>
Thanks Thara,
Bjorn
> ---
>
> v2->v3:
> - use of_device_get_match_data to get the data from match table
> rather than using of_match_device and subsequent ->data, as per
> Bjorn's review comments.
> - Minor fixes as per Bjorn's review comments.
>
> v1->v2:
> - Added LMH_ENABLE_ALGOS of_device_id match data to indicate
> whether LMh subsytems need explicit enabling or not.
> drivers/thermal/qcom/lmh.c | 62 +++++++++++++++++++++-----------------
> 1 file changed, 35 insertions(+), 27 deletions(-)
>
> diff --git a/drivers/thermal/qcom/lmh.c b/drivers/thermal/qcom/lmh.c
> index eafa7526eb8b..c7f91cbdccc7 100644
> --- a/drivers/thermal/qcom/lmh.c
> +++ b/drivers/thermal/qcom/lmh.c
> @@ -28,6 +28,8 @@
>
> #define LMH_REG_DCVS_INTR_CLR 0x8
>
> +#define LMH_ENABLE_ALGOS 1
> +
> struct lmh_hw_data {
> void __iomem *base;
> struct irq_domain *domain;
> @@ -90,6 +92,7 @@ static int lmh_probe(struct platform_device *pdev)
> 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;
> u32 node_id;
>
> lmh_data = devm_kzalloc(dev, sizeof(*lmh_data), GFP_KERNEL);
> @@ -141,32 +144,36 @@ static int lmh_probe(struct platform_device *pdev)
> 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;
> + enable_alg = (uintptr_t)of_device_get_match_data(dev);
> +
> + if (enable_alg) {
> + 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 */
> @@ -213,7 +220,8 @@ static int lmh_probe(struct platform_device *pdev)
> }
>
> static const struct of_device_id lmh_table[] = {
> - { .compatible = "qcom,sdm845-lmh", },
> + { .compatible = "qcom,sdm845-lmh", .data = (void *)LMH_ENABLE_ALGOS},
> + { .compatible = "qcom,sm8150-lmh", },
> {}
> };
> MODULE_DEVICE_TABLE(of, lmh_table);
> --
> 2.25.1
>
