target/linux/ipq807x/patches-5.15/0127-cpufreq-qcom-nvmem-make-qcom_cpufreq_get_msm_id-retu.patch

   1 From 85bf71b130ab0e939f53ec9cf1131d67d148bc9a Mon Sep 17 00:00:00 2001
   2 From: Robert Marko <robimarko@gmail.com>
   3 Date: Sat, 31 Dec 2022 12:45:31 +0100
   4 Subject: [PATCH] cpufreq: qcom-nvmem: make qcom_cpufreq_get_msm_id() return
   5  the SoC ID
   6
   7 Currently, qcom_cpufreq_get_msm_id() does not simply return the SoC ID
   8 after getting it via SMEM call but instead uses an enum to encode the
   9 matched SMEM ID to 2 variants of MSM8996 which are then used in
  10 qcom_cpufreq_kryo_name_version() to set the supported version.
  11
  12 This prevents qcom_cpufreq_get_msm_id() from being universal and its doing
  13 more than its name suggests, so lets make it just return the SoC ID
  14 directly which allows matching directly on the SoC ID and removes the need
  15 for msm8996_version enum which simplifies the driver.
  16 It also allows reusing the qcom_cpufreq_get_msm_id() for new SoC-s.
  17
  18 Signed-off-by: Robert Marko <robimarko@gmail.com>
  19 ---
  20  drivers/cpufreq/qcom-cpufreq-nvmem.c | 44 ++++++++--------------------
  21  1 file changed, 12 insertions(+), 32 deletions(-)
  22
  23 --- a/drivers/cpufreq/qcom-cpufreq-nvmem.c
  24 +++ b/drivers/cpufreq/qcom-cpufreq-nvmem.c
  25 @@ -32,12 +32,6 @@
  26
  27  #include <dt-bindings/arm/qcom,ids.h>
  28
  29 -enum _msm8996_version {
  30 -       MSM8996_V3,
  31 -       MSM8996_SG,
  32 -       NUM_OF_MSM8996_VERSIONS,
  33 -};
  34 -
  35  struct qcom_cpufreq_drv;
  36
  37  struct qcom_cpufreq_match_data {
  38 @@ -136,30 +130,16 @@ static void get_krait_bin_format_b(struc
  39         dev_dbg(cpu_dev, "PVS version: %d\n", *pvs_ver);
  40  }
  41
  42 -static enum _msm8996_version qcom_cpufreq_get_msm_id(void)
  43 +static int qcom_cpufreq_get_msm_id(void)
  44  {
  45         size_t len;
  46         struct socinfo *info;
  47 -       enum _msm8996_version version;
  48
  49         info = qcom_smem_get(QCOM_SMEM_HOST_ANY, SMEM_HW_SW_BUILD_ID, &len);
  50         if (IS_ERR(info))
  51 -               return NUM_OF_MSM8996_VERSIONS;
  52 -
  53 -       switch (info->id) {
  54 -       case QCOM_ID_MSM8996:
  55 -       case QCOM_ID_APQ8096:
  56 -               version = MSM8996_V3;
  57 -               break;
  58 -       case QCOM_ID_MSM8996SG:
  59 -       case QCOM_ID_APQ8096SG:
  60 -               version = MSM8996_SG;
  61 -               break;
  62 -       default:
  63 -               version = NUM_OF_MSM8996_VERSIONS;
  64 -       }
  65 +               return PTR_ERR(info);
  66
  67 -       return version;
  68 +       return info->id;
  69  }
  70
  71  static int qcom_cpufreq_kryo_name_version(struct device *cpu_dev,
  72 @@ -168,25 +148,25 @@ static int qcom_cpufreq_kryo_name_versio
  73                                           struct qcom_cpufreq_drv *drv)
  74  {
  75         size_t len;
  76 +       int msm_id;
  77         u8 *speedbin;
  78 -       enum _msm8996_version msm8996_version;
  79         *pvs_name = NULL;
  80
  81 -       msm8996_version = qcom_cpufreq_get_msm_id();
  82 -       if (NUM_OF_MSM8996_VERSIONS == msm8996_version) {
  83 -               dev_err(cpu_dev, "Not Snapdragon 820/821!");
  84 -               return -ENODEV;
  85 -       }
  86 +       msm_id = qcom_cpufreq_get_msm_id();
  87 +       if (msm_id < 0)
  88 +               return msm_id;
  89
  90         speedbin = nvmem_cell_read(speedbin_nvmem, &len);
  91         if (IS_ERR(speedbin))
  92                 return PTR_ERR(speedbin);
  93
  94 -       switch (msm8996_version) {
  95 -       case MSM8996_V3:
  96 +       switch (msm_id) {
  97 +       case QCOM_ID_MSM8996:
  98 +       case QCOM_ID_APQ8096:
  99                 drv->versions = 1 << (unsigned int)(*speedbin);
 100                 break;
 101 -       case MSM8996_SG:
 102 +       case QCOM_ID_MSM8996SG:
 103 +       case QCOM_ID_APQ8096SG:
 104                 drv->versions = 1 << ((unsigned int)(*speedbin) + 4);
 105                 break;
 106         default: