target/linux/mediatek/patches-6.1/830-v6.4-30-thermal-drivers-mediatek-lvts_thermal-Honor-sensors-.patch

   1 From 6d827142643ee10c13ff9a1d90f38fb399aa9fff Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?N=C3=ADcolas=20F=2E=20R=2E=20A=2E=20Prado?=
   3  <nfraprado@collabora.com>
   4 Date: Thu, 6 Jul 2023 11:37:33 -0400
   5 Subject: [PATCH 26/42] thermal/drivers/mediatek/lvts_thermal: Honor sensors in
   6  immediate mode
   7 MIME-Version: 1.0
   8 Content-Type: text/plain; charset=UTF-8
   9 Content-Transfer-Encoding: 8bit
  10
  11 Each controller can be configured to operate on immediate or filtered
  12 mode. On filtered mode, the sensors are enabled by setting the
  13 corresponding bits in MONCTL0, while on immediate mode, by setting
  14 MSRCTL1.
  15
  16 Previously, the code would set MSRCTL1 for all four sensors when
  17 configured to immediate mode, but given that the controller might not
  18 have all four sensors connected, this would cause interrupts to trigger
  19 for non-existent sensors. Fix this by handling the MSRCTL1 register
  20 analogously to the MONCTL0: only enable the sensors that were declared.
  21
  22 Fixes: f5f633b18234 ("thermal/drivers/mediatek: Add the Low Voltage Thermal Sensor driver")
  23 Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
  24 Tested-by: Chen-Yu Tsai <wenst@chromium.org>
  25 Signed-off-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
  26 Reviewed-by: Alexandre Mergnat <amergnat@baylibre.com>
  27 Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
  28 Link: https://lore.kernel.org/r/20230706153823.201943-3-nfraprado@collabora.com
  29 ---
  30  drivers/thermal/mediatek/lvts_thermal.c | 57 ++++++++++++++-----------
  31  1 file changed, 33 insertions(+), 24 deletions(-)
  32
  33 --- a/drivers/thermal/mediatek/lvts_thermal.c
  34 +++ b/drivers/thermal/mediatek/lvts_thermal.c
  35 @@ -897,24 +897,6 @@ static int lvts_ctrl_configure(struct de
  36         writel(value, LVTS_MSRCTL0(lvts_ctrl->base));
  37
  38         /*
  39 -        * LVTS_MSRCTL1 : Measurement control
  40 -        *
  41 -        * Bits:
  42 -        *
  43 -        * 9: Ignore MSRCTL0 config and do immediate measurement on sensor3
  44 -        * 6: Ignore MSRCTL0 config and do immediate measurement on sensor2
  45 -        * 5: Ignore MSRCTL0 config and do immediate measurement on sensor1
  46 -        * 4: Ignore MSRCTL0 config and do immediate measurement on sensor0
  47 -        *
  48 -        * That configuration will ignore the filtering and the delays
  49 -        * introduced below in MONCTL1 and MONCTL2
  50 -        */
  51 -       if (lvts_ctrl->mode == LVTS_MSR_IMMEDIATE_MODE) {
  52 -               value = BIT(9) | BIT(6) | BIT(5) | BIT(4);
  53 -               writel(value, LVTS_MSRCTL1(lvts_ctrl->base));
  54 -       }
  55 -
  56 -       /*
  57          * LVTS_MONCTL1 : Period unit and group interval configuration
  58          *
  59          * The clock source of LVTS thermal controller is 26MHz.
  60 @@ -979,6 +961,15 @@ static int lvts_ctrl_start(struct device
  61         struct thermal_zone_device *tz;
  62         u32 sensor_map = 0;
  63         int i;
  64 +       /*
  65 +        * Bitmaps to enable each sensor on immediate and filtered modes, as
  66 +        * described in MSRCTL1 and MONCTL0 registers below, respectively.
  67 +        */
  68 +       u32 sensor_imm_bitmap[] = { BIT(4), BIT(5), BIT(6), BIT(9) };
  69 +       u32 sensor_filt_bitmap[] = { BIT(0), BIT(1), BIT(2), BIT(3) };
  70 +
  71 +       u32 *sensor_bitmap = lvts_ctrl->mode == LVTS_MSR_IMMEDIATE_MODE ?
  72 +                            sensor_imm_bitmap : sensor_filt_bitmap;
  73
  74         for (i = 0; i < lvts_ctrl->num_lvts_sensor; i++) {
  75
  76 @@ -1016,20 +1007,38 @@ static int lvts_ctrl_start(struct device
  77                  * map, so we can enable the temperature monitoring in
  78                  * the hardware thermal controller.
  79                  */
  80 -               sensor_map |= BIT(i);
  81 +               sensor_map |= sensor_bitmap[i];
  82         }
  83
  84         /*
  85 -        * Bits:
  86 -        *      9: Single point access flow
  87 -        *    0-3: Enable sensing point 0-3
  88 -        *
  89          * The initialization of the thermal zones give us
  90          * which sensor point to enable. If any thermal zone
  91          * was not described in the device tree, it won't be
  92          * enabled here in the sensor map.
  93          */
  94 -       writel(sensor_map | BIT(9), LVTS_MONCTL0(lvts_ctrl->base));
  95 +       if (lvts_ctrl->mode == LVTS_MSR_IMMEDIATE_MODE) {
  96 +               /*
  97 +                * LVTS_MSRCTL1 : Measurement control
  98 +                *
  99 +                * Bits:
 100 +                *
 101 +                * 9: Ignore MSRCTL0 config and do immediate measurement on sensor3
 102 +                * 6: Ignore MSRCTL0 config and do immediate measurement on sensor2
 103 +                * 5: Ignore MSRCTL0 config and do immediate measurement on sensor1
 104 +                * 4: Ignore MSRCTL0 config and do immediate measurement on sensor0
 105 +                *
 106 +                * That configuration will ignore the filtering and the delays
 107 +                * introduced in MONCTL1 and MONCTL2
 108 +                */
 109 +               writel(sensor_map, LVTS_MSRCTL1(lvts_ctrl->base));
 110 +       } else {
 111 +               /*
 112 +                * Bits:
 113 +                *      9: Single point access flow
 114 +                *    0-3: Enable sensing point 0-3
 115 +                */
 116 +               writel(sensor_map | BIT(9), LVTS_MONCTL0(lvts_ctrl->base));
 117 +       }
 118
 119         return 0;
 120  }